diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 43eeda344d694..d628c813e36b9 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -48,9 +48,6 @@ jobs: # - name: Install dreamluau # run: | # bash tools/ci/install_dreamluau.sh - - name: Install auxmos - run: | - bash tools/ci/install_auxmos.sh - name: Configure version run: | echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV diff --git a/Dockerfile b/Dockerfile index 185132e507a8f..e82cab34b1222 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,15 +27,6 @@ RUN git init \ && git checkout FETCH_HEAD \ && cargo build --release --all-features --target i686-unknown-linux-gnu -# Build auxmos -FROM rust-build as auxmos -RUN git init \ - && git remote add origin https://github.com/BeeStation/auxmos \ - && /bin/bash -c "source dependencies.sh \ - && git fetch --depth 1 origin \$AUXMOS_VERSION" \ - && git checkout FETCH_HEAD \ - && cargo rustc --target=i686-unknown-linux-gnu --release --features=trit_fire_hook,plasma_fire_hook,generic_fire_hook - # Install nodejs which is required to deploy BeeStation FROM base as node COPY dependencies.sh . @@ -51,7 +42,6 @@ ENV TG_BOOTSTRAP_NODE_LINUX=1 WORKDIR /dm-build COPY . . # Required to satisfy our compile_options -COPY --from=auxmos /build/target/i686-unknown-linux-gnu/release/libauxmos.so /dm-build/auxtools/libauxmos.so RUN tools/build/build \ && tools/deploy.sh /deploy \ && apt-get autoremove curl -y \ diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm index a407814bb9f91..5923ea513ab8f 100644 --- a/_maps/Prefab/Departments.dmm +++ b/_maps/Prefab/Departments.dmm @@ -1130,7 +1130,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/obj/machinery/advanced_airlock_controller/directional/west, /obj/machinery/vending/wallmed{ pixel_y = 32 }, diff --git a/_maps/RandomRooms/10x5/sk_rdm126_gaschamber.dmm b/_maps/RandomRooms/10x5/sk_rdm126_gaschamber.dmm index 04bb94944025f..110a7dd3ef1a7 100644 --- a/_maps/RandomRooms/10x5/sk_rdm126_gaschamber.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm126_gaschamber.dmm @@ -38,7 +38,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -47,7 +47,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -79,7 +79,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark, /area/template_noop) "an" = ( @@ -105,7 +105,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark, /area/template_noop) "ar" = ( @@ -161,7 +161,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/template_noop) @@ -232,7 +232,7 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/trap/nexus/trickyspawner/zombie, /turf/open/floor/iron/dark, @@ -249,7 +249,7 @@ /area/template_noop) "aU" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -275,7 +275,7 @@ /turf/open/floor/iron, /area/template_noop) "aX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -288,7 +288,7 @@ /turf/open/floor/iron, /area/template_noop) "aZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRooms/3x3/sk_rdm009_airstation.dmm b/_maps/RandomRooms/3x3/sk_rdm009_airstation.dmm index 46946f44c55ab..250fdb86802d7 100644 --- a/_maps/RandomRooms/3x3/sk_rdm009_airstation.dmm +++ b/_maps/RandomRooms/3x3/sk_rdm009_airstation.dmm @@ -11,13 +11,13 @@ /area/template_noop) "c" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/plating, /area/template_noop) "d" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/machinery/light{ @@ -30,7 +30,7 @@ /turf/open/floor/plating, /area/template_noop) "f" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/plating, diff --git a/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm b/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm index a0433eb4ea0d4..425080e0e00d5 100644 --- a/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm +++ b/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm @@ -1,9 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/lattice/catwalk/over, /obj/machinery/shower{ dir = 8; @@ -17,12 +13,10 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/plating, /area/template_noop) "e" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ - dir = 6 - }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/deliveryChute, /obj/structure/railing{ @@ -32,20 +26,12 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer1, /turf/open/floor/plating, /area/template_noop) "f" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2, -/obj/machinery/atmospherics/components/binary/volume_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -53,47 +39,35 @@ name = "Insane Atmospherics Technician" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/plating, /area/template_noop) "m" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/railing{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "n" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 - }, /obj/item/pipe_dispenser, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "w" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -104,29 +78,21 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, /turf/open/floor/plating, /area/template_noop) "x" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "y" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{ - dir = 4 - }, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/binary/pump/on/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10 - }, /obj/structure/closet/crate, /obj/structure/railing{ dir = 9 @@ -134,47 +100,34 @@ /obj/item/storage/box/survival/engineer, /obj/item/holosign_creator/atmos, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "H" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/item/book/manual/wiki/atmospherics, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer1, /turf/open/floor/plating, /area/template_noop) "J" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/holosign/barrier/atmos, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, /turf/open/floor/plating, /area/template_noop) "L" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ - dir = 5 - }, /obj/machinery/portable_thermomachine, /obj/structure/disposalpipe/segment{ dir = 5 @@ -183,22 +136,14 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/plating, /area/template_noop) "O" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 1 - }, /obj/item/wrench, /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, /obj/effect/spawner/lootdrop/crate_spawner, /obj/structure/disposalpipe/segment, /obj/structure/railing{ @@ -208,17 +153,14 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "U" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 6 - }, /obj/effect/spawner/lootdrop/crate_spawner, -/obj/machinery/atmospherics/components/binary/volume_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -230,6 +172,10 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "V" = ( @@ -238,10 +184,6 @@ pixel_x = 8; pixel_y = -7 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -254,18 +196,15 @@ pixel_x = -7 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer5, /turf/open/floor/plating, /area/template_noop) "Y" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, /turf/open/floor/plating, /area/template_noop) diff --git a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm index fe6b004116ebd..d12624ed25f06 100644 --- a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm @@ -52,7 +52,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, diff --git a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm index 4c293fde5acc2..f0784b2b52663 100644 --- a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm @@ -6,7 +6,7 @@ /turf/open/floor/iron/freezer, /area/template_noop) "b" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/stripes/end, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer, @@ -36,7 +36,7 @@ /turf/open/floor/iron/freezer, /area/template_noop) "g" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /turf/open/floor/plating{ @@ -73,7 +73,7 @@ /turf/open/floor/iron/freezer, /area/template_noop) "l" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -98,7 +98,7 @@ /turf/open/floor/iron/freezer, /area/template_noop) "o" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_01_scooterpark.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_01_scooterpark.dmm index 6ec0f087a750f..6ce892a67091a 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_01_scooterpark.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_01_scooterpark.dmm @@ -7,15 +7,15 @@ /area/template_noop) "d" = ( /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/template_noop) "e" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -29,7 +29,7 @@ /turf/open/floor/iron/dark, /area/template_noop) "g" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/template_noop) @@ -138,8 +138,8 @@ /turf/open/floor/iron, /area/template_noop) "A" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -150,12 +150,12 @@ "C" = ( /obj/structure/table, /obj/machinery/paystand, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/template_noop) "F" = ( /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -184,12 +184,12 @@ name = "Scooter Rental Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "O" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/template_noop) "P" = ( diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_02_beelounge.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_02_beelounge.dmm index 68b70fe389555..f53ec4bc39356 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_02_beelounge.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_02_beelounge.dmm @@ -38,21 +38,21 @@ /turf/open/floor/wax, /area/template_noop) "t" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wax, /area/template_noop) "v" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wax, /area/template_noop) "x" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wax, @@ -70,8 +70,8 @@ /obj/machinery/door/airlock/public/glass{ name = "Bee Lounge Backroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/template_noop) "E" = ( @@ -109,12 +109,12 @@ name = "Bee Lounge Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/template_noop, /area/template_noop) "K" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wax, /area/template_noop) "M" = ( @@ -146,7 +146,7 @@ /turf/template_noop/closed, /area/template_noop) "S" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/wax, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm index 6d1744490a961..12c0e9f2cc41e 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm @@ -33,16 +33,16 @@ /area/template_noop) "g" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, /area/template_noop) "i" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -53,8 +53,8 @@ /obj/machinery/light_switch{ pixel_x = 22 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/template_noop) "l" = ( @@ -77,7 +77,7 @@ /area/template_noop) "o" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -85,10 +85,10 @@ /turf/open/floor/iron, /area/template_noop) "p" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/light/small{ @@ -114,7 +114,7 @@ /area/template_noop) "s" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -141,10 +141,10 @@ /obj/machinery/door/airlock/maintenance{ name = "Vending Machine Store Backroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -195,8 +195,8 @@ name = "Vending Machine Store Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "K" = ( @@ -209,7 +209,7 @@ /area/template_noop) "L" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -223,7 +223,7 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red{ diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm index b88717604c439..a17aadbc24c88 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm @@ -6,7 +6,7 @@ /turf/template_noop/closed, /area/template_noop) "c" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/template_noop) "f" = ( @@ -45,7 +45,7 @@ /turf/open/floor/iron, /area/template_noop) "n" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -57,7 +57,7 @@ /obj/structure/table, /obj/item/circuitboard/machine/paystand, /obj/item/stack/sheet/iron/five, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/template_noop) "s" = ( @@ -68,7 +68,7 @@ /area/template_noop) "t" = ( /obj/structure/rack, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/template_noop) "u" = ( @@ -103,8 +103,8 @@ /obj/machinery/door/airlock/maintenance{ name = "Convenience Store Backroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/template_noop) "C" = ( @@ -139,8 +139,8 @@ /area/template_noop) "I" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/template_noop) "J" = ( @@ -148,13 +148,13 @@ name = "Convenience Store Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/template_noop, /area/template_noop) "P" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/template_noop) "R" = ( @@ -195,8 +195,8 @@ /area/template_noop) "Y" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm index 13c28c0a646ee..b369b20ac272d 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm @@ -18,7 +18,7 @@ /turf/open/floor/grass, /area/template_noop) "l" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/grass, /area/template_noop) "m" = ( @@ -91,7 +91,7 @@ /area/template_noop) "D" = ( /obj/structure/flora/ausbushes/grassybush, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/grass, @@ -109,8 +109,8 @@ /obj/structure/flora/ausbushes/leafybush, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/leafybush, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/grass, @@ -120,8 +120,8 @@ name = "Apiary Maintenance"; req_one_access_txt = "22;35" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "L" = ( @@ -152,7 +152,7 @@ /area/template_noop) "P" = ( /obj/structure/flora/grass/jungle/b, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/grass, /area/template_noop) "Q" = ( @@ -198,8 +198,8 @@ /turf/open/floor/iron/grid/steel, /area/template_noop) "Y" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass, /area/template_noop) "Z" = ( diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm index 3d4fcf9d4b06e..e0c024bd32085 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm @@ -3,7 +3,7 @@ /turf/template_noop/closed, /area/template_noop) "d" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -27,8 +27,8 @@ /turf/open/floor/iron, /area/template_noop) "i" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -79,7 +79,7 @@ /turf/open/floor/iron, /area/template_noop) "s" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -142,8 +142,8 @@ name = "Public Garden Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "K" = ( diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_07_theletterh.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_07_theletterh.dmm index e1ae831f8bfa4..2791fad674767 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_07_theletterh.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_07_theletterh.dmm @@ -3,8 +3,8 @@ /turf/template_noop/closed, /area/template_noop) "c" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -24,15 +24,15 @@ /turf/open/floor/iron, /area/template_noop) "i" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/template_noop) "j" = ( /turf/open/floor/plating, /area/template_noop) "l" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -100,12 +100,12 @@ /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "K" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -114,7 +114,7 @@ /turf/open/floor/iron, /area/template_noop) "M" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/template_noop) diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm index 21f5e4fa175c9..da6abf4db5a8e 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm @@ -3,12 +3,12 @@ /turf/template_noop/closed, /area/template_noop) "c" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/bamboo, /area/template_noop) "d" = ( /obj/structure/chair/stool/bamboo, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/bamboo, /area/template_noop) "e" = ( @@ -23,8 +23,8 @@ /turf/open/floor/wood, /area/template_noop) "i" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -38,7 +38,7 @@ /turf/open/floor/bamboo, /area/template_noop) "m" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wood, @@ -58,7 +58,7 @@ /turf/open/floor/wood, /area/template_noop) "s" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -117,8 +117,8 @@ /obj/machinery/door/airlock/maintenance{ name = "Zen Room Maintenance" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "L" = ( diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm index d7e47b8911db1..1a2af8e7e9680 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm @@ -9,7 +9,7 @@ /turf/open/floor/iron/ameridiner, /area/template_noop) "c" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet{ @@ -61,11 +61,11 @@ /area/template_noop) "r" = ( /obj/effect/landmark/start/randommaint/backalley_doc, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/template_noop) "t" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/template_noop) "u" = ( @@ -103,8 +103,8 @@ /turf/open/floor/iron/ameridiner, /area/template_noop) "B" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/wood, @@ -135,16 +135,16 @@ /area/template_noop) "H" = ( /obj/structure/mineral_door/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance{ name = "Barber Shop Maintenance" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/template_noop, /area/template_noop) "K" = ( @@ -176,8 +176,8 @@ /turf/open/floor/iron/ameridiner, /area/template_noop) "M" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/template_noop) "N" = ( diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_10_readingroom.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_10_readingroom.dmm index 22c4891e0d05c..679c387d3abcf 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_10_readingroom.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_10_readingroom.dmm @@ -6,7 +6,7 @@ /turf/open/floor/wood, /area/template_noop) "e" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -18,7 +18,7 @@ /turf/open/floor/wood, /area/template_noop) "j" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/template_noop) "k" = ( @@ -71,10 +71,10 @@ /turf/open/floor/wood, /area/template_noop) "z" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/template_noop) "C" = ( @@ -90,7 +90,7 @@ /turf/open/floor/wood, /area/template_noop) "E" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/grimy, @@ -108,8 +108,8 @@ /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/template_noop, /area/template_noop) "K" = ( @@ -152,7 +152,7 @@ /area/template_noop) "X" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/template_noop) "Z" = ( diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm index 3e57f73405176..0a54886922de5 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm @@ -8,14 +8,14 @@ dir = 4 }, /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/template_noop) "d" = ( /obj/machinery/door/airlock/maintenance/external/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/template_noop) "e" = ( @@ -38,8 +38,8 @@ /turf/open/floor/iron, /area/template_noop) "i" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/template_noop) @@ -83,7 +83,7 @@ /area/template_noop) "s" = ( /obj/effect/decal/cleanable/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/template_noop) "v" = ( @@ -109,7 +109,7 @@ /obj/item/cigbutt{ pixel_x = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -128,7 +128,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -155,15 +155,15 @@ /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "K" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/item/trash/can, /turf/open/floor/plating, /area/template_noop) diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_12_magicstage.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_12_magicstage.dmm index d30cdf69cfe83..19263c2a97934 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_12_magicstage.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_12_magicstage.dmm @@ -9,8 +9,8 @@ /turf/open/floor/wood, /area/template_noop) "c" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/curtain/bounty, /turf/open/floor/iron/dark, /area/template_noop) @@ -22,8 +22,8 @@ /turf/open/floor/carpet, /area/template_noop) "i" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/template_noop) "m" = ( @@ -40,7 +40,7 @@ /turf/open/floor/iron/dark, /area/template_noop) "s" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/chair/fancy/sofa/old/right, /turf/open/floor/carpet/red, /area/template_noop) @@ -56,8 +56,8 @@ /turf/open/floor/carpet/red, /area/template_noop) "w" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wood, @@ -75,7 +75,7 @@ /turf/open/floor/iron/dark, /area/template_noop) "A" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/chair/fancy/sofa/old/right, @@ -102,15 +102,15 @@ /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "Q" = ( /turf/template_noop/closed, /area/template_noop) "R" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/template_noop) "S" = ( @@ -118,7 +118,7 @@ /turf/open/floor/iron/dark, /area/template_noop) "T" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_13_cheeseroom.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_13_cheeseroom.dmm index 3bcd1e73e970a..1d2d74eb5d662 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_13_cheeseroom.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_13_cheeseroom.dmm @@ -5,17 +5,17 @@ "b" = ( /obj/item/food/butterdog, /obj/effect/decal/cleanable/crayon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/table/wood/fancy/black, /turf/open/floor/plating, /area/template_noop) "d" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/vaporwave, /area/template_noop) "e" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/vaporwave, /area/template_noop) "g" = ( @@ -42,14 +42,14 @@ /turf/open/floor/iron/techmaint, /area/template_noop) "o" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/vaporwave, /area/template_noop) "q" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/vaporwave, @@ -62,7 +62,7 @@ /obj/effect/decal/cleanable/crayon, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/table/wood/fancy/black, /turf/open/floor/plating{ broken = 1 @@ -110,8 +110,8 @@ /area/template_noop) "H" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/template_noop, /area/template_noop) "J" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 344afa36d5b7e..cf67a1c0ecfb0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -241,7 +241,7 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "bX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/grass{ @@ -249,7 +249,7 @@ }, /area/lavaland/surface/outdoors) "bY" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/grass{ @@ -257,7 +257,7 @@ }, /area/lavaland/surface/outdoors) "bZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/grass{ @@ -265,7 +265,7 @@ }, /area/lavaland/surface/outdoors) "ca" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/grass{ @@ -279,8 +279,8 @@ }, /area/lavaland/surface/outdoors) "ch" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -376,8 +376,8 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "dC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -405,10 +405,10 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) @@ -425,10 +425,10 @@ /obj/machinery/door/airlock/medical{ name = "Rejuvenation Pods" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -437,10 +437,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -451,10 +451,10 @@ "hX" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -463,8 +463,8 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "id" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "kQ" = ( @@ -477,10 +477,10 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "kV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -527,16 +527,16 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "nc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "nI" = ( /obj/structure/table/reinforced, /obj/item/storage/box/hug, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -547,8 +547,8 @@ /area/ruin/powered/animal_hospital) "oj" = ( /obj/effect/decal/cleanable/ash, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ruin/powered/animal_hospital) "qn" = ( @@ -578,15 +578,15 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "rJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "rK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -619,7 +619,7 @@ "um" = ( /obj/structure/table/reinforced, /obj/item/clothing/glasses/regular, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -628,10 +628,10 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "us" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -648,17 +648,17 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "vm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "vB" = ( /obj/machinery/vending/coffee, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -675,10 +675,10 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "vZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/bed/roller, @@ -712,7 +712,7 @@ "wE" = ( /obj/structure/table/wood, /obj/item/toy/plush/carpplushie, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -724,8 +724,8 @@ /obj/machinery/door/airlock/shuttle{ name = "Medical Supplies" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -751,18 +751,18 @@ }, /area/lavaland/surface/outdoors) "yl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "yB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "zx" = ( @@ -779,15 +779,15 @@ /obj/machinery/door/airlock/shuttle{ name = "Morgue" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ruin/powered/animal_hospital) "AZ" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/dromedaryco, /obj/item/storage/box/matches, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -798,14 +798,14 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "BG" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "Cj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -815,13 +815,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "Dn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -830,8 +830,8 @@ /obj/machinery/door/airlock/shuttle{ name = "Restroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -846,10 +846,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -858,7 +858,7 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "DU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -870,7 +870,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -884,16 +884,16 @@ pixel_x = 4 }, /obj/item/surgicaldrill, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "FC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) @@ -901,10 +901,10 @@ /obj/machinery/door/airlock/shuttle{ name = "Operating Theatre" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -931,16 +931,16 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "HP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -950,8 +950,8 @@ /obj/item/trash/pistachios, /obj/item/lipstick/random, /obj/item/seeds/apple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -972,10 +972,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -984,13 +984,13 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "JK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "Kg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -999,10 +999,10 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "KK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/white, @@ -1016,15 +1016,15 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "Nl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "Nv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -1036,7 +1036,7 @@ /obj/structure/table, /obj/item/tank/internals/oxygen, /obj/item/tank/internals/oxygen, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -1055,7 +1055,7 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "PU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -1065,8 +1065,8 @@ /area/ruin/powered/animal_hospital) "Qm" = ( /mob/living/basic/cockroach, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -1093,7 +1093,7 @@ /turf/open/floor/plating, /area/ruin/powered/animal_hospital) "Rp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -1111,7 +1111,7 @@ /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "RQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -1132,7 +1132,7 @@ desc = "There's a smudged note wedged into it that says something about pizza dropoffs."; name = "Staff Entrance" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -1144,7 +1144,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -1153,8 +1153,8 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "Uf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) "Vg" = ( @@ -1163,7 +1163,7 @@ /obj/item/scalpel{ pixel_y = 12 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -1174,7 +1174,7 @@ heal_threshold = 40; name = "emergency Medibot" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -1193,10 +1193,10 @@ /area/ruin/powered/animal_hospital) "VQ" = ( /obj/machinery/iv_drip, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -1208,8 +1208,8 @@ /obj/machinery/door/airlock/shuttle{ name = "Chemistry" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "Xe" = ( @@ -1224,8 +1224,8 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "Xq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/ruin/powered/animal_hospital) @@ -1254,19 +1254,19 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "XZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -1278,7 +1278,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -1287,7 +1287,7 @@ /obj/machinery/door/airlock/shuttle{ name = "Break Room" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -1306,7 +1306,7 @@ /turf/open/floor/iron/white, /area/ruin/powered/animal_hospital) "ZX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 62a6df4aaf1e6..54a463afcdfed 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -64,7 +64,9 @@ /turf/open/floor/plating, /area/ruin/powered/snow_biodome) "ao" = ( -/turf/open/floor/plating/ice, +/turf/open/floor/plating/ice{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/ruin/powered/snow_biodome) "ap" = ( /obj/structure/flora/rock/icy, @@ -195,7 +197,9 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plating/ice, +/turf/open/floor/plating/ice{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/ruin/powered/snow_biodome) "bw" = ( /obj/machinery/light/small{ @@ -238,7 +242,9 @@ /area/ruin/powered/snow_biodome) "bN" = ( /obj/machinery/light, -/turf/open/floor/plating/ice, +/turf/open/floor/plating/ice{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/ruin/powered/snow_biodome) "dS" = ( /obj/machinery/light/small, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 73e6ae270c375..78074fd93e374 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/lavaland/surface/outdoors) "ae" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -33,7 +33,7 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "aY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light, @@ -47,7 +47,7 @@ /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/ruin/powered/seedvault) "ck" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/poddoor{ @@ -94,7 +94,7 @@ dir = 1; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/grass, @@ -121,7 +121,7 @@ /obj/machinery/hydroponics/constructable, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod, @@ -139,17 +139,17 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "gT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod, /area/ruin/powered/seedvault) "hj" = ( /obj/machinery/door/airlock/survival_pod, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, @@ -181,10 +181,10 @@ /area/ruin/powered/seedvault) "iQ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, @@ -202,8 +202,8 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "ji" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/grass, @@ -222,16 +222,16 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "jY" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/structure/closet, /turf/open/floor/pod, /area/ruin/powered/seedvault) "jZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/pod, @@ -251,7 +251,7 @@ /turf/template_noop/open, /area/lavaland/surface/outdoors) "kt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -281,16 +281,16 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "mo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, /area/ruin/powered/seedvault) "mE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/hydroponics/constructable, @@ -298,7 +298,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "mM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/structure/closet/crate, @@ -349,7 +349,7 @@ pixel_y = 4 }, /obj/item/clothing/mask/vape, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod, @@ -358,12 +358,12 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/grass, /area/ruin/powered/seedvault) "pA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -380,20 +380,20 @@ /area/ruin/powered/seedvault) "qn" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, /area/ruin/powered/seedvault) "qz" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/pod, /area/ruin/powered/seedvault) "qR" = ( @@ -403,7 +403,7 @@ }, /area/lavaland/surface/outdoors) "qX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/pod, @@ -414,7 +414,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "rF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, @@ -442,7 +442,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "sG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/flora/ausbushes/fullgrass, @@ -460,13 +460,13 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "sU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod, /area/ruin/powered/seedvault) "tg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass, /area/ruin/powered/seedvault) @@ -554,8 +554,8 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "yE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, @@ -596,13 +596,13 @@ /turf/open/floor/pod/light, /area/ruin/powered/seedvault) "zr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/grass, /area/ruin/powered/seedvault) "AF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/flora/ausbushes/lavendergrass, @@ -615,7 +615,7 @@ /turf/open/floor/grass, /area/lavaland/surface/outdoors) "Be" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/decal/cleanable/dirt/dust, @@ -625,17 +625,17 @@ /obj/machinery/hydroponics/constructable, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/pod, /area/ruin/powered/seedvault) "CD" = ( /obj/machinery/door/airlock/survival_pod, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, @@ -661,8 +661,8 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "Dx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/pod, /area/ruin/powered/seedvault) "DN" = ( @@ -714,7 +714,7 @@ "Em" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/pod, @@ -724,10 +724,10 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "Fr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/rack, @@ -738,7 +738,7 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "FB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod, @@ -853,7 +853,7 @@ /area/ruin/powered/seedvault) "JD" = ( /obj/machinery/light/broken, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/pod, @@ -878,11 +878,11 @@ /turf/template_noop/open, /area/lavaland/surface/outdoors) "KD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/survival_pod, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass, /area/ruin/powered/seedvault) "KJ" = ( @@ -917,7 +917,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "KX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod, /area/ruin/powered/seedvault) @@ -943,8 +943,8 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "LK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/hydroponics/constructable, @@ -973,7 +973,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "MU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/hydroponics/constructable, @@ -1014,7 +1014,7 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "Nz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1028,11 +1028,11 @@ /area/ruin/powered/seedvault) "NC" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass, /area/ruin/powered/seedvault) "NF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1052,10 +1052,10 @@ pixel_y = 12; stepped_sound = null }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/pod, @@ -1067,21 +1067,21 @@ /turf/template_noop/open, /area/lavaland/surface/outdoors) "NO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass, /area/ruin/powered/seedvault) "OC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/survival_pod, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, @@ -1093,7 +1093,7 @@ /turf/open/floor/pod/light, /area/ruin/powered/seedvault) "Pp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/hydroponics/constructable, @@ -1112,8 +1112,8 @@ /turf/open/floor/pod/light, /area/ruin/powered/seedvault) "Pz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/grass, /area/ruin/powered/seedvault) @@ -1136,7 +1136,7 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "Qb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/flora/ausbushes/ppflowers, @@ -1147,17 +1147,17 @@ /turf/open/floor/grass, /area/lavaland/surface/outdoors) "Qv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/grass, /area/ruin/powered/seedvault) "QJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1182,7 +1182,7 @@ pixel_x = 10; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/pod, @@ -1205,7 +1205,7 @@ /turf/open/floor/plating, /area/ruin/powered/seedvault) "Rt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/hydroponics/constructable, @@ -1227,7 +1227,7 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "RR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -1242,7 +1242,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/grass, @@ -1261,23 +1261,23 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "Tk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/grass, /area/ruin/powered/seedvault) "Tu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod, /area/ruin/powered/seedvault) "Tv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/flora/ausbushes/ywflowers, @@ -1311,7 +1311,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "UL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -1353,10 +1353,10 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "Wm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod, @@ -1368,7 +1368,7 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "WD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1379,16 +1379,16 @@ /area/ruin/powered/seedvault) "Xx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/pod, /area/ruin/powered/seedvault) "YM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/hydroponics/constructable, @@ -1417,8 +1417,8 @@ /area/ruin/powered/seedvault) "Zl" = ( /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass, /area/ruin/powered/seedvault) "ZS" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index bbd0da463c676..90c29ef5fad8c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -43,7 +43,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/chemistry) "aF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine, @@ -86,7 +86,7 @@ name = "Syndicate Radio Intercom" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -101,10 +101,7 @@ /turf/open/floor/iron/white/side, /area/ruin/unpowered/syndicate_lava_base/medbay) "bv" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "Syndicate_Construction_o2_sensor" - }, +/obj/machinery/air_sensor, /turf/open/floor/engine/o2, /area/ruin/unpowered/syndicate_lava_base/engineering) "bA" = ( @@ -116,7 +113,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "bE" = ( @@ -134,7 +132,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "bS" = ( @@ -191,7 +190,8 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) "cu" = ( @@ -282,7 +282,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine, @@ -300,7 +300,8 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/engineering) "dv" = ( @@ -364,10 +365,8 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) "dL" = ( -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/structure/closet/crate, /obj/item/extinguisher{ pixel_x = -5; @@ -487,10 +486,8 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "es" = ( @@ -521,7 +518,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "eD" = ( @@ -540,7 +538,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/cargo) "eQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -731,10 +729,8 @@ /obj/structure/table/wood, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/sniper_rounds, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "gb" = ( @@ -815,7 +811,8 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "gm" = ( @@ -832,7 +829,8 @@ icon_state = "1-2" }, /obj/machinery/firealarm/directional/west, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) "gN" = ( @@ -933,7 +931,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "hz" = ( @@ -1049,7 +1048,8 @@ "iE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) "iH" = ( @@ -1111,7 +1111,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -1260,10 +1260,8 @@ /obj/effect/mob_spawn/human/lavaland_syndicate{ dir = 4 }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "lE" = ( @@ -1311,10 +1309,8 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) @@ -1362,7 +1358,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) "nf" = ( @@ -1374,7 +1371,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "nl" = ( @@ -1388,7 +1386,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "nr" = ( @@ -1397,11 +1396,12 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "nE" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/engineering) "nW" = ( @@ -1485,9 +1485,8 @@ /turf/open/floor/engine/vacuum, /area/ruin/unpowered/syndicate_lava_base/engineering) "oB" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ - dir = 1; - id = "syndie_lavaland_inc_in" +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ + chamber_id = "syndie_lavaland_inc_in" }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 @@ -1548,7 +1547,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/testlab) "oR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -1556,12 +1555,13 @@ "oX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "oY" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -1597,7 +1597,8 @@ /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) "pn" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) "pq" = ( @@ -1614,7 +1615,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/dormitories) "pD" = ( @@ -1631,10 +1633,7 @@ /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "pK" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "syndie_lavaland_n2_sensor" - }, +/obj/machinery/air_sensor, /turf/open/floor/engine/n2, /area/ruin/unpowered/syndicate_lava_base/engineering) "pM" = ( @@ -1645,7 +1644,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "pQ" = ( @@ -1655,7 +1655,7 @@ /turf/open/floor/circuit/red, /area/ruin/unpowered/syndicate_lava_base/main) "pR" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -1674,14 +1674,15 @@ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) "pW" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) "pY" = ( @@ -1696,7 +1697,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "ql" = ( @@ -1713,7 +1715,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "qp" = ( @@ -1732,11 +1735,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "qG" = ( @@ -1752,7 +1754,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "qK" = ( @@ -1818,12 +1821,14 @@ req_access_txt = "150" }, /obj/effect/turf_decal/stripes/closeup, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "rF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) "rS" = ( @@ -1852,7 +1857,7 @@ "sd" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -1896,7 +1901,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "sY" = ( @@ -1906,7 +1912,8 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "sZ" = ( @@ -1915,7 +1922,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -1944,7 +1951,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "tv" = ( @@ -1979,7 +1987,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) "tV" = ( @@ -2002,10 +2011,8 @@ /obj/effect/mob_spawn/human/lavaland_syndicate{ dir = 8 }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "ue" = ( @@ -2045,11 +2052,10 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "uo" = ( -/obj/machinery/airalarm/syndicate{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -2081,7 +2087,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "uD" = ( @@ -2097,7 +2104,7 @@ "uH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) @@ -2122,7 +2129,8 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "uQ" = ( @@ -2156,7 +2164,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "vg" = ( @@ -2228,7 +2237,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "vT" = ( @@ -2251,7 +2261,8 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) "we" = ( @@ -2259,7 +2270,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "wn" = ( @@ -2276,7 +2288,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "wB" = ( @@ -2297,7 +2310,8 @@ name = "Syndicate Research Experimentation Shutters" }, /obj/effect/spawner/structure/window/plastitanium, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/testlab) "wL" = ( @@ -2317,9 +2331,8 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/machinery/airalarm/syndicate{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/structure/floodlight_frame, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) @@ -2330,7 +2343,8 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "xa" = ( @@ -2344,7 +2358,8 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/stripes/closeup, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) "xl" = ( @@ -2395,7 +2410,7 @@ /area/ruin/unpowered/syndicate_lava_base/science) "xU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "ya" = ( @@ -2403,7 +2418,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/cargo) "yg" = ( @@ -2418,7 +2434,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "yr" = ( @@ -2443,10 +2460,7 @@ /turf/open/floor/engine/n2, /area/ruin/unpowered/syndicate_lava_base/engineering) "yA" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "syndie_lavaland_tox_sensor" - }, +/obj/machinery/air_sensor, /turf/open/floor/engine/plasma, /area/ruin/unpowered/syndicate_lava_base/engineering) "yG" = ( @@ -2455,10 +2469,8 @@ "yK" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/structure/closet/l3closet, /obj/machinery/light/small/broken{ dir = 8 @@ -2535,7 +2547,8 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "zd" = ( @@ -2581,7 +2594,8 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "zA" = ( @@ -2595,7 +2609,8 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) "zI" = ( @@ -2603,7 +2618,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "zK" = ( @@ -2673,7 +2689,8 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "An" = ( @@ -2743,11 +2760,10 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "AR" = ( @@ -2831,7 +2847,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "BN" = ( @@ -2860,7 +2877,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "Cc" = ( @@ -2905,7 +2923,7 @@ /area/ruin/unpowered/syndicate_lava_base/science) "Cp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -2939,7 +2957,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, @@ -2972,7 +2990,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) "CZ" = ( @@ -3003,7 +3022,8 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "DA" = ( @@ -3018,7 +3038,8 @@ /area/ruin/unpowered/syndicate_lava_base/cargo) "DI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "DK" = ( @@ -3063,7 +3084,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "EA" = ( @@ -3079,7 +3101,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/science) "EL" = ( @@ -3104,7 +3127,8 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) "ET" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) "EZ" = ( @@ -3137,7 +3161,8 @@ icon_state = "1-8" }, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -3215,7 +3240,7 @@ }, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/portable_thermomachine/atmos, /turf/open/floor/iron, @@ -3225,7 +3250,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/engineering) "GD" = ( @@ -3233,7 +3259,8 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "GE" = ( @@ -3248,7 +3275,8 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "GG" = ( @@ -3263,7 +3291,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/item/stack/sheet/wood, /obj/item/crowbar, /obj/item/screwdriver, @@ -3339,7 +3368,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "HA" = ( @@ -3377,7 +3407,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "HD" = ( @@ -3412,7 +3443,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/closeup, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/unpowered/syndicate_lava_base/chemistry) "HT" = ( @@ -3427,7 +3459,8 @@ req_access_txt = "150"; name = "Science Lal Exterior Airlock" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "HX" = ( @@ -3449,7 +3482,7 @@ /area/ruin/unpowered/syndicate_lava_base/arrivals) "Ig" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -3458,10 +3491,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/structure/table, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, @@ -3491,7 +3522,7 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/item/stack/tile/iron, @@ -3502,7 +3533,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "IH" = ( @@ -3517,11 +3549,10 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "IN" = ( @@ -3608,7 +3639,6 @@ "Jv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8; - frequency = 1442; id_tag = "syndie_lavaland_n2_out"; name = "nitrogen out" }, @@ -3618,7 +3648,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "Jz" = ( @@ -3638,7 +3669,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "JM" = ( @@ -3667,7 +3699,8 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "JW" = ( @@ -3708,7 +3741,7 @@ /turf/open/floor/iron/white/side, /area/ruin/unpowered/syndicate_lava_base/medbay) "Ku" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "KA" = ( @@ -3736,7 +3769,8 @@ dir = 1 }, /obj/machinery/firealarm/directional/west, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "KP" = ( @@ -3747,7 +3781,7 @@ "KU" = ( /obj/machinery/computer/camera_advanced/syndie, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -3771,7 +3805,7 @@ /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) "Lj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -3860,14 +3894,16 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Mq" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "Mr" = ( @@ -3899,7 +3935,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "My" = ( @@ -3908,19 +3945,21 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "MC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "ME" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/airlock_controller/incinerator_syndicatelava{ pixel_x = -8; pixel_y = -26 }, @@ -3943,7 +3982,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "ML" = ( @@ -3965,7 +4005,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -3998,7 +4038,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "MX" = ( @@ -4013,7 +4054,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "Nh" = ( @@ -4027,7 +4068,8 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Np" = ( @@ -4118,7 +4160,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Os" = ( @@ -4178,7 +4221,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "Po" = ( @@ -4192,16 +4236,14 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) "Pv" = ( -/obj/machinery/computer/atmos_control/tank{ +/obj/machinery/computer/atmos_control{ dir = 8; - frequency = 1442; - name = "Nitrogen Supply Control"; - output_tag = "syndie_lavaland_n2_out"; - sensors = list("syndie_lavaland_n2_sensor"="Tank") + name = "Nitrogen Supply Control" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -4234,7 +4276,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -4269,7 +4312,8 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/barricade/wooden/crude, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) @@ -4279,7 +4323,8 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) "PI" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "PK" = ( @@ -4295,7 +4340,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "PW" = ( @@ -4324,7 +4370,6 @@ "Qf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 1; - frequency = 1442; id_tag = "syndie_lavaland_tox_out"; name = "toxin out" }, @@ -4351,7 +4396,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "Qs" = ( @@ -4407,10 +4453,8 @@ /obj/item/screwdriver/nuke{ pixel_y = 18 }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white/side{ dir = 4 @@ -4436,7 +4480,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "Rh" = ( @@ -4476,7 +4521,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "Ry" = ( @@ -4505,7 +4551,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "RP" = ( @@ -4516,7 +4563,8 @@ dir = 4 }, /obj/machinery/firealarm/directional/north, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "RU" = ( @@ -4536,10 +4584,8 @@ "RZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/randomvend/cola{ hacked = 1 @@ -4587,7 +4633,8 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) "Sr" = ( @@ -4643,7 +4690,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) "SE" = ( @@ -4684,7 +4732,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Tc" = ( @@ -4694,10 +4743,10 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, @@ -4706,17 +4755,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Ti" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/computer/atmos_control/tank{ +/obj/machinery/computer/atmos_control{ dir = 8; - frequency = 1442; - name = "Toxins Supply Control"; - output_tag = "syndie_lavaland_tox_out"; - sensors = list("syndie_lavaland_tox_sensor"="Tank") + name = "Toxins Supply Control" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4738,7 +4785,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Tv" = ( @@ -4747,7 +4795,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "Tz" = ( @@ -4791,13 +4840,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "Uh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8; - frequency = 1442; id_tag = "syndie_lavaland_o2_out"; name = "oxygen out" }, @@ -4808,7 +4857,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "Ut" = ( @@ -4843,7 +4893,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "UP" = ( @@ -4879,7 +4930,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) "Vf" = ( @@ -4894,7 +4946,8 @@ /area/ruin/unpowered/syndicate_lava_base/telecomms) "Vk" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -4924,7 +4977,7 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "VP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, @@ -4942,7 +4995,7 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "VV" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -4982,7 +5035,7 @@ "Ww" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -5014,10 +5067,8 @@ /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) "WJ" = ( -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/machinery/light/small{ dir = 8 }, @@ -5073,10 +5124,8 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) "Xd" = ( -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -5089,7 +5138,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -5126,7 +5176,8 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) "XV" = ( @@ -5156,15 +5207,12 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) "Ye" = ( -/obj/machinery/computer/atmos_control/tank{ +/obj/machinery/computer/atmos_control{ dir = 8; - frequency = 1442; - name = "Oxygen Supply Control"; - output_tag = "syndie_lavaland_o2_out"; - sensors = list("syndie_lavaland_o2_sensor"="Tank") + name = "Oxygen Supply Control" }, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "Yj" = ( @@ -5174,7 +5222,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "Yx" = ( @@ -5185,10 +5234,8 @@ /area/ruin/unpowered/syndicate_lava_base/bar) "Yz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/structure/chair/stool, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) @@ -5198,7 +5245,8 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "YD" = ( @@ -5255,10 +5303,8 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "YV" = ( -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/machinery/light/small{ dir = 8 }, @@ -5317,16 +5363,15 @@ icon_state = "0-8" }, /obj/effect/turf_decal/tile/neutral, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "Zi" = ( /obj/structure/table/wood, /obj/item/ammo_box/magazine/m10mm, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) "Zj" = ( @@ -5370,7 +5415,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "ZE" = ( diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm index c818971a6383b..33537846f0e34 100644 --- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm +++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm @@ -12,30 +12,30 @@ /turf/closed/wall, /area/ruin/space/has_grav/powered/macspace) "af" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "ag" = ( /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "ah" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "ai" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "aj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "ak" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/powered/macspace) "al" = ( @@ -95,7 +95,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "aw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/vending/dinnerware, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) @@ -176,7 +176,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "aL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "aM" = ( @@ -265,14 +265,14 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "be" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "bf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -336,7 +336,7 @@ /area/ruin/space/has_grav/powered/macspace) "br" = ( /obj/item/toy/figure/chef, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "bs" = ( @@ -402,7 +402,7 @@ "bH" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/burger/superbite, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "bI" = ( @@ -453,7 +453,7 @@ "bR" = ( /obj/structure/chair/stool/bar, /obj/item/toy/figure/assistant, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/decal/cleanable/food/tomato_smudge, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/macspace) @@ -759,7 +759,7 @@ /area/ruin/space/has_grav/powered/macspace) "dd" = ( /obj/structure/sign/poster/contraband/eat, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/powered/macspace) "de" = ( @@ -774,20 +774,20 @@ /area/ruin/space/has_grav/powered/macspace) "dh" = ( /obj/machinery/mech_bay_recharge_port, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/macspace) "di" = ( /turf/open/floor/mech_bay_recharge_floor, /area/ruin/space/has_grav/powered/macspace) "dj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/closed/wall, /area/ruin/space/has_grav/powered/macspace) "dk" = ( -/obj/machinery/atmospherics/components/unary/tank/oxygen, +/obj/machinery/atmospherics/components/tank/oxygen, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/macspace) "dl" = ( @@ -801,13 +801,13 @@ /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/macspace) "dn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/macspace) "do" = ( -/obj/machinery/atmospherics/pipe/manifold4w, +/obj/machinery/atmospherics/pipe/smart/manifold4w, /turf/closed/wall, /area/ruin/space/has_grav/powered/macspace) "dp" = ( @@ -818,7 +818,7 @@ /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/powered/macspace) "dq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/closed/wall, @@ -841,7 +841,7 @@ dir = 4 }, /obj/item/toy/toy_xeno, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/macspace) "dy" = ( @@ -857,7 +857,7 @@ dir = 4 }, /obj/item/toy/figure/scientist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/macspace) "dA" = ( @@ -885,7 +885,7 @@ dir = 4 }, /obj/item/toy/figure/roboticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/macspace) "dE" = ( @@ -906,7 +906,7 @@ /area/ruin/space/has_grav/powered/macspace) "dH" = ( /obj/structure/chair/wood/wings, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/powered/macspace) "ea" = ( @@ -930,7 +930,7 @@ /area/ruin/space/has_grav/powered/macspace) "lR" = ( /obj/item/food/fishfingers, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/table/wood/fancy/blue, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 0950d07ad713d..8e788605e4c10 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -3234,7 +3234,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lv" = ( @@ -3244,7 +3244,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lw" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lx" = ( @@ -3301,7 +3301,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating/airless, @@ -3316,18 +3316,18 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lN" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden, /obj/machinery/meter, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 9 }, /turf/open/floor/plating/airless, @@ -3360,13 +3360,13 @@ /turf/open/floor/iron/airless, /area/ruin/space/derelict/atmospherics) "lU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/atmospherics) "lV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 541c793181fa8..7fe1e819900f2 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -252,7 +252,7 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered) "eE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -360,14 +360,14 @@ /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter3) "gU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter3) "gV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -442,7 +442,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "hv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter3) @@ -511,7 +511,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "ia" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/airless{ broken = 1 }, @@ -529,7 +529,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "ic" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless{ broken = 1 @@ -578,13 +578,13 @@ /area/shuttle/caravan/freighter2) "it" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter2) "iu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/airless{ @@ -592,7 +592,7 @@ }, /area/shuttle/caravan/freighter2) "ix" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/iron/airless{ @@ -616,27 +616,27 @@ /area/shuttle/caravan/freighter3) "iA" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating/airless{ broken = 1 }, /area/shuttle/caravan/freighter3) "iB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "iC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless{ burnt = 1 }, /area/shuttle/caravan/freighter3) "iD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /mob/living/simple_animal/hostile/syndicate/ranged/smg/space, @@ -671,7 +671,7 @@ /area/shuttle/caravan/freighter2) "iU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter2) "iY" = ( @@ -706,7 +706,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) "jq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter2) @@ -726,7 +726,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "jH" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -737,24 +737,24 @@ "jI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter2) "jJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter2) "jK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron/airless{ burnt = 1 }, /area/shuttle/caravan/freighter2) "jL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /mob/living/simple_animal/hostile/pirate/ranged/space{ @@ -897,7 +897,7 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter3) "om" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/closet/crate/secure/plasma, /obj/item/tank/internals/plasma/full, /obj/item/stack/sheet/mineral/plasma{ @@ -925,10 +925,8 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter3) "qz" = ( -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/blood, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -956,7 +954,7 @@ "ts" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/door_assembly/door_assembly_com{ @@ -973,10 +971,8 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/unpowered) "uK" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, @@ -1027,7 +1023,7 @@ /area/shuttle/caravan/freighter3) "yB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter2) "zg" = ( @@ -1052,7 +1048,7 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter2) "Ao" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -1060,15 +1056,13 @@ /area/shuttle/caravan/freighter3) "Aw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter2) "BN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -1115,7 +1109,7 @@ /area/shuttle/caravan/freighter3) "FK" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1156,10 +1150,8 @@ /area/shuttle/caravan/freighter2) "Ib" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 1575683283ab4..072f8546eccd3 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -64,13 +64,13 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) "ap" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) "aq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/iron/freezer, @@ -110,11 +110,11 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) "ay" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) "az" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage/kitchen) "aA" = ( @@ -182,10 +182,8 @@ /obj/item/stack/sheet/wood, /obj/item/stack/package_wrap, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/away{ - pixel_y = 23; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) @@ -257,11 +255,11 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "aM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/kitchen) "aN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/door/airlock{ name = "Freezer" }, @@ -391,7 +389,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron/cafeteria, @@ -399,11 +397,9 @@ "aZ" = ( /obj/structure/table, /obj/machinery/reagentgrinder, -/obj/machinery/airalarm/away{ - pixel_y = 23; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -416,13 +412,13 @@ pixel_y = 4 }, /obj/item/knife/kitchen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bc" = ( @@ -448,7 +444,7 @@ /area/ruin/space/has_grav/deepstorage) "bf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron, @@ -456,7 +452,7 @@ "bg" = ( /obj/machinery/door/firedoor, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -465,7 +461,7 @@ /obj/structure/table, /obj/item/storage/bag/plants/portaseeder, /obj/item/storage/bag/plants, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -475,7 +471,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -484,14 +480,14 @@ /obj/machinery/vending/hydroseeds{ slogan_delay = 700 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "bk" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/light, @@ -501,7 +497,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/light, @@ -514,14 +510,14 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -529,14 +525,14 @@ /area/ruin/space/has_grav/deepstorage/storage) "bp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -559,7 +555,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -574,7 +570,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -600,7 +596,7 @@ /area/ruin/space/has_grav/deepstorage) "bz" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "bA" = ( @@ -628,14 +624,14 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "bE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/tank_dispenser/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bG" = ( @@ -659,11 +655,11 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /obj/structure/cable/yellow{ @@ -672,7 +668,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -681,7 +677,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/structure/cable/yellow{ @@ -802,7 +798,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/storage) "bX" = ( @@ -811,7 +807,7 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bY" = ( @@ -822,11 +818,11 @@ /obj/machinery/door/airlock/public/glass{ name = "Kitchen" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/smartfridge, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/kitchen) @@ -846,7 +842,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cc" = ( @@ -889,16 +885,14 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "ch" = ( -/obj/machinery/airalarm/away{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "ci" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) @@ -930,32 +924,30 @@ /area/ruin/space/has_grav/deepstorage) "cs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm/away{ - pixel_y = 23; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) "ct" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -964,7 +956,7 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "cw" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/light, @@ -977,14 +969,14 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "cx" = ( /obj/machinery/seed_extractor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "cy" = ( /obj/machinery/biogenerator, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/item/reagent_containers/cup/beaker/large, @@ -992,14 +984,14 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "cz" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/light, /area/ruin/space/has_grav/deepstorage/hydroponics) "cA" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/light, @@ -1039,7 +1031,7 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/iron, @@ -1053,30 +1045,30 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "cE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/iron, @@ -1099,11 +1091,11 @@ /obj/structure/mirror{ pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) "cP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1121,7 +1113,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "cR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1146,7 +1138,7 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) "cZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) "da" = ( @@ -1190,20 +1182,20 @@ /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/armory) "df" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "dg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/storage) "dh" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -1212,7 +1204,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "di" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1223,7 +1215,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1233,11 +1225,11 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -1271,22 +1263,22 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage) "dq" = ( /obj/machinery/door/airlock{ name = "Showers" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) "dr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1418,13 +1410,13 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "dz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/storage) "dA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/closed/wall/mineral/iron, @@ -1440,18 +1432,18 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1461,30 +1453,30 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/light{ @@ -1494,12 +1486,12 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dJ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -1507,7 +1499,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dL" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1519,19 +1511,19 @@ name = "Secure Storage"; req_access_txt = "200" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/deepstorage/armory) "dN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/deepstorage/armory) "dO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/iron/dark, @@ -1545,14 +1537,12 @@ /obj/item/radio{ pixel_x = 4 }, -/obj/machinery/airalarm/away{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/deepstorage/armory) "dQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/dorm) "dR" = ( @@ -1560,7 +1550,7 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron, @@ -1574,7 +1564,7 @@ name = "Dorms" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1584,12 +1574,12 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1603,7 +1593,7 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1614,7 +1604,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dX" = ( @@ -1622,7 +1612,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1635,18 +1625,18 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "dZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1656,7 +1646,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "eb" = ( @@ -1665,13 +1655,13 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "ec" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1682,7 +1672,7 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1692,7 +1682,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "ee" = ( @@ -1703,7 +1693,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark, @@ -1712,7 +1702,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/iron/dark, @@ -1752,14 +1742,14 @@ /area/ruin/space/has_grav/deepstorage/dorm) "ek" = ( /obj/structure/bed, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/item/bedsheet, /turf/open/floor/wood, /area/ruin/space/has_grav/deepstorage/dorm) "el" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/mineral/iron, @@ -1769,7 +1759,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/dorm) "en" = ( @@ -1785,7 +1775,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "ep" = ( @@ -1808,15 +1798,15 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "es" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/airlock) "et" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1841,7 +1831,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/armory) "ev" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/iron/dark, @@ -1877,7 +1867,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/deepstorage/dorm) "eA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, @@ -1886,8 +1876,8 @@ /obj/machinery/door/airlock{ name = "Personal Dorm" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, @@ -1897,7 +1887,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1921,11 +1911,11 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "eG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -1935,7 +1925,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "eH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /turf/closed/wall/mineral/iron, @@ -1962,7 +1952,7 @@ pixel_y = 8; req_access_txt = "200" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/machinery/computer/security/telescreen/bunker{ @@ -1973,7 +1963,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "eJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1983,14 +1973,14 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "eK" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -2001,7 +1991,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "eL" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -2074,7 +2064,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/dorm) "eR" = ( @@ -2117,7 +2107,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "eW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) @@ -2137,7 +2127,7 @@ name = "Atmospherics and Power Storage"; req_access_txt = "200" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2150,23 +2140,23 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "fa" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/armory) "fb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/armory) "fc" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/mineral/iron, @@ -2187,7 +2177,7 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/dorm) "ff" = ( @@ -2228,7 +2218,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "fl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2237,20 +2227,18 @@ /area/ruin/space/has_grav/deepstorage/power) "fm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "fn" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/airalarm/away{ - pixel_y = 23; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) @@ -2271,7 +2259,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "fr" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden{ dir = 5 }, /obj/machinery/light/small{ @@ -2282,24 +2270,22 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "fs" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden{ dir = 4 }, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/airlock) "ft" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden{ dir = 4 }, -/obj/machinery/airalarm/away{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/away_general_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "fu" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden{ dir = 4 }, /obj/machinery/light, @@ -2324,7 +2310,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "fx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2347,16 +2333,16 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "fz" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "fA" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -2364,13 +2350,13 @@ "fB" = ( /obj/machinery/door/firedoor, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "fC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{ dir = 8; id_tag = "o2_out_bunker"; name = "oxygen out" @@ -2388,7 +2374,7 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/dorm) "fF" = ( @@ -2397,7 +2383,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "fG" = ( @@ -2410,21 +2396,18 @@ /area/ruin/space/has_grav/deepstorage/airlock) "fH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "fI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "fJ" = ( -/obj/machinery/computer/atmos_control/tank{ +/obj/machinery/computer/atmos_control{ dir = 8; - input_tag = "o2_in_bunker"; - name = "Oxygen Supply Control"; - output_tag = "o2_out_bunker"; - sensors = list("o2_sensor_bunker"="Tank") + name = "Oxygen Supply Control" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -2435,9 +2418,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "fL" = ( -/obj/machinery/air_sensor{ - id_tag = "o2_sensor_bunker" - }, +/obj/machinery/air_sensor, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/deepstorage/power) "fM" = ( @@ -2448,15 +2429,15 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/deepstorage/power) "fN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/dorm) "fO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/dorm) "fP" = ( @@ -2485,7 +2466,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -2495,7 +2476,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron, @@ -2526,7 +2507,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, @@ -2535,7 +2516,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/sign/warning/electricshock{ @@ -2550,13 +2531,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "fZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -2573,14 +2554,14 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gc" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/door/firedoor, @@ -2588,9 +2569,8 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ - dir = 8; - id = "n2_in_bunker" +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ + chamber_id = "n2_in_bunker" }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/deepstorage/power) @@ -2598,14 +2578,14 @@ /obj/machinery/door/airlock{ name = "Personal Dorm" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, /area/ruin/space/has_grav/deepstorage/dorm) "gf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -2615,10 +2595,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/airalarm/away{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/away_general_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/dorm) @@ -2647,7 +2625,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "2-8" @@ -2703,7 +2681,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" @@ -2715,13 +2693,13 @@ /area/ruin/space/has_grav/deepstorage/power) "gu" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{ dir = 8; id_tag = "n2_out_bunker"; name = "nitrogen out" @@ -2762,7 +2740,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage) "gA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2779,22 +2757,13 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gC" = ( -/obj/machinery/computer/atmos_control/tank{ +/obj/machinery/computer/atmos_control{ dir = 8; - input_tag = "n2_in_bunker"; - name = "Nitrogen Supply Control"; - output_tag = "n2_out_bunker"; - sensors = list("n2_sensor_bunker"="Tank") + name = "Nitrogen Supply Control" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) -"gD" = ( -/obj/machinery/air_sensor{ - id_tag = "n2_sensor_bunker" - }, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/deepstorage/power) "gE" = ( /obj/machinery/atmospherics/miner/nitrogen, /obj/machinery/light/small{ @@ -2851,7 +2820,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-8" @@ -2870,9 +2839,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gP" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ - dir = 8; - id = "o2_in_bunker" +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ + chamber_id = "o2_in_bunker" }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/deepstorage/power) @@ -2896,7 +2864,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/power) "gT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/machinery/modular_fabricator/autolathe, @@ -2907,14 +2875,14 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/power) "gV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /obj/structure/table, @@ -2985,17 +2953,15 @@ /area/ruin/space/has_grav/deepstorage/crusher) "hf" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/airalarm/away{ - pixel_y = 23; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/light, /area/ruin/space/has_grav/deepstorage/hydroponics) "hg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/firealarm{ @@ -3007,7 +2973,7 @@ "hh" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron, @@ -3020,7 +2986,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -3034,7 +3000,7 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -3042,11 +3008,11 @@ "hk" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "hl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3073,7 +3039,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "ho" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/closed/wall/mineral/iron, @@ -3088,7 +3054,7 @@ "hq" = ( /obj/machinery/door/firedoor, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/plating, @@ -3098,14 +3064,14 @@ /turf/closed/mineral/random/low_chance, /area/ruin/unpowered/no_grav) "hs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "hA" = ( @@ -3140,7 +3106,7 @@ /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage/power) "iL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/vending/coffee, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, @@ -3148,7 +3114,7 @@ "ja" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/light{ @@ -3159,11 +3125,9 @@ /area/ruin/space/has_grav/deepstorage) "je" = ( /obj/structure/table, -/obj/machinery/airalarm/away{ - pixel_y = 23; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/away_general_access, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -3201,7 +3165,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/crusher) "rD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ dir = 4; @@ -3238,14 +3202,14 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "NT" = ( /obj/structure/closet/crate/bin, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -3256,12 +3220,12 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "Rs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/airlock) "RQ" = ( @@ -5021,7 +4985,7 @@ fL gd fp gv -gD +fL gP fp ab diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index 8a8277243b798..e5c61df09f9bc 100644 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm @@ -155,7 +155,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/gasthelizard) "t" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/machinery/power/apc{ @@ -173,17 +173,17 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/gasthelizard) "u" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/gasthelizard) "v" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron, /area/ruin/space/has_grav/gasthelizard) "w" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/light{ @@ -210,7 +210,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/gasthelizard) "A" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/structure/cable{ @@ -240,7 +240,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/gasthelizard) "F" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 07f507b4c2e52..be7534341db63 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -10,10 +10,8 @@ /area/ruin/space/has_grav/listeningstation) "ad" = ( /obj/machinery/computer/message_monitor, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/paper/monitorkey, @@ -155,10 +153,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "ay" = ( @@ -206,11 +202,11 @@ oxygentanks = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/listeningstation) "aF" = ( -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/closed/wall/r_wall, /area/ruin/space/has_grav/listeningstation) "aG" = ( @@ -260,8 +256,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aQ" = ( -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aR" = ( @@ -269,8 +265,8 @@ /obj/machinery/door/airlock{ name = "Personal Quarters" }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aS" = ( @@ -278,8 +274,8 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aY" = ( @@ -308,13 +304,11 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bc" = ( @@ -326,7 +320,7 @@ /area/ruin/space/has_grav/listeningstation) "bd" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "be" = ( @@ -346,8 +340,8 @@ /turf/open/floor/iron/white/corner, /area/ruin/space/has_grav/listeningstation) "bg" = ( -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white/side, /area/ruin/space/has_grav/listeningstation) "bh" = ( @@ -367,8 +361,8 @@ /obj/effect/turf_decal/caution/red{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bl" = ( @@ -386,7 +380,7 @@ /area/ruin/space/has_grav/listeningstation) "bm" = ( /obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bn" = ( @@ -399,8 +393,8 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medbay" }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/space/has_grav/listeningstation) "bp" = ( @@ -410,8 +404,8 @@ /obj/machinery/door/airlock{ name = "Cabin" }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bq" = ( @@ -439,7 +433,7 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bs" = ( @@ -455,7 +449,7 @@ }, /area/ruin/space/has_grav/listeningstation) "bt" = ( -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -487,7 +481,7 @@ /area/ruin/space/has_grav/listeningstation) "bz" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bA" = ( @@ -506,10 +500,8 @@ }, /obj/machinery/iv_drip, /obj/machinery/light/small, -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -532,11 +524,11 @@ "bF" = ( /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bH" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/turf_decal/bot, @@ -579,15 +571,15 @@ specialfunctions = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "fA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "fS" = ( @@ -595,8 +587,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "hl" = ( @@ -636,8 +628,8 @@ /area/ruin/space/has_grav/listeningstation) "ik" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "iF" = ( @@ -732,24 +724,22 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "Jn" = ( -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/effect/baseturf_helper/asteroid/airless, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "Kq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/listeningstation) "Lc" = ( @@ -759,8 +749,8 @@ req_access_txt = "150" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "QK" = ( @@ -779,8 +769,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "TB" = ( @@ -815,16 +805,16 @@ req_access_txt = "150" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "WI" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, -/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "XP" = ( diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index 229243a548023..67cc31cbf3b34 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -42,7 +42,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "al" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -51,27 +51,27 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "am" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "an" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "ao" = ( -/obj/machinery/atmospherics/pipe/manifold/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/hidden{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "ap" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -92,11 +92,11 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "as" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden, /turf/closed/wall, /area/ruin/space/has_grav/powered/cat_man) "at" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "au" = ( @@ -156,7 +156,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aE" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) @@ -180,7 +180,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "aM" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -303,19 +303,19 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bm" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, /turf/closed/wall, /area/ruin/space/has_grav/powered/cat_man) "bn" = ( -/obj/machinery/atmospherics/pipe/manifold/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -426,7 +426,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -459,14 +459,14 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bR" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 6 }, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bS" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -474,7 +474,7 @@ /area/ruin/space/has_grav/powered/cat_man) "bU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -505,24 +505,24 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "bZ" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 5 }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "ca" = ( -/obj/machinery/atmospherics/pipe/manifold/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/hidden{ dir = 1 }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "cb" = ( -/obj/machinery/atmospherics/pipe/manifold/green/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/green/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "cc" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -538,7 +538,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "ce" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -564,13 +564,13 @@ /area/ruin/space/has_grav/powered/cat_man) "ci" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "cj" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 5 }, /obj/structure/table, @@ -580,13 +580,13 @@ /area/ruin/space/has_grav/powered/cat_man) "ck" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) "cl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{ dir = 8; id_tag = "n2o_out_cat"; name = "n2o out" @@ -601,7 +601,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powered/cat_man) "co" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/closed/wall, /area/ruin/space/has_grav/powered/cat_man) "cp" = ( @@ -620,7 +620,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powered/cat_man) "cs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{ dir = 1; id_tag = "o2_out_cat"; name = "freezer vent" @@ -856,7 +856,7 @@ desc = "A slab of cat meat. Tastes like furball."; name = "cat meat" }, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 6 }, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 2a114fb99921f..98f747fcf4e91 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -338,7 +338,7 @@ /area/ruin/space/has_grav/ancientstation/comm) "bl" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/comm) @@ -397,7 +397,7 @@ /obj/machinery/door/airlock/command/glass{ name = "Bridge" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/comm) @@ -493,7 +493,7 @@ /area/ruin/space/has_grav/ancientstation) "bT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) @@ -627,7 +627,7 @@ /area/ruin/space/has_grav/ancientstation) "cm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/generic, @@ -636,7 +636,7 @@ /area/ruin/space/has_grav/ancientstation) "cn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -645,7 +645,7 @@ "co" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -653,7 +653,7 @@ /area/ruin/space/has_grav/ancientstation) "cp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -852,7 +852,7 @@ /area/ruin/space/has_grav/ancientstation) "cP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -878,7 +878,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "cU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -923,7 +923,7 @@ "cZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -934,7 +934,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/science, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -942,7 +942,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "db" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -951,7 +951,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "dc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -960,7 +960,7 @@ "dd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -970,7 +970,7 @@ "de" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -978,7 +978,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "df" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -1040,7 +1040,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/hydroponics) "dt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -1064,7 +1064,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "dx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1093,7 +1093,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "dB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -1154,7 +1154,7 @@ /area/ruin/space/has_grav/ancientstation/sec) "dX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -1203,7 +1203,7 @@ /area/template_noop) "el" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/engi) @@ -1342,16 +1342,14 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -23 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "eL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -1359,7 +1357,7 @@ /area/ruin/space/has_grav/ancientstation/engi) "eM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1367,14 +1365,14 @@ /area/ruin/space/has_grav/ancientstation/engi) "eP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "eR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -1382,7 +1380,7 @@ /area/ruin/space/has_grav/ancientstation/hydroponics) "eS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -1401,7 +1399,7 @@ "eX" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot, /turf/open/floor/iron, @@ -1460,7 +1458,7 @@ /area/ruin/space/has_grav/ancientstation/engi) "ff" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -1480,7 +1478,7 @@ "fh" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) @@ -1492,7 +1490,7 @@ /area/ruin/space/has_grav/ancientstation/hydroponics) "fn" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -1614,14 +1612,14 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "fI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) @@ -1629,7 +1627,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -1698,7 +1696,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "fS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot, /turf/open/floor/iron, @@ -1716,21 +1714,21 @@ }, /area/ruin/space/has_grav/ancientstation/rnd) "fX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/ancientstation/betanorth) "fY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/ancientstation/betanorth) "fZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1740,7 +1738,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/ancientstation/betanorth) "ga" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ @@ -1753,14 +1751,14 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/template_noop, /area/template_noop) "gc" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ @@ -1773,7 +1771,7 @@ /area/template_noop) "gd" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ @@ -1783,7 +1781,7 @@ /area/template_noop) "ge" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ @@ -1803,7 +1801,7 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -1816,7 +1814,7 @@ /area/ruin/space/has_grav/ancientstation/engi) "gh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ @@ -1827,7 +1825,7 @@ "gi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ @@ -1878,7 +1876,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/engi) @@ -1890,7 +1888,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/poddoor{ @@ -1909,7 +1907,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1920,7 +1918,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) @@ -1930,7 +1928,7 @@ }, /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1940,7 +1938,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1959,7 +1957,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1970,7 +1968,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2022,7 +2020,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2033,7 +2031,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2048,7 +2046,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/poddoor{ @@ -2064,7 +2062,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2075,7 +2073,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2089,7 +2087,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2098,7 +2096,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating/airless, @@ -2108,7 +2106,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2118,7 +2116,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2131,7 +2129,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2142,7 +2140,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2158,7 +2156,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2175,7 +2173,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2204,7 +2202,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "gO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2212,7 +2210,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "gP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -2249,7 +2247,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/deltacorridor) "gT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/betanorth) "gU" = ( @@ -2285,7 +2283,7 @@ "gZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -2333,7 +2331,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "hi" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/rnd) @@ -2419,7 +2417,7 @@ /area/ruin/space/has_grav/ancientstation/kitchen) "hv" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/ancientstation/kitchen) "hx" = ( @@ -2458,7 +2456,7 @@ "hD" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -2605,14 +2603,14 @@ /obj/machinery/chem_master, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/cup/beaker, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/ancientstation/rnd) "iq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2625,7 +2623,7 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -2811,7 +2809,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2827,7 +2825,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/rnd) "jd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/airlock/research{ name = "Research and Development" }, @@ -2837,7 +2835,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "je" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -2890,7 +2888,7 @@ /area/ruin/space/has_grav/ancientstation/engi) "jl" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2899,14 +2897,14 @@ "jm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "jn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -2915,7 +2913,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "jo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2923,7 +2921,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "jp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -2958,7 +2956,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "jt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2968,7 +2966,7 @@ "ju" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2979,7 +2977,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2987,7 +2985,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "jw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot, /turf/open/floor/iron, @@ -2997,7 +2995,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -3006,7 +3004,7 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "jy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -3065,7 +3063,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) @@ -3084,7 +3082,7 @@ "jI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) @@ -3160,7 +3158,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Cryogenics Room" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -3181,7 +3179,7 @@ /area/ruin/space/has_grav/ancientstation/proto) "jX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/airlock/highsecurity{ name = "Prototype Laboratory"; req_access_txt = "200" @@ -3202,7 +3200,7 @@ "jZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/machinery/meter, @@ -3262,7 +3260,7 @@ /area/ruin/space/has_grav/ancientstation/proto) "ki" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/white, /area/ruin/space/has_grav/ancientstation/proto) "kk" = ( @@ -3316,7 +3314,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/showcase/machinery/oldpod, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -3403,7 +3401,7 @@ /area/ruin/space/has_grav/ancientstation/atmo) "kC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/plating, @@ -3474,14 +3472,14 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/ancientstation/proto) "kK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/ancientstation/atmo) "kL" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/ancientstation/atmo) @@ -3520,7 +3518,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mob_spawn/human/oldeng, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -3570,7 +3568,7 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/ancientstation/proto) "kV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating/airless, @@ -3719,7 +3717,7 @@ /area/template_noop) "lR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -3727,7 +3725,7 @@ /area/ruin/space/has_grav/ancientstation/hydroponics) "lT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -3825,7 +3823,7 @@ req_access_txt = "200" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -3841,7 +3839,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -3961,7 +3959,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -3982,20 +3980,16 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation) "wn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - pixel_y = 23; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/ancientstation/kitchen) @@ -4042,9 +4036,10 @@ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ dir = 4; - pixel_x = -23 + pixel_x = -23; + locked = "0" }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -4110,10 +4105,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/sec) "Ab" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/ancientstation/atmo) @@ -4122,7 +4115,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -4170,11 +4163,9 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "BN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/rnd) @@ -4260,10 +4251,8 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/light{ dir = 4 }, @@ -4279,7 +4268,7 @@ /area/ruin/space/has_grav/ancientstation/rnd) "EM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/sec) @@ -4549,10 +4538,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -23 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/deltacorridor) @@ -4611,7 +4598,7 @@ /area/ruin/space/has_grav/ancientstation/betanorth) "Ns" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/rnd) @@ -4681,10 +4668,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -23 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot, /turf/open/floor/iron, @@ -4781,10 +4766,8 @@ /area/ruin/space/has_grav/ancientstation/deltacorridor) "Sk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot, /turf/open/floor/iron, @@ -4801,10 +4784,8 @@ "SC" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/clothing/suit/space/nasavoid/old, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 @@ -4833,10 +4814,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/ancientstation/comm) "Tz" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -4858,7 +4837,7 @@ /area/ruin/space/has_grav/ancientstation/sec) "Uq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/machinery/light/small{ @@ -4938,7 +4917,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation) "Yi" = ( @@ -4993,10 +4972,8 @@ /area/ruin/space/has_grav/ancientstation/sec) "YY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - pixel_y = 23; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/white, /area/ruin/space/has_grav/ancientstation/proto) "ZE" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index adeeca1933aa7..1300f79a71449 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -304,7 +304,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_3) "bi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_3) "bj" = ( @@ -335,7 +335,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_4) "bo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_4) "bp" = ( @@ -366,7 +366,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_5) "bu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_5) "bv" = ( @@ -397,7 +397,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_6) "bA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_6) "bB" = ( @@ -420,7 +420,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_3) "bF" = ( @@ -434,7 +434,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_4) "bH" = ( @@ -448,7 +448,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_5) "bJ" = ( @@ -462,7 +462,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_6) "bL" = ( @@ -493,7 +493,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_3) "bP" = ( @@ -502,7 +502,7 @@ name = "privacy button"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_3) "bQ" = ( @@ -535,7 +535,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_4) "bV" = ( @@ -544,7 +544,7 @@ name = "privacy button"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_4) "bW" = ( @@ -582,7 +582,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_5) "cb" = ( @@ -591,7 +591,7 @@ name = "privacy button"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_5) "cc" = ( @@ -629,7 +629,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_6) "ch" = ( @@ -638,7 +638,7 @@ name = "privacy button"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_6) "ci" = ( @@ -663,11 +663,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_3) "cm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom/room_3) "cn" = ( @@ -678,11 +678,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_4) "co" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom/room_4) "cp" = ( @@ -693,11 +693,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_5) "cq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom/room_5) "cr" = ( @@ -708,40 +708,40 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_6) "cs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom/room_6) "ct" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel) "cu" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "cv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "cw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel) "cx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -750,8 +750,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -764,7 +764,7 @@ name = "Room Number 3"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cA" = ( @@ -775,11 +775,11 @@ name = "Room Number 4"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1 }, /turf/open/floor/carpet, @@ -792,11 +792,11 @@ name = "Room Number 5"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/extinguisher_cabinet{ @@ -812,7 +812,7 @@ name = "Room Number 6"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/carpet, @@ -826,14 +826,14 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "cH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel) "cI" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -842,7 +842,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -855,7 +855,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -864,7 +864,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -879,24 +879,24 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/carpet, @@ -905,7 +905,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/carpet, @@ -914,7 +914,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "cR" = ( @@ -925,7 +925,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cT" = ( @@ -936,7 +936,7 @@ name = "Room Number 2"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cU" = ( @@ -952,20 +952,20 @@ name = "Room Number 1"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cY" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "cZ" = ( @@ -979,11 +979,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "db" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom/room_2) "dc" = ( @@ -997,11 +997,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "de" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom/room_1) "df" = ( @@ -1012,11 +1012,11 @@ "dg" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "dh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/workroom) "di" = ( @@ -1030,7 +1030,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/workroom) "dk" = ( @@ -1072,7 +1072,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "dp" = ( @@ -1081,7 +1081,7 @@ name = "privacy button"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "dq" = ( @@ -1133,7 +1133,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "dx" = ( @@ -1142,7 +1142,7 @@ name = "privacy button"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "dy" = ( @@ -1165,12 +1165,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/white, /area/ruin/space/has_grav/hotel/workroom) "dC" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/white, /area/ruin/space/has_grav/hotel/workroom) "dD" = ( @@ -1210,11 +1210,11 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "dK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "dL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "dM" = ( @@ -1241,11 +1241,11 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "dR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "dS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "dT" = ( @@ -1263,14 +1263,14 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/white, /area/ruin/space/has_grav/hotel/workroom) "dX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/open/floor/iron/white, @@ -1279,7 +1279,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/white, @@ -1288,13 +1288,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/hotel/workroom) "ea" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/white, @@ -1331,7 +1331,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "eh" = ( @@ -1357,7 +1357,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_1) "el" = ( @@ -1380,13 +1380,13 @@ /turf/open/floor/iron/white, /area/ruin/space/has_grav/hotel/workroom) "eo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/hotel/workroom) "ep" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white, @@ -1395,7 +1395,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1486,7 +1486,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/dock) "eH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/closed/wall, @@ -1498,7 +1498,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "eJ" = ( @@ -1533,7 +1533,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "eO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -1614,7 +1614,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -1623,7 +1623,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -1651,58 +1651,58 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/bar) "fk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "fl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "fm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) "fn" = ( /obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) "fo" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) "fp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "fq" = ( /obj/machinery/vending/cigarette, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "fr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel/dock) "fs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/wood, @@ -1761,29 +1761,29 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "fK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "fL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "fM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "fN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "fO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -1815,7 +1815,7 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "fV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/carpet, @@ -1823,13 +1823,13 @@ "fW" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "fX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/carpet, @@ -1898,7 +1898,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "gk" = ( @@ -1907,13 +1907,13 @@ /area/ruin/space/has_grav/hotel/bar) "gl" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "gm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -1965,7 +1965,7 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "gz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "gA" = ( @@ -2066,13 +2066,13 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "gU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "gV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -2096,7 +2096,7 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "he" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 8 }, /turf/closed/wall, @@ -2105,35 +2105,35 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "hg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel/bar) "hh" = ( /obj/structure/kitchenspike, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "hi" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "hj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -2163,7 +2163,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "hn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "ho" = ( @@ -2256,7 +2256,7 @@ /area/ruin/space/has_grav/hotel/bar) "hz" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "hA" = ( @@ -2322,7 +2322,7 @@ name = "Hotel Maintenance"; req_access_txt = "200,201" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/bar) "hJ" = ( @@ -2343,7 +2343,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating, @@ -2355,7 +2355,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, @@ -2364,7 +2364,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "hS" = ( @@ -2372,7 +2372,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -2384,7 +2384,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "hU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/bar) "hZ" = ( @@ -2394,19 +2394,19 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "ia" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel) "ib" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel/power) "ic" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, @@ -2419,14 +2419,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "ie" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /turf/closed/wall, @@ -2436,7 +2436,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "ij" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/carpet, @@ -2445,7 +2445,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -2456,7 +2456,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -2465,19 +2465,19 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "in" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "io" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/carpet, @@ -2495,7 +2495,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "ir" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/power) "iy" = ( @@ -2513,7 +2513,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "iD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/carpet, @@ -2534,14 +2534,14 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "iG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/dock) "iI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "iJ" = ( @@ -2575,7 +2575,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/dock) "iQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/dock) "iS" = ( @@ -2593,7 +2593,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2602,17 +2602,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "iW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "iY" = ( @@ -2622,7 +2622,7 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2638,7 +2638,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2647,7 +2647,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, @@ -2656,7 +2656,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -2665,7 +2665,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel) "jd" = ( @@ -2704,37 +2704,37 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "jk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "jl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "jn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel/power) "jo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel/security) "jp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1 }, /turf/closed/wall, @@ -2744,25 +2744,25 @@ name = "Hotel Security Checkpoint"; req_access_txt = "203" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/security) "jr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/security) "js" = ( /obj/structure/closet, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "jt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, @@ -2770,7 +2770,7 @@ "ju" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, @@ -2778,7 +2778,7 @@ "jv" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -2786,24 +2786,24 @@ "jw" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/pool) "jx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/pool) "jy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1 }, /turf/closed/wall, /area/ruin/space/has_grav/hotel/pool) "jz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/closed/wall, @@ -2815,7 +2815,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "jC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/iron, @@ -2836,7 +2836,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/security) "jP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/security) "jQ" = ( @@ -2871,7 +2871,7 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/pool) "jX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel/pool) "jY" = ( @@ -2885,11 +2885,11 @@ /area/ruin/space/has_grav/hotel/pool) "ka" = ( /obj/effect/spawner/randomarcade, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/pool) "kb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 8 }, /turf/closed/wall, @@ -2921,12 +2921,12 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "ki" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "kj" = ( /obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "kk" = ( @@ -2942,7 +2942,7 @@ /area/ruin/space/has_grav/hotel/pool) "kp" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/pool) "ky" = ( @@ -2955,7 +2955,7 @@ /obj/structure/table, /obj/item/folder/red, /obj/item/folder/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "kA" = ( @@ -2964,7 +2964,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "kF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/pool) "kG" = ( @@ -2981,7 +2981,7 @@ name = "Air Supply"; req_access_txt = "200,201" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kJ" = ( @@ -2995,7 +2995,7 @@ "kL" = ( /obj/structure/table, /obj/item/reagent_containers/cup/glass/coffee, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "kM" = ( @@ -3023,19 +3023,19 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/pool) "kV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/structure/sign/plaques/atmos{ @@ -3044,11 +3044,11 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kY" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "kZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -3105,14 +3105,14 @@ /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/pool) "lp" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "lq" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/plating, @@ -3143,13 +3143,13 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "lB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/airless, @@ -3158,7 +3158,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/airless, @@ -3167,7 +3167,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating/airless, @@ -3298,7 +3298,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/custodial) "mm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/custodial) "mn" = ( @@ -3308,7 +3308,7 @@ /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/pool) "mq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /turf/closed/wall, /area/ruin/space/has_grav/hotel/custodial) "mr" = ( @@ -3347,7 +3347,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -3356,11 +3356,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "mz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -3370,13 +3370,13 @@ name = "Hotel Maintenance"; req_access_txt = "201" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/pool) "mB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -3447,7 +3447,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -3523,7 +3523,7 @@ /turf/open/indestructible/sound/pool, /area/ruin/space/has_grav/hotel/pool) "pj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/door/airlock{ name = "Theatre"; req_access_txt = "200" @@ -3556,7 +3556,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "qI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/effect/turf_decal/pool, @@ -3656,7 +3656,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -3682,7 +3682,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "vD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -3699,7 +3699,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/hotel/security) "wi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -3886,7 +3886,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/secondary_solars) "BE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -4050,7 +4050,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/custodial) "He" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -4089,7 +4089,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -4133,7 +4133,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "IE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/pool/corner{ @@ -4226,7 +4226,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "Nb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -4299,7 +4299,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -4510,7 +4510,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/security) "WX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -4538,7 +4538,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel/power) "Yh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/pool, diff --git a/_maps/RuinGeneration/13x13_listening_base.dmm b/_maps/RuinGeneration/13x13_listening_base.dmm index 4f6a41b1ac0a5..a6f04d7506642 100644 --- a/_maps/RuinGeneration/13x13_listening_base.dmm +++ b/_maps/RuinGeneration/13x13_listening_base.dmm @@ -30,10 +30,10 @@ /turf/template_noop, /area/template_noop) "ee" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4; pixel_x = 5; pixel_y = 5 @@ -50,10 +50,8 @@ }, /obj/machinery/iv_drip, /obj/machinery/light/small, -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -86,10 +84,10 @@ /area/ruin/space/has_grav/listeningstation) "gd" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4; pixel_x = 5; pixel_y = 5 @@ -110,8 +108,8 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/listeningstation) "jx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/white/corner, /area/ruin/space/has_grav/listeningstation) "kI" = ( @@ -141,15 +139,13 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "kX" = ( -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4; pixel_x = 5; pixel_y = 5 @@ -161,10 +157,10 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "mh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -202,8 +198,8 @@ /obj/machinery/door/airlock{ name = "Cabin" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ pixel_x = 5; pixel_y = 5 }, @@ -214,13 +210,11 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4; pixel_x = 5; pixel_y = 5 @@ -232,10 +226,10 @@ /area/ruin/space/has_grav/listeningstation) "pa" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4; pixel_x = 5; pixel_y = 5 @@ -273,7 +267,7 @@ /area/ruin/space/has_grav/listeningstation) "qm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/structure/closet/emcloset/anchored, @@ -325,8 +319,8 @@ /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/listeningstation) "rx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ pixel_x = 5; pixel_y = 5 }, @@ -384,7 +378,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5; pixel_x = 5; pixel_y = 5 @@ -407,7 +401,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/power/apc/syndicate{ dir = 4; name = "Syndicate Listening Post APC"; @@ -439,10 +433,10 @@ /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/listeningstation) "xp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6; pixel_x = 5; pixel_y = 5 @@ -495,7 +489,7 @@ req_access_txt = "150"; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ pixel_x = 5; pixel_y = 5 @@ -510,8 +504,8 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "yP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10; pixel_x = 5; pixel_y = 5 @@ -534,7 +528,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "Bn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/item/stack/sheet/iron/twenty, @@ -561,10 +555,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/spawner/lootdrop/ruinloot/important, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) @@ -583,10 +575,10 @@ /area/ruin/space/has_grav/listeningstation) "Ed" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4; pixel_x = 5; pixel_y = 5 @@ -628,8 +620,8 @@ /area/ruin/space/has_grav/listeningstation) "Fs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) @@ -686,10 +678,10 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1; pixel_x = 5; pixel_y = 5 @@ -769,8 +761,8 @@ /turf/open/floor/circuit/red, /area/ruin/space/has_grav/listeningstation) "QE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9; pixel_x = 5; pixel_y = 5 @@ -782,8 +774,8 @@ "QT" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ pixel_x = 5; pixel_y = 5 }, @@ -806,7 +798,7 @@ /area/ruin/space/has_grav/listeningstation) "TD" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "TQ" = ( @@ -814,7 +806,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/listeningstation) "Vh" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/turf_decal/bot, @@ -829,10 +821,10 @@ /obj/effect/turf_decal/caution/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron, @@ -840,8 +832,8 @@ "Vy" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ pixel_x = 5; pixel_y = 5 }, @@ -858,8 +850,8 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "XB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ pixel_x = 5; pixel_y = 5 }, @@ -868,8 +860,8 @@ /area/ruin/space/has_grav/listeningstation) "XH" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ pixel_x = 5; pixel_y = 5 }, @@ -883,17 +875,15 @@ "Yu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "YS" = ( /obj/machinery/computer/message_monitor, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/paper/monitorkey, diff --git a/_maps/RuinGeneration/13x9_medical.dmm b/_maps/RuinGeneration/13x9_medical.dmm index 8369045cc4862..e6e4c21c75fd2 100644 --- a/_maps/RuinGeneration/13x9_medical.dmm +++ b/_maps/RuinGeneration/13x9_medical.dmm @@ -31,7 +31,7 @@ /turf/open/floor/iron/white, /area/ruin/unpowered) "ah" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -63,7 +63,7 @@ /turf/open/floor/iron/white, /area/ruin/unpowered) "an" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/iron/white, @@ -157,13 +157,13 @@ /turf/open/floor/iron/white, /area/ruin/unpowered) "aL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/white, /area/ruin/unpowered) "aN" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, @@ -187,7 +187,7 @@ /turf/open/floor/iron/white, /area/ruin/unpowered) "aQ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/RuinGeneration/25x21_shuttleconstructionbay.dmm b/_maps/RuinGeneration/25x21_shuttleconstructionbay.dmm index 3131043a2e626..0506474cb32df 100644 --- a/_maps/RuinGeneration/25x21_shuttleconstructionbay.dmm +++ b/_maps/RuinGeneration/25x21_shuttleconstructionbay.dmm @@ -224,7 +224,7 @@ /turf/open/floor/iron, /area/ruin/unpowered) "GG" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /turf/open/floor/plating/airless, @@ -299,7 +299,7 @@ /turf/open/floor/plating, /area/template_noop) "PL" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/plating/airless, /area/template_noop) "Qz" = ( @@ -367,7 +367,7 @@ /turf/open/floor/plating, /area/template_noop) "XY" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/plating/airless, diff --git a/_maps/RuinGeneration/41x41_corgasteroid.dmm b/_maps/RuinGeneration/41x41_corgasteroid.dmm index b85f97d499258..c5aaeb28855b0 100644 --- a/_maps/RuinGeneration/41x41_corgasteroid.dmm +++ b/_maps/RuinGeneration/41x41_corgasteroid.dmm @@ -28,7 +28,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/ruin/unpowered) @@ -43,7 +43,7 @@ /area/ruin/unpowered) "cH" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/template_noop, @@ -58,17 +58,17 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered) "cT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/closed/wall, /area/ruin/unpowered) "cX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall, /area/ruin/unpowered) "dk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/ruin/unpowered) @@ -77,17 +77,17 @@ /turf/open/floor/plating, /area/ruin/unpowered) "eZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "fl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "fB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall, /area/ruin/unpowered) "fN" = ( @@ -106,7 +106,7 @@ /obj/structure/sign/warning/vacuum{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/ruin/unpowered) @@ -137,7 +137,7 @@ /area/ruin/unpowered) "hp" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/template_noop, /area/template_noop) "ie" = ( @@ -148,13 +148,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/unpowered) "iy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "jk" = ( @@ -164,13 +164,13 @@ /turf/open/floor/iron, /area/ruin/unpowered) "jv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "jC" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -183,7 +183,7 @@ /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "kE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "kN" = ( @@ -214,12 +214,12 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "mi" = ( /obj/structure/chair/stool/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -236,13 +236,13 @@ /area/ruin/unpowered) "oI" = ( /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "oR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -266,7 +266,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -280,7 +280,7 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered) "qp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "qq" = ( @@ -299,7 +299,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "qG" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, @@ -316,19 +316,19 @@ /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "sw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, /area/ruin/unpowered) "te" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 5 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "tC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, @@ -355,7 +355,7 @@ /area/template_noop) "vh" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating, @@ -371,14 +371,14 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/ruin/unpowered) "vt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, @@ -392,14 +392,14 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered) "vQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "vU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -418,8 +418,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "wr" = ( -/obj/machinery/advanced_airlock_controller/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /obj/machinery/light/small{ @@ -440,11 +439,11 @@ /area/ruin/unpowered) "wS" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "xC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -471,13 +470,13 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, /area/ruin/unpowered) "yQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "zc" = ( @@ -485,7 +484,7 @@ dir = 1 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -498,7 +497,7 @@ /area/ruin/unpowered) "Ak" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/template_noop, @@ -510,7 +509,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "Av" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -525,7 +524,7 @@ /turf/open/floor/iron, /area/ruin/unpowered) "By" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -537,7 +536,7 @@ /turf/open/floor/iron, /area/ruin/unpowered) "Cb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -568,13 +567,13 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered) "Cy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "CK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/ruin/unpowered) @@ -589,7 +588,7 @@ /turf/open/floor/iron, /area/ruin/unpowered) "Dq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -598,10 +597,10 @@ /turf/open/floor/iron, /area/ruin/unpowered) "Du" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "Dx" = ( @@ -610,16 +609,16 @@ /turf/template_noop, /area/template_noop) "DU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "Ef" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -639,7 +638,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -658,7 +657,7 @@ /area/ruin/unpowered) "FX" = ( /obj/item/crowbar/red, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1 }, /turf/open/floor/plating, @@ -672,7 +671,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -703,7 +702,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "IF" = ( @@ -716,7 +715,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "IL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -750,7 +749,7 @@ /area/ruin/unpowered) "JI" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -764,7 +763,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/spawner/lootdrop/ruinloot/basic, @@ -778,7 +777,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "Lr" = ( @@ -792,20 +791,20 @@ /area/ruin/unpowered) "LM" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron, /area/ruin/unpowered) "Nr" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/template_noop, /area/template_noop) "Ns" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/plating/asteroid, @@ -818,7 +817,7 @@ dir = 9 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -848,7 +847,7 @@ /area/template_noop) "Pv" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "PF" = ( @@ -865,7 +864,7 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered) "Qr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -884,7 +883,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -897,7 +896,7 @@ /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "Rf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron, @@ -912,7 +911,7 @@ "RG" = ( /obj/structure/transit_tube/diagonal, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/template_noop, @@ -941,11 +940,11 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "Si" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating, /area/ruin/unpowered) "SC" = ( @@ -958,13 +957,13 @@ /area/ruin/unpowered) "Ty" = ( /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) "TZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, @@ -986,7 +985,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1033,7 +1032,7 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered) "VT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/closed/wall, @@ -1042,16 +1041,15 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump{ dir = 4 }, -/obj/machinery/advanced_airlock_controller/directional/east, /turf/open/floor/plating, /area/ruin/unpowered) "Wn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ruin/unpowered) "Xc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -1062,7 +1060,7 @@ /turf/template_noop, /area/template_noop) "XL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating/asteroid, @@ -1071,7 +1069,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/plating/asteroid, /area/ruin/unpowered) diff --git a/_maps/arenas/aiupload.dmm b/_maps/arenas/aiupload.dmm index 32be0208f4a19..db834c8a89eae 100644 --- a/_maps/arenas/aiupload.dmm +++ b/_maps/arenas/aiupload.dmm @@ -28,7 +28,6 @@ dir = 1 }, /obj/structure/window/reinforced{ - CanAtmosPass = 3; dir = 4 }, /turf/open/floor/iron/techmaint, diff --git a/_maps/arenas/supermatter.dmm b/_maps/arenas/supermatter.dmm index d4240a7be7d84..bf190acf95b3c 100644 --- a/_maps/arenas/supermatter.dmm +++ b/_maps/arenas/supermatter.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -10,7 +10,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -22,7 +22,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -31,7 +31,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/dark, @@ -40,7 +40,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/dark, @@ -49,7 +49,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -65,14 +65,14 @@ dir = 1 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/engine, /area/tdome/arena) "ak" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/engine, @@ -84,7 +84,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/engine, @@ -101,14 +101,14 @@ dir = 1 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/engine, /area/tdome/arena) "ap" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/engine, @@ -157,7 +157,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/engine, /area/tdome/arena) "ax" = ( @@ -168,7 +168,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/engine, /area/tdome/arena) "az" = ( @@ -190,7 +190,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/engine, @@ -199,7 +199,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/engine, @@ -211,7 +211,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/engine, @@ -220,7 +220,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/engine, @@ -236,7 +236,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/engine, @@ -248,7 +248,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/engine, @@ -257,7 +257,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/engine, @@ -267,7 +267,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/engine, @@ -276,7 +276,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/dark, @@ -285,7 +285,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -294,7 +294,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -303,7 +303,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -312,7 +312,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -321,27 +321,27 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/dark, /area/tdome/arena) "aR" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4; icon_state = "pipe11-2" }, /turf/open/floor/bluespace, /area/tdome/arena) "aT" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/bluespace, /area/tdome/arena) "aU" = ( /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4; icon_state = "pipe11-2" }, @@ -351,14 +351,14 @@ /obj/effect/turf_decal/caution{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4; icon_state = "pipe11-2" }, /turf/open/floor/bluespace, /area/tdome/arena) "aW" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4; icon_state = "pipe11-2" }, @@ -366,25 +366,25 @@ /area/tdome/arena) "aX" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4; icon_state = "pipe11-2" }, /turf/open/floor/iron/bluespace, /area/tdome/arena) "aY" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4; icon_state = "pipe11-2" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/bluespace, /area/tdome/arena) "aZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -394,7 +394,7 @@ /area/tdome/arena) "kM" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -404,10 +404,10 @@ /area/tdome/arena) "lU" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f68f484ef0c4d..7e69c78543a40 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -57,7 +57,7 @@ /turf/open/floor/engine, /area/science/xenobiology) "aaP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -103,7 +103,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "abl" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 }, /obj/structure/lattice/catwalk, @@ -128,10 +128,10 @@ req_access_txt = "28" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/checker, @@ -407,10 +407,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -455,10 +455,10 @@ /turf/open/floor/iron, /area/hydroponics/garden) "aeB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -524,7 +524,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/siding/wood{ @@ -537,8 +537,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -560,7 +560,7 @@ id = "brigentry"; pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/light/small{ @@ -572,7 +572,7 @@ /turf/open/floor/iron, /area/security/brig) "agd" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "agj" = ( @@ -582,10 +582,10 @@ /turf/closed/wall/r_wall, /area/security/warden) "agr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -601,7 +601,7 @@ /area/maintenance/starboard/fore) "agD" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -720,8 +720,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -770,10 +770,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -797,10 +797,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -823,11 +823,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -836,7 +836,7 @@ /turf/open/floor/wood/big, /area/maintenance/aft) "akW" = ( -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ +/obj/machinery/computer/atmos_control/oxygen_tank{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -849,10 +849,10 @@ id = "bridgeentrance"; name = "bridge Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -880,7 +880,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "alF" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/maintenance/port/fore) "alL" = ( @@ -929,10 +929,10 @@ /turf/open/floor/iron, /area/storage/tools) "ami" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -973,6 +973,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "amC" = ( @@ -1000,10 +1003,10 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "amY" = ( @@ -1023,7 +1026,7 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "anj" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -1036,7 +1039,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "anl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -1072,7 +1075,7 @@ /turf/closed/wall/r_wall, /area/maintenance/solars/port/fore) "anJ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/cyan, /turf/open/floor/plating, /area/maintenance/port/fore) "anK" = ( @@ -1089,7 +1092,7 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "anS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/white, @@ -1128,6 +1131,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "aoP" = ( @@ -1176,7 +1182,10 @@ /area/maintenance/port/fore) "apW" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/space, /area/space/nearstation) "aqd" = ( @@ -1227,10 +1236,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aqC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/wood, @@ -1287,8 +1296,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "asw" = ( @@ -1330,14 +1339,14 @@ name = "Turbine Access"; req_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/plating, /area/maintenance/aft) "atl" = ( @@ -1409,10 +1418,10 @@ /area/maintenance/port/fore) "aue" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -1425,18 +1434,17 @@ /turf/open/floor/iron/white, /area/security/brig) "aul" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/central) +/area/hallway/primary/port) "aur" = ( /obj/machinery/pool_filter, /turf/open/indestructible/sound/pool/end, @@ -1446,20 +1454,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/bridge) "auu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1489,7 +1497,7 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "auX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/wood, @@ -1510,10 +1518,10 @@ name = "Engineering Foyer"; req_one_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -1538,10 +1546,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -1650,6 +1658,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -1679,10 +1690,10 @@ name = "Chief Medical Officer"; req_access_txt = "40" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1741,6 +1752,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "ayz" = ( @@ -1866,6 +1878,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "azE" = ( @@ -1946,10 +1959,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/flip{ @@ -1982,14 +1995,9 @@ /turf/closed/wall/r_wall, /area/ai_monitored/nuke_storage) "aBf" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "aBl" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -1997,10 +2005,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) @@ -2067,7 +2075,7 @@ id = "executionfireblast" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, @@ -2076,13 +2084,13 @@ /turf/closed/wall, /area/crew_quarters/theatre) "aCs" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "aCD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /turf/open/floor/plating, @@ -2094,10 +2102,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -2181,8 +2189,8 @@ req_access_txt = "16" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2290,6 +2298,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "aFJ" = ( @@ -2358,9 +2369,9 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/hor) "aGx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space/basic, @@ -2418,8 +2429,8 @@ /turf/open/floor/iron/dark, /area/chapel/office) "aHk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -2463,8 +2474,8 @@ dir = 1; sortType = 3 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -2473,7 +2484,7 @@ "aHw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, @@ -2502,10 +2513,10 @@ /turf/open/floor/plating, /area/security/brig) "aHJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -2656,7 +2667,7 @@ /turf/open/floor/plating, /area/hallway/primary/port) "aJf" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light_switch{ pixel_x = 28 }, @@ -3031,6 +3042,12 @@ codes_txt = "patrol;next_patrol=EVA2"; location = "Dorm" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron, /area/hallway/primary/central) "aNJ" = ( @@ -3072,10 +3089,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -3121,10 +3138,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "aOr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -3137,10 +3154,10 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "aOs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -3156,6 +3173,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "aOw" = ( @@ -3168,6 +3191,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "aOx" = ( @@ -3202,10 +3227,10 @@ /turf/open/floor/engine/cult, /area/library) "aPh" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -3392,10 +3417,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "aQK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -3474,10 +3499,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "aRt" = ( @@ -3543,12 +3568,21 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "aRZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "aSa" = ( @@ -3626,10 +3660,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -3735,10 +3769,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -3820,30 +3854,14 @@ }, /area/chapel/main) "aUL" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/arrivals_external{ - name = "Arrivals Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/entry) -"aUM" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "aUP" = ( /obj/structure/table, @@ -3873,8 +3891,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -3904,14 +3922,12 @@ "aVg" = ( /obj/effect/landmark/xeno_spawn, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard/aft) "aVx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light{ dir = 4 }, @@ -4028,10 +4044,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/extinguisher_cabinet{ pixel_x = 32 }, @@ -4044,7 +4060,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/medical/break_room) "aXh" = ( @@ -4089,10 +4105,10 @@ /area/crew_quarters/locker) "aXy" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -4146,6 +4162,8 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "aXL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/vacant_room/office) "aXM" = ( @@ -4166,7 +4184,7 @@ /area/crew_quarters/toilet/locker) "aYa" = ( /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/radio/intercom{ @@ -4237,7 +4255,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 4 }, /turf/open/floor/plating, @@ -4303,10 +4321,10 @@ /turf/closed/wall, /area/bridge/meeting_room) "aZU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -4331,11 +4349,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4357,7 +4375,7 @@ name = "Evidence Storage"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -4383,6 +4401,9 @@ /obj/structure/mirror{ pixel_x = 28 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "baA" = ( @@ -4404,7 +4425,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "baL" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 4 }, /turf/open/floor/plating, @@ -4442,6 +4463,12 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "bbb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -4451,12 +4478,6 @@ dir = 4 }, /obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -4579,6 +4600,15 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/maintenance/port) +"bcJ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "bcK" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -4638,7 +4668,7 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "bdQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -4651,10 +4681,10 @@ /area/quartermaster/warehouse) "bdT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/white, @@ -4671,7 +4701,6 @@ req_access_txt = "2"; shuttledocked = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/catwalk_floor, @@ -4875,8 +4904,8 @@ /area/hallway/primary/central) "bfp" = ( /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -4888,16 +4917,6 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "bfw" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/light/small/directional/south, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) @@ -4910,10 +4929,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison/dark, @@ -4929,10 +4948,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -4972,10 +4991,10 @@ /turf/closed/wall/r_wall, /area/science/robotics/lab) "bfX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/checker, @@ -5038,10 +5057,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/junction{ dir = 1 }, @@ -5216,24 +5235,23 @@ name = "biohazard Containment Door" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) "biq" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -5242,10 +5260,10 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "bir" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/light{ @@ -5257,10 +5275,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "bis" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -5305,11 +5323,11 @@ /turf/open/floor/iron/tech, /area/security/prison/shielded) "biH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -5344,10 +5362,10 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -5468,7 +5486,8 @@ /area/science/robotics/mechbay) "bjQ" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "bjZ" = ( @@ -5536,10 +5555,10 @@ /turf/open/floor/plating, /area/maintenance/central) "bkY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -5711,10 +5730,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/white{ @@ -5865,6 +5884,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"bnT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "bnY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5943,7 +5968,6 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) "boB" = ( @@ -5976,10 +6000,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -6380,8 +6404,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail{ dir = 1; sortType = 15 @@ -6431,6 +6455,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/research) "bvE" = ( @@ -6530,11 +6558,10 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/captain) "bxa" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, +/obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/maintenance/aft) "bxe" = ( @@ -6628,7 +6655,7 @@ id = "atmos"; name = "Atmospherics Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, @@ -6722,10 +6749,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "byM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -6759,31 +6786,25 @@ /turf/closed/wall, /area/maintenance/aft) "bzt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 }, /turf/open/floor/circuit/telecomms/server, /area/science/server) "bzu" = ( /obj/machinery/rnd/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, /turf/open/floor/circuit/telecomms/server, /area/science/server) "bzv" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /turf/open/floor/iron/dark, /area/science/server) "bzw" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, /obj/structure/sign/warning/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; @@ -6795,6 +6816,7 @@ "bzx" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/science/server) "bzA" = ( @@ -6865,11 +6887,14 @@ /area/maintenance/aft) "bAy" = ( /obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 8 + }, /turf/open/floor/iron/dark/telecomms, /area/science/server) "bAA" = ( -/obj/machinery/atmospherics/pipe/manifold{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ + dir = 1 }, /turf/open/floor/iron/dark, /area/science/server) @@ -6878,37 +6903,39 @@ name = "Server Room"; req_one_access_txt = "30;70" }, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/server) "bAC" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 9 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/science/server) "bAD" = ( /obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/simple{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/science/server) "bAJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wood, /area/security/detectives_office) "bAK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/cafeteria, @@ -6953,21 +6980,21 @@ }, /area/science/research) "bBS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 4; - external_pressure_bound = 120; - name = "server vent" +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, /turf/open/floor/circuit/telecomms/server, /area/science/server) "bBU" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 9 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, +/obj/effect/mapping_helpers/atmos_auto_connect, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/server) "bBV" = ( @@ -6976,9 +7003,6 @@ name = "SERVER ROOM"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/server) @@ -6989,10 +7013,10 @@ /turf/open/floor/iron/dark, /area/science/server) "bCa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/goonplaque, @@ -7040,15 +7064,15 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "bCm" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -7182,6 +7206,21 @@ /obj/machinery/vending/coffee, /turf/open/floor/iron/white, /area/science/research) +"bEv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "bEA" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -7374,6 +7413,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/office) "bHv" = ( @@ -7416,20 +7461,14 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "bIm" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/catwalk_floor, -/area/maintenance/starboard/aft) +/turf/open/floor/engine, +/area/engine/engineering) "bIr" = ( /turf/closed/wall, /area/medical/cryo) @@ -7438,10 +7477,10 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "bIy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -7560,8 +7599,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/gateway) "bJx" = ( @@ -7581,10 +7620,10 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "bJF" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/atmos) "bJI" = ( @@ -7660,6 +7699,7 @@ /area/science/mixing) "bKa" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/mixing) "bKc" = ( @@ -7941,7 +7981,7 @@ /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "bMv" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -7962,25 +8002,25 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "bMz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/meter, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_x = -24 }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "bMB" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -8013,14 +8053,14 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -8055,6 +8095,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bMP" = ( @@ -8071,7 +8114,7 @@ /turf/open/floor/plating, /area/engine/atmos) "bMS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 8 }, /turf/open/floor/iron, @@ -8080,32 +8123,32 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bMU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "bMV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 10 }, /turf/open/floor/iron, /area/engine/atmos) "bMW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/iron, /area/engine/atmos) "bMZ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /turf/open/floor/iron, @@ -8127,7 +8170,7 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/dark, /area/security/execution/transfer) "bNt" = ( @@ -8174,10 +8217,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -8212,8 +8255,8 @@ /turf/open/floor/iron, /area/engine/atmos) "bNY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -8256,11 +8299,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "bOl" = ( @@ -8310,16 +8353,20 @@ /obj/machinery/sparker/toxmix{ pixel_x = 25 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input{ dir = 4 }, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "bOH" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/meter, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, /obj/machinery/button/door/incinerator_vent_toxmix{ pixel_x = -25; pixel_y = 5 @@ -8328,11 +8375,13 @@ pixel_x = -25; pixel_y = -5 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "bOJ" = ( /obj/item/target, /obj/structure/window/reinforced{ @@ -8395,7 +8444,7 @@ /area/engine/atmos) "bPe" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -8410,7 +8459,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bPj" = ( -/obj/machinery/atmospherics/pipe/simple{ +/obj/machinery/atmospherics/pipe/smart/simple{ dir = 4 }, /obj/structure/grille, @@ -8418,7 +8467,7 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "bPl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -8434,8 +8483,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/engine/engineering) "bPx" = ( @@ -8630,13 +8678,13 @@ /turf/open/floor/iron, /area/engine/atmos) "bQt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "bQv" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -8646,7 +8694,7 @@ /turf/open/floor/plating/airless, /area/engine/atmos) "bQB" = ( -/obj/machinery/air_sensor/atmos/mix_tank, +/obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/vacuum, /area/engine/atmos) "bQC" = ( @@ -8676,7 +8724,7 @@ /area/science/mixing) "bQW" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/camera/directional/east, @@ -8735,8 +8783,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -8746,13 +8794,13 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen/coldroom) "bRA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bRB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/structure/cable/yellow{ @@ -8761,36 +8809,36 @@ /turf/open/floor/iron, /area/engine/atmos) "bRC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "bRD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/iron, /area/engine/atmos) "bRF" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /turf/open/floor/iron, /area/engine/atmos) "bRG" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "bRK" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/space, /area/space/nearstation) "bRL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -8884,7 +8932,7 @@ /turf/open/floor/engine, /area/science/xenobiology) "bSf" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -8895,6 +8943,18 @@ }, /turf/open/floor/iron, /area/science/mixing) +"bSi" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "bSq" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen, @@ -8909,7 +8969,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bSu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "bSA" = ( @@ -8939,10 +8999,10 @@ /turf/open/floor/iron, /area/engine/atmos) "bSD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -8963,37 +9023,37 @@ }, /area/engine/atmos) "bSI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/engine/atmos) "bSJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/plating, /area/engine/atmos) "bSK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "bSM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "bSN" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -9085,9 +9145,13 @@ /turf/open/floor/iron, /area/engine/break_room) "bTp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/engineering) "bTz" = ( @@ -9108,10 +9172,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/security/checkpoint/science) @@ -9129,19 +9193,16 @@ /obj/structure/table/wood, /obj/item/food/chips, /obj/item/reagent_containers/cup/soda_cans/cola, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/carpet, /area/hallway/secondary/entry) "bTO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/iron, /area/engine/atmos) "bTP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -9149,7 +9210,7 @@ }, /area/engine/atmos) "bTQ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /obj/machinery/meter, @@ -9158,17 +9219,17 @@ }, /area/engine/atmos) "bTS" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/meter, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/engine/atmos) "bTT" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron, /area/engine/atmos) "bTV" = ( @@ -9187,7 +9248,7 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "bTX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 8 }, /turf/open/floor/engine/n2o, @@ -9340,7 +9401,7 @@ /area/hallway/primary/aft) "bUG" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -9373,15 +9434,15 @@ /turf/open/floor/iron, /area/engine/atmos) "bUR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) "bUS" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bUT" = ( -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -9396,7 +9457,7 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "bUV" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/engine/atmos) "bUW" = ( @@ -9431,6 +9492,7 @@ dir = 4; pixel_x = 11 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "bVl" = ( @@ -9442,7 +9504,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -9468,7 +9530,7 @@ /area/science/mixing) "bVu" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/space, /area/space/nearstation) "bVI" = ( @@ -9478,13 +9540,14 @@ /turf/closed/wall/r_wall, /area/tcommsat/computer) "bVS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; req_access_txt = "24" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/atmos) "bVT" = ( @@ -9497,39 +9560,39 @@ }, /area/engine/atmos) "bVU" = ( -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/iron, /area/engine/atmos) "bVW" = ( -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/iron, /area/engine/atmos) "bVX" = ( -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "bVY" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "bVZ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "bWa" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, /turf/open/floor/iron, @@ -9541,7 +9604,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bWd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 8 }, /turf/open/floor/engine/n2o, @@ -9553,17 +9616,17 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "bWk" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "bWl" = ( @@ -9635,7 +9698,7 @@ /area/hallway/secondary/service) "bWB" = ( /obj/machinery/telecomms/processor/preset_four, -/turf/open/floor/circuit/green, +/turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "bWC" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -9716,7 +9779,7 @@ /area/tcommsat/computer) "bWL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /turf/open/floor/iron, @@ -9734,7 +9797,7 @@ }, /area/hallway/primary/aft) "bWN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -9746,7 +9809,7 @@ /area/engine/atmos) "bWO" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -9761,10 +9824,10 @@ name = "Hydroponics Maintenance"; req_access_txt = "35" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -9861,10 +9924,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -9960,7 +10023,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bXU" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /turf/open/floor/iron, @@ -9969,7 +10032,7 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "bXX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -10102,14 +10165,14 @@ /turf/closed/wall, /area/engine/atmos) "bYS" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bYT" = ( -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/computer/atmos_control/plasma_tank{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -10124,7 +10187,7 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "bYV" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, +/obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/engine/atmos) "bYW" = ( @@ -10151,10 +10214,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/white, @@ -10207,10 +10270,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark/telecomms, @@ -10240,7 +10303,6 @@ /turf/open/floor/plating, /area/tcommsat/computer) "bZr" = ( -/obj/machinery/status_display/evac, /turf/closed/wall, /area/tcommsat/computer) "bZs" = ( @@ -10304,17 +10366,17 @@ /turf/open/floor/iron/ridged/steel, /area/hydroponics) "bZH" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/item/wrench, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, -/obj/item/wrench, /turf/open/floor/iron, /area/engine/atmos) "bZI" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, -/obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bZJ" = ( @@ -10324,7 +10386,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bZK" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -10335,7 +10397,7 @@ }, /area/engine/atmos) "bZL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -10349,8 +10411,8 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -10367,17 +10429,17 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "bZR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -10454,10 +10516,10 @@ codes_txt = "patrol;next_patrol=CHE"; location = "AIE" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -10466,17 +10528,17 @@ /obj/machinery/door/airlock{ name = "Private Restroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/captain) "cap" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "car" = ( @@ -10545,7 +10607,7 @@ /area/engine/atmos) "caJ" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 }, /turf/open/space, @@ -10560,10 +10622,10 @@ specialfunctions = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/virology) "caV" = ( @@ -10679,7 +10741,7 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "cbI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 8 }, /turf/open/floor/engine/co2, @@ -10688,10 +10750,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -10711,10 +10773,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -10796,11 +10858,16 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "ccg" = ( /obj/machinery/telecomms/message_server/preset, +/obj/machinery/airalarm/directional/west{ + pixel_x = -23; + air_conditioning = 0 + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "cch" = ( @@ -10817,6 +10884,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "ccv" = ( +/obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/engine/atmos) "ccw" = ( @@ -10827,7 +10895,7 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "ccC" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, /area/engine/atmos) "ccD" = ( @@ -10853,6 +10921,11 @@ }, /turf/open/space, /area/solar/port/aft) +"ccZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "cda" = ( /obj/machinery/light/small{ dir = 1 @@ -10927,7 +11000,9 @@ /turf/open/floor/carpet/green, /area/chapel/main) "cdu" = ( -/obj/structure/closet/emcloset, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cdv" = ( @@ -10946,13 +11021,13 @@ /turf/open/floor/iron, /area/engine/atmos) "cdD" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 8 }, /turf/open/floor/engine/co2, /area/engine/atmos) "cdR" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cdU" = ( @@ -11031,17 +11106,9 @@ /turf/open/floor/plating, /area/tcommsat/computer) "ceh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) +/obj/machinery/portable_thermomachine, +/turf/open/floor/plating, +/area/maintenance/fore) "cei" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical{ @@ -11106,21 +11173,24 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "cex" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red{ @@ -11187,10 +11257,10 @@ /obj/item/folder/white, /obj/item/stamp/cmo, /obj/item/clothing/glasses/hud/health, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/dark_blue{ @@ -11268,6 +11338,13 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"cfu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "cfw" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/port/aft) @@ -11337,16 +11414,16 @@ /turf/open/floor/iron, /area/engine/engineering) "cfP" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "cfQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "cfR" = ( @@ -11368,10 +11445,10 @@ /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "cgh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/holopad, @@ -11467,10 +11544,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -11485,21 +11562,21 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/virology) "cho" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) "chq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/circuit/telecomms, @@ -11509,26 +11586,25 @@ name = "Kill Chamber"; req_access_txt = "55" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/science/xenobiology) "chs" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) "cht" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/xenobiology) "chu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -11618,7 +11694,7 @@ /turf/open/floor/iron/white, /area/medical/virology) "chU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/radio/intercom{ @@ -11697,7 +11773,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "cix" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "ciH" = ( @@ -11725,6 +11801,9 @@ /turf/open/space, /area/solar/port/aft) "ciS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ciT" = ( @@ -11759,17 +11838,12 @@ /turf/open/floor/plating, /area/engine/engineering) "cjb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/closet/emcloset, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -32 }, -/turf/open/floor/engine, -/area/engine/engineering) +/turf/open/floor/catwalk_floor, +/area/maintenance/starboard/aft) "cjc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -11796,20 +11870,27 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, /area/gateway) +"cjs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "cjx" = ( /obj/machinery/vending/cigarette, /turf/open/floor/iron, /area/hallway/primary/central) "cjB" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/table, @@ -11856,7 +11937,7 @@ /turf/open/floor/iron, /area/engine/engineering) "ckb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) @@ -11883,10 +11964,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -11962,39 +12043,39 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "ckU" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 1 }, /turf/open/floor/engine/n2, /area/engine/atmos) "ckW" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "ckX" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 1 }, /turf/open/floor/engine/o2, /area/engine/atmos) "ckY" = ( -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /obj/structure/grille, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/atmos) "ckZ" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "cla" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 1 }, /turf/open/floor/engine/air, /area/engine/atmos) "clb" = ( -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /obj/structure/grille, /obj/machinery/meter{ name = "Mixed Air Tank In" @@ -12002,7 +12083,7 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "clc" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) "clf" = ( @@ -12010,10 +12091,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "cli" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -12051,21 +12132,12 @@ /area/maintenance/solars/port/fore) "clH" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"clI" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/maintenance/aft) "clJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -12095,7 +12167,7 @@ /turf/open/floor/engine/o2, /area/engine/atmos) "clY" = ( -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /obj/structure/grille, /obj/machinery/meter{ name = "Mixed Air Tank Out" @@ -12117,10 +12189,6 @@ name = "Engineering External Access"; req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "cmw" = ( @@ -12218,8 +12286,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/gateway) "cnb" = ( @@ -12254,10 +12322,10 @@ "cnq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/south{ @@ -12287,10 +12355,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cnT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -12300,6 +12364,12 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/port) "cnX" = ( @@ -12322,23 +12392,21 @@ /turf/open/floor/iron, /area/engine/engineering) "coe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "cok" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) "con" = ( @@ -12403,10 +12471,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -12445,10 +12513,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, @@ -12476,7 +12544,7 @@ /area/maintenance/port/aft) "cqa" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/plating, @@ -12490,7 +12558,7 @@ "cqd" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/engine, @@ -12500,7 +12568,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /turf/open/floor/engine, @@ -12508,7 +12576,7 @@ "cqf" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/engine, @@ -12529,7 +12597,7 @@ pixel_y = -24; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/engine, @@ -12541,7 +12609,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/engine, @@ -12562,7 +12630,7 @@ /turf/open/space/basic, /area/space) "cqs" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/closed/wall, /area/maintenance/disposal/incinerator) "cqu" = ( @@ -12570,9 +12638,6 @@ icon_state = "1-2" }, /obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/machinery/camera/directional/west, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -12620,7 +12685,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/engine, /area/engine/engineering) "cqC" = ( @@ -12648,7 +12713,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "cqF" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) "cqN" = ( @@ -12720,6 +12785,9 @@ /obj/structure/disposalpipe/sorting/mail{ sortType = 12 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "crk" = ( @@ -12731,7 +12799,7 @@ /turf/closed/wall/r_wall, /area/engine/engineering) "crs" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/closed/wall/r_wall, @@ -12749,13 +12817,13 @@ /area/engine/supermatter) "cru" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "crv" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/closed/wall/r_wall, @@ -12832,7 +12900,7 @@ /area/solar/starboard/aft) "crI" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/closed/wall/r_wall, @@ -12858,7 +12926,7 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "crM" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -12885,7 +12953,7 @@ /turf/open/space, /area/space/nearstation) "crV" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /turf/open/floor/iron/dark, @@ -12933,7 +13001,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "csm" = ( -/obj/machinery/atmospherics/pipe/simple{ +/obj/machinery/atmospherics/pipe/smart/simple{ dir = 10 }, /turf/open/floor/plating, @@ -13001,10 +13069,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "csE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -13048,7 +13116,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/engine, @@ -13057,7 +13125,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/engine, @@ -13083,10 +13151,10 @@ /turf/open/floor/iron/dark, /area/bridge) "csW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -13113,10 +13181,10 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "cti" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, @@ -13158,8 +13226,8 @@ /turf/closed/wall, /area/engine/engineering) "ctY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -13171,7 +13239,7 @@ /turf/closed/wall, /area/ai_monitored/turret_protected/aisat_interior) "cuf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -13224,7 +13292,7 @@ /obj/machinery/power/apc/auto_name/directional/south{ pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -13343,7 +13411,7 @@ /turf/open/space, /area/space/nearstation) "cxc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/freezer, @@ -13371,10 +13439,10 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "cxq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -13386,12 +13454,6 @@ /obj/item/mining_scanner, /turf/open/floor/iron, /area/quartermaster/exploration_dock) -"cxu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) "cxy" = ( /obj/machinery/teleport/hub, /obj/effect/turf_decal/stripes/line{ @@ -13400,12 +13462,10 @@ /turf/open/floor/engine/light, /area/teleporter) "cxB" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/space, +/area/space/nearstation) "cxE" = ( /obj/docking_port/stationary{ dir = 8; @@ -13464,7 +13524,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "cyH" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -13488,7 +13548,7 @@ name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/engine, /area/science/xenobiology) "cyR" = ( @@ -13509,25 +13569,34 @@ /turf/open/space/basic, /area/space) "cyU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"czo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "czE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/engine, /area/engine/engineering) "czF" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/meter, /turf/open/floor/iron/dark, /area/engine/engineering) "czJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) @@ -13552,6 +13621,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cAa" = ( @@ -13560,6 +13632,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cAf" = ( @@ -13579,7 +13654,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/engine, /area/engine/engineering) "cAm" = ( @@ -13593,7 +13668,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 4 }, /turf/open/floor/engine, @@ -13616,7 +13691,7 @@ dir = 8 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, @@ -13625,10 +13700,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "cAu" = ( /obj/structure/cable/yellow{ @@ -13651,8 +13732,8 @@ "cAy" = ( /obj/item/stack/sheet/cardboard, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -13673,7 +13754,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -13709,6 +13790,9 @@ /area/hallway/secondary/exit) "cBm" = ( /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "cBp" = ( @@ -13721,6 +13805,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/office) "cBr" = ( @@ -13758,8 +13848,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -13778,7 +13868,7 @@ /area/medical/morgue) "cBE" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, +/obj/machinery/air_sensor/toxins_burn_chamber, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "cBF" = ( @@ -13799,7 +13889,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "cBJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /obj/effect/landmark/event_spawn, @@ -13847,7 +13937,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -13877,10 +13967,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -13889,6 +13979,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/maintenance/port) "cCu" = ( @@ -13904,20 +13995,20 @@ "cCA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/white, /area/science/explab) "cCC" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 5 }, /turf/open/floor/iron, /area/engine/atmos) "cCE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ dir = 4 }, /turf/open/floor/iron, @@ -13927,8 +14018,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -13947,10 +14038,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -14017,7 +14108,7 @@ /area/engine/engineering) "cDw" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/engine, @@ -14036,7 +14127,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14050,14 +14141,14 @@ /area/engine/engineering) "cDC" = ( /obj/item/wrench, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/engineering) "cDD" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/machinery/meter, @@ -14090,7 +14181,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "cDH" = ( @@ -14137,7 +14228,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/engine, /area/engine/engineering) "cEf" = ( @@ -14158,7 +14249,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "cEk" = ( @@ -14185,7 +14276,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14205,7 +14296,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "cEv" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/machinery/power/rad_collector/anchored, @@ -14230,7 +14321,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "cEy" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/machinery/power/rad_collector/anchored, @@ -14273,7 +14364,7 @@ icon_state = "1-2" }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, @@ -14292,7 +14383,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14344,7 +14435,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "cEW" = ( @@ -14372,7 +14463,7 @@ /turf/open/floor/engine, /area/engine/engineering) "cFe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/machinery/power/rad_collector/anchored, @@ -14385,7 +14476,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "cFh" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/power/rad_collector/anchored, @@ -14446,7 +14537,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/meter, @@ -14457,7 +14548,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "cFy" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -14466,13 +14557,13 @@ /turf/open/floor/engine, /area/engine/engineering) "cFz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/engineering) "cFA" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "cFI" = ( @@ -14485,7 +14576,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/engine, /area/engine/engineering) "cFK" = ( @@ -14498,7 +14589,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/engine, @@ -14510,7 +14601,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14519,7 +14610,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/engine, @@ -14528,7 +14619,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14537,7 +14628,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/engine, @@ -14625,13 +14716,13 @@ /turf/open/floor/iron/white, /area/medical/virology) "cFV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -14640,10 +14731,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/medical/morgue) "cGc" = ( @@ -14654,10 +14745,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -14676,7 +14767,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14684,7 +14775,7 @@ "cGf" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /turf/open/floor/engine, /area/engine/engineering) @@ -14692,7 +14783,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/engine, @@ -14702,6 +14793,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) "cGi" = ( @@ -14736,26 +14831,27 @@ /area/security/main) "cGx" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) "cGC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - dir = 4; - name = "Output Release" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, /area/engine/engineering) "cGD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/door/airlock/external{ + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/turf/closed/wall/r_wall, -/area/engine/engineering) +/turf/open/floor/catwalk_floor, +/area/maintenance/starboard/aft) "cGH" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -14769,20 +14865,20 @@ /turf/open/floor/plating, /area/maintenance/central) "cGM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating/airless, /area/engine/engineering) "cGS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) "cGV" = ( @@ -14792,7 +14888,7 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "cGZ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 }, /turf/open/floor/plating/airless, @@ -14804,6 +14900,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "cHc" = ( @@ -14825,6 +14925,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "cHg" = ( @@ -14834,6 +14938,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "cHj" = ( @@ -14849,6 +14954,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/engine/engineering) "cHo" = ( @@ -14867,6 +14975,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/engine/engineering) "cHs" = ( @@ -15016,10 +15127,10 @@ /turf/open/space/basic, /area/space) "cIh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/red, @@ -15032,22 +15143,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron, /area/quartermaster/miningdock) "cJb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/flip{ sortType = 24 }, @@ -15076,10 +15181,10 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -15089,8 +15194,8 @@ /area/crew_quarters/toilet) "cJR" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -15127,25 +15232,15 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "cKj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/courtroom) "cKm" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -15155,7 +15250,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet, @@ -15219,10 +15314,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "cMx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -15269,9 +15364,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron/white, /area/science/research) "cNG" = ( @@ -15292,12 +15384,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cOl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "cOn" = ( @@ -15332,26 +15427,23 @@ /turf/open/floor/engine, /area/gateway) "cOI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "cOJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) @@ -15362,14 +15454,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/iron, /area/hallway/primary/port) "cOS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -15440,10 +15532,10 @@ /turf/open/floor/iron, /area/science/explab) "cQo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -15460,20 +15552,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "cQS" = ( /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -15487,10 +15579,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -15555,11 +15647,11 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "cSG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) "cSH" = ( @@ -15567,17 +15659,23 @@ icon_state = "4-8" }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/floor/engine, /area/engine/engineering) "cSI" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "cSJ" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ @@ -15589,8 +15687,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, /turf/open/floor/engine, /area/engine/engineering) @@ -15620,10 +15718,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -15672,10 +15770,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/blue, @@ -15687,15 +15785,13 @@ /area/medical/genetics) "cUs" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "cUE" = ( @@ -15726,10 +15822,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -15784,14 +15880,21 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, /area/security/prison) +"cVd" = ( +/obj/machinery/rnd/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "cVm" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate" @@ -15808,10 +15911,10 @@ /turf/open/floor/iron/dark, /area/security/main) "cVy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -15911,9 +16014,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "dad" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -15936,10 +16036,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -15961,8 +16061,8 @@ /turf/open/floor/iron/dark, /area/security/prison) "daM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -15986,8 +16086,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -15999,8 +16099,8 @@ /area/hallway/primary/central) "dcN" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -16040,9 +16140,6 @@ /obj/machinery/door/airlock/external{ req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard) "ddl" = ( @@ -16055,10 +16152,10 @@ /area/crew_quarters/bar/atrium) "ded" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -16081,10 +16178,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -16133,6 +16230,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/tcommsat/computer) "dfi" = ( @@ -16147,10 +16245,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "dfs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -16170,10 +16268,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/carpet/blue, @@ -16182,10 +16280,10 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "dgj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 10 }, @@ -16206,10 +16304,10 @@ dir = 1 }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -16231,10 +16329,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -16259,7 +16357,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -16295,12 +16393,11 @@ /turf/open/floor/iron/tech, /area/ai_monitored/storage/eva) "diK" = ( -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "djk" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -16343,10 +16440,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16386,10 +16483,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -16399,36 +16496,33 @@ /area/teleporter) "dlA" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /turf/open/floor/iron, /area/tcommsat/computer) "dlB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "dlZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -16439,7 +16533,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/circuit, @@ -16609,16 +16703,16 @@ /turf/open/floor/iron/white, /area/science/lab) "dpE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 1 }, /turf/open/floor/engine/n2, /area/engine/atmos) "dqe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -16656,10 +16750,10 @@ pixel_x = -3; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/white, @@ -16672,6 +16766,13 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) +"dqO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat_interior) "dqQ" = ( /obj/machinery/power/solar{ id = "auxsolareast"; @@ -16690,7 +16791,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "drh" = ( /obj/machinery/computer/cryopod{ @@ -16750,9 +16851,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"dsH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engine/engineering) "dth" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -16761,20 +16868,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "dtF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -16826,7 +16933,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -16837,10 +16944,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "duR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -16849,13 +16953,13 @@ /turf/open/floor/iron, /area/quartermaster/exploration_dock) "dve" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/bridge) "dvH" = ( @@ -16864,8 +16968,8 @@ /turf/open/floor/prison, /area/security/prison) "dwh" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/green, @@ -16878,10 +16982,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -16914,10 +17018,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -16928,10 +17032,10 @@ /area/maintenance/fore/secondary) "dwU" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -16944,10 +17048,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -16964,10 +17068,10 @@ /area/hallway/primary/central) "dxy" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) "dxE" = ( @@ -17009,10 +17113,10 @@ icon_state = "1-4" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -17048,10 +17152,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -17075,6 +17179,9 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/space, /area/space/nearstation) "dAV" = ( @@ -17100,10 +17207,10 @@ req_access_txt = "42" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -17116,10 +17223,10 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "dBV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -17148,6 +17255,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/mixing) "dCQ" = ( @@ -17164,22 +17272,22 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "dDd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison, @@ -17191,8 +17299,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -17236,8 +17344,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "dDz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -17246,6 +17353,9 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "dDL" = ( @@ -17263,9 +17373,9 @@ /turf/open/floor/iron/white, /area/medical/virology) "dEo" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/open/floor/plating, @@ -17275,7 +17385,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -17283,17 +17393,17 @@ /area/hydroponics) "dEx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/quartermaster/warehouse) "dEJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -17327,8 +17437,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison/dark, @@ -17364,10 +17474,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -17388,7 +17498,7 @@ /turf/open/floor/iron/white, /area/security/brig) "dHD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -17397,7 +17507,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/medical/storage) "dHO" = ( @@ -17408,10 +17518,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -17420,10 +17530,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -17515,10 +17625,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light{ @@ -17537,10 +17647,10 @@ /turf/open/floor/iron/dark, /area/security/main) "dJK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -17554,20 +17664,14 @@ name = "Supply Dock Airlock"; req_access_txt = "31" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/quartermaster/storage) "dKb" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -17608,10 +17712,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -17620,10 +17724,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/button/door{ @@ -17650,10 +17754,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) "dMh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -17666,10 +17770,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -17678,7 +17782,7 @@ /turf/open/floor/plating, /area/maintenance/port) "dMp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -17687,7 +17791,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -17722,7 +17826,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -17773,12 +17877,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/camera/directional/east, /turf/open/floor/iron, -/area/science/mixing/chamber) +/area/science/mixing) "dNA" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell, @@ -17815,18 +17916,18 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = 38; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "dOE" = ( /obj/structure/closet/crate/freezer, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/iron, /area/quartermaster/warehouse) @@ -17855,6 +17956,9 @@ dir = 4 }, /obj/effect/turf_decal/loading_area, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "dOV" = ( @@ -17918,7 +18022,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -17927,10 +18031,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -17946,10 +18050,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "dQb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -17970,6 +18074,9 @@ "dQz" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "dQJ" = ( @@ -17987,10 +18094,10 @@ id = "rnd2"; name = "Research Lab" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -18042,8 +18149,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/quartermaster/storage) "dSt" = ( @@ -18051,20 +18156,11 @@ dir = 1 }, /obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) "dTb" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/quartermaster/storage) "dTA" = ( @@ -18076,21 +18172,14 @@ /obj/effect/turf_decal/trimline/dark_blue/filled, /turf/open/floor/iron/dark, /area/teleporter) -"dTD" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) "dTK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "dTU" = ( @@ -18128,7 +18217,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Fitness" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -18150,8 +18239,8 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "dUx" = ( @@ -18187,7 +18276,7 @@ /obj/structure/chair/foldable{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -18219,8 +18308,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -18240,6 +18329,13 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"dXo" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/space, +/area/space/nearstation) "dXA" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -18253,24 +18349,18 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/fore) "dXE" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/portable_thermomachine, +/turf/open/floor/plating, +/area/maintenance/port) "dYh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -18312,12 +18402,12 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "dZf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat/hallway) +/turf/open/floor/iron, +/area/engine/atmos) "dZz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -18339,8 +18429,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -18349,10 +18439,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18370,10 +18460,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -18397,10 +18487,10 @@ name = "biohazard Containment Door" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -18418,10 +18508,10 @@ req_access_txt = "8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -18445,23 +18535,21 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/gateway) "ebc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron, -/area/quartermaster/sorting) +/area/hallway/primary/central) "ebi" = ( /obj/machinery/light{ dir = 4 @@ -18469,7 +18557,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "ebA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18481,7 +18569,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -18502,8 +18590,8 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "ecZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -18516,15 +18604,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "edw" = ( @@ -18537,10 +18617,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/door/airlock/vault{ @@ -18565,8 +18645,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -18598,9 +18678,6 @@ /turf/open/floor/iron, /area/science/research) "eem" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -18610,15 +18687,12 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "eeu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/wood{ broken = 1 }, @@ -18634,7 +18708,7 @@ req_one_access_txt = "1" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -18652,12 +18726,6 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "efv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -18691,8 +18759,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -18716,10 +18784,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "egN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/library) "egX" = ( @@ -18730,17 +18798,19 @@ req_access_txt = "39" }, /obj/structure/closet/l3closet/virology, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "egZ" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/research) "ehe" = ( @@ -18756,7 +18826,6 @@ name = "External Access"; req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/maintenance/port/fore) "ehY" = ( @@ -18781,9 +18850,16 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/supply, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"eiI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/hallway/secondary/exit) "eja" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/nanite_chamber_control{ @@ -18810,10 +18886,10 @@ /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) "ejZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18850,7 +18926,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) "ekK" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/machinery/meter, @@ -18874,7 +18950,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/landmark/prisonspawn, @@ -18887,10 +18963,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "elF" = ( @@ -18901,7 +18977,7 @@ name = "MiniSat External Access"; req_access_txt = "65;13" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -18913,9 +18989,6 @@ pixel_y = -1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -18923,8 +18996,8 @@ /area/crew_quarters/locker) "elS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -18953,19 +19026,21 @@ req_access_txt = "32" }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "emX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/aft) "ene" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -19009,10 +19084,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "eoC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -19031,7 +19106,9 @@ /turf/open/floor/iron/white, /area/science/lab) "epb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "epi" = ( @@ -19071,6 +19148,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "eqh" = ( @@ -19085,10 +19164,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "eqr" = ( @@ -19097,21 +19176,17 @@ /turf/open/floor/iron/white, /area/medical/patients_rooms) "eqt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, /area/ai_monitored/turret_protected/aisat_interior) "eqw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/sorting) "eqE" = ( @@ -19119,10 +19194,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ name = "Testing Lab"; req_access_txt = "47" @@ -19169,7 +19244,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/virology) "erJ" = ( @@ -19180,16 +19255,16 @@ /turf/open/floor/engine, /area/engine/supermatter) "erT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/engine/engineering) "erU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/camera/directional/east, @@ -19246,10 +19321,10 @@ name = "AI Core"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -19266,20 +19341,20 @@ /obj/item/seeds/watermelon, /obj/structure/table/glass, /obj/item/seeds/tower, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, /area/hydroponics/garden) "etu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "etw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19336,14 +19411,14 @@ /turf/open/floor/engine, /area/gateway) "euG" = ( -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /turf/open/floor/plating, /area/maintenance/starboard/aft) "euU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -19400,15 +19475,15 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/white, /area/science/research) "ewj" = ( @@ -19427,23 +19502,14 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"ewv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "ewN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -19454,13 +19520,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/security/brig) "ewQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -19480,8 +19546,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/destination/medbay{ dir = 8 }, @@ -19498,10 +19564,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/hallway/secondary/command) @@ -19509,10 +19575,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "exU" = ( @@ -19552,10 +19618,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -19614,8 +19680,6 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ezD" = ( @@ -19627,8 +19691,8 @@ }, /area/chapel/main) "ezE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/medical/storage) @@ -19643,10 +19707,10 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, @@ -19659,7 +19723,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -19669,7 +19733,7 @@ /turf/open/floor/iron, /area/hydroponics) "eAJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/item/radio/intercom{ @@ -19695,6 +19759,15 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"eBb" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "eBh" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/light, @@ -19707,12 +19780,6 @@ /turf/open/floor/iron/white, /area/security/brig) "eBl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -19747,7 +19814,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -19774,10 +19841,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -19913,7 +19980,7 @@ name = "Evidence Storage"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -19923,21 +19990,30 @@ /turf/open/floor/iron/dark, /area/security/main) "eFJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/fore/secondary) "eFM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine, /area/gateway) +"eFO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "eGt" = ( /obj/machinery/light_switch{ pixel_x = -22 @@ -19945,10 +20021,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -19978,8 +20054,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -19993,17 +20069,17 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "eHG" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron, @@ -20029,10 +20105,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white/side{ @@ -20042,7 +20118,7 @@ "eHT" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /turf/open/space, @@ -20052,10 +20128,10 @@ name = "Telecommunications"; req_access_txt = "61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -20068,10 +20144,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -20080,8 +20156,8 @@ /turf/open/floor/plating, /area/maintenance/starboard) "eIP" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "eJj" = ( @@ -20095,6 +20171,13 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/ai_monitored/security/armory) +"eJq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "eJG" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -20116,10 +20199,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -20150,10 +20233,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -20188,10 +20271,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -20209,10 +20292,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -20229,20 +20312,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "eLT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -20254,10 +20337,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -20274,16 +20357,16 @@ /turf/closed/wall, /area/quartermaster/sorting) "eMm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "eMx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -20300,6 +20383,7 @@ "eMP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/portable_thermomachine, /turf/open/floor/iron, /area/maintenance/fore/secondary) "eMZ" = ( @@ -20321,13 +20405,13 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, /obj/machinery/meter, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 8 + }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "eNp" = ( @@ -20346,10 +20430,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -20365,17 +20449,17 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/iron/dark, /area/medical/cryo) "eND" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/flip{ sortType = 12 }, @@ -20406,10 +20490,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "eOa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -20429,7 +20513,7 @@ /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "eOi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/table/reinforced, @@ -20456,11 +20540,11 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -20470,8 +20554,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "ePV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -20488,11 +20572,11 @@ /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_dock) "eQd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) "eQj" = ( @@ -20500,6 +20584,9 @@ dir = 4; pixel_y = -3 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "eQI" = ( @@ -20524,13 +20611,16 @@ "eQQ" = ( /obj/machinery/airalarm/directional/west, /obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "eQW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/east, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20544,10 +20634,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -20563,7 +20653,7 @@ name = "Solitary Confinement"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -20593,8 +20683,8 @@ /turf/open/floor/engine, /area/science/explab) "eRQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -20615,10 +20705,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -20630,10 +20720,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -20650,10 +20740,6 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "eSw" = ( @@ -20675,10 +20761,10 @@ /area/hallway/primary/starboard) "eTq" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -20688,10 +20774,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/prison/dark, @@ -20742,8 +20828,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -20752,10 +20838,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -20771,8 +20857,8 @@ /turf/open/floor/iron, /area/hydroponics) "eUP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -20788,7 +20874,7 @@ /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/plating, @@ -20829,7 +20915,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -20840,22 +20926,23 @@ name = "Engine Room"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) "eXx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "eXz" = ( @@ -20911,10 +20998,10 @@ /turf/open/floor/plating, /area/hallway/primary/port) "eYp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -20936,10 +21023,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -20952,10 +21039,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -20987,10 +21074,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/trunk{ @@ -21027,10 +21114,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "eZP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "eZS" = ( @@ -21107,10 +21194,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -21128,7 +21215,7 @@ /turf/open/floor/iron/dark, /area/storage/tech) "fdh" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 1 }, /turf/open/floor/engine/vacuum, @@ -21187,11 +21274,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -21205,7 +21289,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/circuit, @@ -21215,7 +21299,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark_green, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -21223,10 +21307,7 @@ /area/hydroponics) "ffm" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -21251,7 +21332,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -21290,10 +21371,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -21310,7 +21391,7 @@ /obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -21356,10 +21437,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -21379,13 +21460,13 @@ /turf/open/floor/iron/techmaint, /area/security/brig) "fiq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -21417,7 +21498,7 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "fjc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -21427,7 +21508,7 @@ /area/security/main) "fjl" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "fjx" = ( @@ -21448,14 +21529,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/xenobiology/flip, @@ -21477,12 +21558,7 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "fkT" = ( @@ -21491,8 +21567,8 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "fkU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -21500,7 +21576,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "fkY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -21536,10 +21612,10 @@ /turf/open/floor/plating, /area/security/main) "flJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -21563,10 +21639,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -21588,10 +21664,10 @@ /obj/machinery/door/airlock/security/glass{ name = "Anti Radiation Shielded Room" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/cable/yellow{ @@ -21604,8 +21680,8 @@ /turf/open/floor/plating, /area/maintenance/fore) "foG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -21616,7 +21692,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -21649,10 +21725,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -21725,10 +21801,10 @@ /turf/open/floor/iron/dark, /area/security/warden) "fqu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -21745,10 +21821,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -21757,18 +21833,17 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "fry" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/structure/chair/stool/directional/west, /turf/open/floor/iron, -/area/crew_quarters/locker) +/area/construction/mining/aux_base) "frD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -21779,7 +21854,7 @@ dir = 1 }, /obj/structure/disposalpipe/trunk, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/engine, /area/science/xenobiology) "frF" = ( @@ -21799,6 +21874,13 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/cmo) +"fsB" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/atmos) "fsO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -21831,28 +21913,28 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "ful" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) "fup" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -21870,16 +21952,6 @@ }, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) -"fuR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "fuY" = ( /obj/structure/rack, /obj/item/prison_scanner, @@ -21895,10 +21967,10 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -21914,14 +21986,14 @@ /turf/open/floor/iron, /area/hydroponics) "fvo" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/catwalk_floor, -/area/maintenance/aft) +/turf/open/floor/iron, +/area/hallway/secondary/entry) "fvG" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, @@ -21943,17 +22015,12 @@ /turf/open/floor/iron, /area/hydroponics) "fwG" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/open/floor/catwalk_floor, -/area/maintenance/starboard/aft) +/obj/machinery/portable_thermomachine, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fwQ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -21962,21 +22029,19 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/ai_monitored/security/armory) "fwS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/office) "fwU" = ( @@ -22021,21 +22086,21 @@ /turf/open/floor/plating, /area/crew_quarters/bar/atrium) "fya" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/floor/plating, /area/maintenance/aft) "fyc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "fyh" = ( @@ -22045,10 +22110,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -22094,10 +22159,10 @@ /area/crew_quarters/heads/cmo) "fyr" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/bot, @@ -22144,13 +22209,12 @@ id = "teledoor"; name = "MiniSat Teleport Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "fAA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/camera/directional/east, /obj/machinery/light{ dir = 4 @@ -22158,6 +22222,9 @@ /obj/structure/chair{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "fAK" = ( @@ -22185,12 +22252,6 @@ }, /obj/effect/turf_decal/bot, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22224,8 +22285,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -22257,12 +22318,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "fCh" = ( @@ -22276,7 +22331,7 @@ /area/ai_monitored/turret_protected/ai_upload) "fCi" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -22294,7 +22349,7 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "fCv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ dir = 1 }, /turf/open/floor/engine/o2, @@ -22304,7 +22359,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "fDa" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 }, /obj/structure/lattice/catwalk, @@ -22318,10 +22373,10 @@ /obj/structure/sign/warning/securearea{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -22334,16 +22389,16 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/security/brig) "fDE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -22362,13 +22417,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "fDL" = ( @@ -22383,10 +22438,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) "fDZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/catwalk_floor/iron, @@ -22395,10 +22450,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22425,16 +22480,23 @@ /turf/open/floor/iron/white, /area/security/brig) "fEJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) +"fEL" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "fEW" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -22442,23 +22504,23 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, /area/bridge) "fEY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22481,8 +22543,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/grunge{ name = "Morgue"; req_one_access_txt = "5;6" @@ -22494,13 +22556,13 @@ name = "MiniSat Maintenance"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "fFN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/airalarm/directional/south{ @@ -22538,12 +22600,6 @@ name = "MiniSat Chamber Hallway"; req_one_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) @@ -22585,12 +22641,9 @@ /turf/open/floor/iron, /area/hydroponics) "fHJ" = ( -/obj/machinery/computer/atmos_control/tank/air_tank{ +/obj/machinery/computer/atmos_control/air_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -22607,15 +22660,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/circuit, /area/science/robotics/mechbay) "fIA" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "fIX" = ( @@ -22623,10 +22676,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -22644,10 +22697,10 @@ /turf/open/floor/iron/dark, /area/bridge) "fJx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -22655,8 +22708,12 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "fJy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "fJI" = ( @@ -22682,15 +22739,22 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"fKr" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "fLd" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/security/checkpoint/auxiliary) "fLh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/holopad, /obj/effect/turf_decal/bot, /obj/effect/landmark/start/bartender, @@ -22742,9 +22806,6 @@ /area/crew_quarters/heads/captain) "fMC" = ( /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningdock) "fMD" = ( @@ -22755,10 +22816,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22783,8 +22844,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -22805,13 +22866,13 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "fOT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -22857,7 +22918,7 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -22887,10 +22948,10 @@ /turf/open/floor/plating, /area/hallway/secondary/command) "fPH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -22904,12 +22965,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "fQq" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, /obj/machinery/ai_slipper{ uses = 10 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/atmos) "fQu" = ( @@ -22943,7 +23002,7 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "fRd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 8 }, /obj/machinery/camera/directional/north, @@ -22956,8 +23015,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail{ sortType = 25 }, @@ -22968,7 +23027,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -22981,19 +23040,29 @@ codes_txt = "patrol;next_patrol=HOP"; location = "CHE" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, /area/hallway/primary/central) +"fRJ" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "fSx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/royalblue, @@ -23019,17 +23088,17 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "fSW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) "fTd" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/atmos) @@ -23054,10 +23123,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -23069,10 +23138,10 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "fTO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -23084,12 +23153,15 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -23110,7 +23182,7 @@ /turf/open/floor/iron/white, /area/science/lab) "fUA" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -23121,10 +23193,10 @@ }, /area/engine/atmos) "fUB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -23150,10 +23222,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -23168,17 +23240,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) -"fUR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) "fUV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -23206,9 +23267,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /turf/open/floor/iron, /area/quartermaster/miningdock) "fWn" = ( @@ -23218,26 +23276,20 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "fWD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/iron/white, +/area/medical/chemistry) "fWS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -23262,10 +23314,10 @@ /turf/open/floor/iron, /area/engine/engineering) "fXc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral{ @@ -23274,7 +23326,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "fXX" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -23290,10 +23342,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -23329,7 +23381,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison/dark, @@ -23375,10 +23427,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -23393,10 +23445,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) "gat" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -23418,7 +23470,7 @@ pixel_y = -24 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -23433,31 +23485,37 @@ name = "Atmos RC"; pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "gbg" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/maintenance/aft) "gbk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -23473,14 +23531,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 16 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -23498,10 +23556,10 @@ }, /area/engine/atmos) "gcw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -23519,7 +23577,7 @@ /turf/open/floor/iron, /area/hydroponics) "gcR" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, /turf/open/floor/iron, @@ -23544,23 +23602,18 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "gcZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron, +/area/quartermaster/miningdock) "gda" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -23573,10 +23626,10 @@ /turf/open/floor/wood, /area/vacant_room/office) "gdq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/status_display/ai{ @@ -23591,10 +23644,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "gds" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -23611,10 +23664,10 @@ /area/maintenance/solars/starboard/aft) "gdO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -23633,13 +23686,13 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "gdZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -23659,12 +23712,9 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "geE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_y = -32 }, @@ -23680,6 +23730,14 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron/grid/steel, /area/storage/tech) +"geT" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Biohazard"; + name = "biohazard Containment Door" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/science/research) "gfd" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -23714,10 +23772,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -23732,12 +23790,6 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "ggx" = ( @@ -23749,15 +23801,15 @@ "gho" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/spawner/lootdrop/maintenance/five, /turf/open/floor/iron, /area/quartermaster/warehouse) "ghw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/camera/directional/west, @@ -23803,10 +23855,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -23819,7 +23871,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -23833,9 +23885,11 @@ /turf/open/floor/iron, /area/security/brig) "giI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -23852,8 +23906,8 @@ /turf/open/floor/iron/dark, /area/security/warden) "gjG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white/side{ @@ -23881,10 +23935,10 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -23894,10 +23948,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gkT" = ( @@ -23908,10 +23962,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -23921,6 +23975,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/science/mixing) "gls" = ( @@ -23952,10 +24007,10 @@ /turf/open/floor/iron, /area/engine/engineering) "glX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -23968,20 +24023,20 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "gmN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) "gmP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -24000,12 +24055,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "gnK" = ( @@ -24017,10 +24066,10 @@ /area/crew_quarters/heads/hos) "gnO" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -24029,12 +24078,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "gnX" = ( @@ -24047,7 +24094,7 @@ /turf/open/floor/iron, /area/science/nanite) "gok" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/table, @@ -24086,11 +24133,12 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "gov" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/crew_quarters/locker) "goI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -24113,10 +24161,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -24140,8 +24188,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -24193,9 +24241,6 @@ /turf/open/floor/iron/white, /area/medical/virology) "gqr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/door/airlock/maintenance/glass{ name = "Atmospherics External Airlock"; req_access_txt = "24" @@ -24210,13 +24255,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -24261,13 +24306,25 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"grJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/aisat/hallway) "grQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -24303,10 +24360,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "gsw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -24343,10 +24400,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -24358,10 +24415,9 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "gtt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "gtQ" = ( @@ -24429,10 +24485,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison/shielded) "guV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red{ @@ -24467,16 +24523,13 @@ /obj/structure/reflector/box/anchored{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "gwz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) "gwA" = ( @@ -24484,10 +24537,10 @@ name = "Captain's Quarters"; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24496,10 +24549,10 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "gwE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -24522,7 +24575,7 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "gxp" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -24539,10 +24592,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -24554,8 +24607,8 @@ "gxC" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/west, @@ -24585,17 +24638,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron, /area/science/xenobiology) "gxV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -24610,7 +24663,7 @@ /obj/effect/turf_decal/tile/dark_green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "gyW" = ( @@ -24652,10 +24705,10 @@ /turf/open/floor/wood, /area/security/detectives_office) "gzL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24704,7 +24757,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/flasher{ @@ -24716,16 +24769,16 @@ "gAq" = ( /obj/structure/curtain, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, /area/security/prison) "gAH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24738,7 +24791,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "gAS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24746,7 +24799,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -24767,7 +24820,7 @@ /area/crew_quarters/bar/atrium) "gBM" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -24792,10 +24845,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron, @@ -24809,9 +24862,7 @@ /turf/open/floor/wood, /area/lawoffice) "gCt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "gCL" = ( @@ -24821,19 +24872,19 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gDd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -24860,7 +24911,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/arrows, @@ -24874,7 +24925,6 @@ name = "Engineering External Access"; req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/engineering) "gDB" = ( @@ -24889,7 +24939,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -24915,18 +24965,15 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "gDW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "gEo" = ( /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24953,12 +25000,6 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gEz" = ( @@ -24967,10 +25008,13 @@ name = "Gas to Filter" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, /area/engine/supermatter) "gEE" = ( @@ -24984,8 +25028,8 @@ name = "Observation" }, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, @@ -24998,8 +25042,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -25032,7 +25076,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -25040,15 +25084,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/storage/tech) "gGK" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall, /area/ai_monitored/turret_protected/aisat_interior) "gGV" = ( @@ -25108,7 +25150,6 @@ /turf/open/floor/plating, /area/security/main) "gIj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, @@ -25121,11 +25162,11 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/starboard) "gIA" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -25162,10 +25203,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, @@ -25174,11 +25215,20 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"gJA" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "gJM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -25208,10 +25258,10 @@ /turf/open/floor/iron/dark, /area/teleporter) "gKm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25229,6 +25279,12 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "gKG" = ( @@ -25241,7 +25297,7 @@ "gKU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/public/glass{ @@ -25265,25 +25321,24 @@ /turf/open/floor/iron, /area/maintenance/fore/secondary) "gLA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/quartermaster/storage) "gLK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "gLL" = ( /obj/machinery/status_display/evac/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/starboard) "gLU" = ( @@ -25318,7 +25373,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "gMl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) @@ -25337,12 +25392,6 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "gME" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "gMT" = ( @@ -25377,10 +25426,8 @@ pixel_y = 5 }, /obj/item/reagent_containers/dropper, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/button/ignition{ id = "executionburn"; name = "Justice Ignition Switch"; @@ -25433,10 +25480,10 @@ dir = 8 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -25449,9 +25496,10 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "gOp" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, /area/engine/engineering) "gOt" = ( /obj/structure/cable/yellow{ @@ -25460,10 +25508,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -25475,10 +25523,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "gPt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/security/checkpoint/medical) @@ -25487,16 +25535,10 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "gPH" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/engine, /area/engine/engineering) "gPN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -25510,6 +25552,12 @@ "gQd" = ( /turf/closed/wall, /area/quartermaster/exploration_dock) +"gQu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "gQJ" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -25529,14 +25577,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "gRD" = ( @@ -25550,10 +25597,10 @@ name = "Security Office"; req_one_access_txt = "1;57" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25582,10 +25629,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue, @@ -25604,11 +25651,9 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "gTc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/obj/machinery/portable_thermomachine, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "gTf" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -25619,7 +25664,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "gTu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "gTL" = ( @@ -25634,10 +25679,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gUf" = ( @@ -25655,10 +25700,10 @@ /area/crew_quarters/heads/hop) "gUt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25678,10 +25723,10 @@ /area/science/explab) "gUQ" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -25691,13 +25736,13 @@ /turf/open/floor/plating, /area/crew_quarters/theatre) "gVg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -25706,7 +25751,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -25736,22 +25781,22 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) "gWs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/storage/primary) "gWx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -25769,10 +25814,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -25780,15 +25825,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"gXk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "gXs" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -25807,10 +25843,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -25880,10 +25916,10 @@ dir = 4 }, /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -25893,13 +25929,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating/rust, /area/maintenance/starboard/fore) +"gZV" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/engine/atmos) "haa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25907,24 +25949,27 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "haj" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "13" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "atmos_external" }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_one_access = "24, 13" + }, /turf/open/floor/plating, /area/maintenance/aft) "haz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -25940,10 +25985,10 @@ icon_state = "1-2" }, /mob/living/simple_animal/kalo, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -25964,19 +26009,19 @@ dir = 1 }, /obj/effect/landmark/start/depsec/supply, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, /area/security/checkpoint/supply) "hce" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -26004,10 +26049,10 @@ pixel_x = 2; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -26020,14 +26065,14 @@ name = "Supermatter Engine Room"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "hcQ" = ( /obj/structure/sign/departments/minsky/supply/hydroponics2, @@ -26067,10 +26112,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -26091,10 +26136,10 @@ id_tag = "Dorm1"; name = "Dorm 1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -26103,10 +26148,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "heT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue{ @@ -26171,12 +26216,13 @@ /turf/open/floor/iron, /area/storage/primary) "hfS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/quartermaster/storage) "hfY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/table/glass, @@ -26196,8 +26242,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26235,10 +26281,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/white/opposingcorners, @@ -26248,6 +26291,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/grid, /area/medical/patients_rooms) "hho" = ( @@ -26262,7 +26306,7 @@ /turf/closed/wall, /area/medical/exam_room) "hid" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -26306,24 +26350,23 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "hiN" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/machinery/door/airlock/arrivals_external{ - name = "Arrivals Airlock" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/entry) +/turf/open/floor/iron, +/area/construction/mining/aux_base) "hiT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hjj" = ( @@ -26345,13 +26388,13 @@ /turf/open/floor/iron, /area/quartermaster/exploration_dock) "hjP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ @@ -26380,10 +26423,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "hkJ" = ( @@ -26410,10 +26453,10 @@ pixel_y = -2; prison_radio = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/prison/dark, @@ -26425,10 +26468,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -26467,8 +26510,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -26504,7 +26547,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/machinery/camera/directional/north, @@ -26520,8 +26563,8 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, @@ -26534,13 +26577,13 @@ /area/science/research) "hoL" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "hoO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -26603,7 +26646,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/light, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/south{ @@ -26613,7 +26656,9 @@ /turf/open/floor/engine, /area/engine/engineering) "hqw" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + hide = 0 + }, /turf/open/floor/engine, /area/science/xenobiology) "hqD" = ( @@ -26658,28 +26703,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/airalarm/mixingchamber{ - dir = 4; - pixel_x = 24 - }, /turf/open/floor/iron, -/area/science/mixing/chamber) +/area/science/mixing) "hrM" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "hrS" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -26718,11 +26759,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -26763,10 +26804,10 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "htE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -26797,8 +26838,8 @@ name = "Security Maintenance"; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26807,8 +26848,8 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "huf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "hup" = ( @@ -26849,8 +26890,6 @@ "hvG" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "hvV" = ( @@ -26870,7 +26909,7 @@ /turf/open/floor/carpet, /area/vacant_room/office) "hwp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron, @@ -26897,12 +26936,6 @@ /turf/open/floor/prison/dark, /area/security/prison) "hwO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/light{ dir = 4 }, @@ -26947,17 +26980,17 @@ /area/security/brig) "hxO" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space/basic, /area/space/nearstation) "hyg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -26971,10 +27004,10 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -27029,6 +27062,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "hzA" = ( @@ -27051,16 +27090,16 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/aft) "hAw" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2, /turf/open/space, /area/space/nearstation) "hAF" = ( @@ -27068,8 +27107,8 @@ name = "Chemistry Lab"; req_access_txt = "5; 33" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -27110,10 +27149,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light_switch{ @@ -27160,10 +27199,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/service) "hBZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -27177,10 +27216,10 @@ /area/maintenance/starboard/fore) "hCs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -27189,19 +27228,19 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "hCC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet, /area/library) "hCM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -27211,8 +27250,8 @@ name = "Library Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -27230,10 +27269,10 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -27269,10 +27308,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -27296,10 +27335,10 @@ /turf/open/floor/plating, /area/maintenance/central) "hEZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -27341,15 +27380,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/break_room) +"hGi" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "hGn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -27360,15 +27406,6 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"hGV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "hHA" = ( /obj/structure/table, /obj/item/book/manual/wiki/medical_cloning{ @@ -27405,18 +27442,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/security/brig) "hId" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) "hIe" = ( @@ -27440,24 +27477,24 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "hJe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 1 }, /turf/open/floor/engine/air, /area/engine/atmos) "hJq" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/ai_monitored/security/armory) "hJw" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -27485,10 +27522,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -27498,15 +27535,12 @@ /area/medical/storage) "hJG" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) "hJK" = ( @@ -27527,18 +27561,13 @@ /turf/open/floor/iron, /area/security/courtroom) "hJN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "hJR" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -27551,8 +27580,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -27561,10 +27590,10 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "hKs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -27618,7 +27647,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness) "hLO" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/dark, /area/medical/cryo) @@ -27640,8 +27669,8 @@ /area/security/prison) "hMG" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space, @@ -27650,6 +27679,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/quartermaster/miningdock) "hNp" = ( @@ -27663,7 +27695,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/circuit, @@ -27702,8 +27734,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/maintenance{ @@ -27726,10 +27758,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -27770,10 +27802,10 @@ name = "MiniSat Chamber Observation"; req_one_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -27802,10 +27834,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/patients_rooms) "hOL" = ( @@ -27824,7 +27856,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "hOV" = ( /obj/effect/decal/cleanable/dirt, @@ -27841,10 +27873,10 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -27859,12 +27891,11 @@ /turf/open/floor/engine, /area/gateway) "hPy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "hPC" = ( @@ -27875,10 +27906,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -27895,17 +27926,17 @@ /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) "hPY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/dark, /area/engine/engineering) "hQb" = ( /obj/machinery/modular_computer/console/preset/engineering, /obj/effect/turf_decal/bot{ dir = 1 }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/techmaint, /area/engine/engineering) "hQe" = ( @@ -27921,7 +27952,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/catwalk_floor, @@ -27931,8 +27962,8 @@ /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "hQB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -27945,32 +27976,30 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) "hQE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "hQH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison/dark, @@ -27979,7 +28008,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -27989,10 +28018,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "hRk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/techfloorgrid{ @@ -28010,10 +28039,10 @@ "hRP" = ( /obj/structure/chair/office, /obj/effect/landmark/start/depsec/engineering, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -28034,24 +28063,17 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "hSt" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "atmos_external" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron, +/area/quartermaster/storage) "hSv" = ( /obj/machinery/light, /obj/machinery/airalarm/directional/south, @@ -28065,8 +28087,8 @@ /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) "hTd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/white/opposingcorners, @@ -28093,21 +28115,12 @@ "hTX" = ( /obj/structure/bed/dogbed/walter, /mob/living/simple_animal/pet/dog/bullterrier/walter, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, /area/security/warden) "hUb" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "hUm" = ( @@ -28157,10 +28170,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -28191,10 +28204,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -28212,10 +28225,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -28233,10 +28246,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "hWE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28246,10 +28259,10 @@ /area/quartermaster/storage) "hWH" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "hWP" = ( @@ -28273,18 +28286,18 @@ name = "MiniSat Antechamber"; req_one_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "hXe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -28303,11 +28316,9 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "hXz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, -/area/quartermaster/exploration_dock) +/area/crew_quarters/locker) "hXB" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -28319,11 +28330,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -28345,10 +28356,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -28359,8 +28370,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "hYG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -28420,24 +28431,23 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hZN" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/iron, +/area/engine/engineering) "hZX" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 4 @@ -28448,13 +28458,23 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/exit) +"iaP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "ibG" = ( /obj/machinery/nanite_programmer, /obj/effect/turf_decal/bot, @@ -28504,7 +28524,7 @@ pixel_x = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 + dir = 1 }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) @@ -28516,17 +28536,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, /area/security/prison) "idb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -28541,13 +28561,13 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "idA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -28556,12 +28576,11 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "iea" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/plating, +/area/maintenance/port/aft) "ied" = ( /obj/structure/table/glass, /obj/item/stack/ducts/fifty, @@ -28632,7 +28651,7 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -28653,10 +28672,10 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "ifr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28686,21 +28705,22 @@ dir = 4; sortType = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ifY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "igc" = ( @@ -28747,33 +28767,27 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/security/brig) "ihd" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "ihk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -28789,10 +28803,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/dorms) "ihH" = ( @@ -28801,13 +28815,13 @@ /area/teleporter) "ihI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Hydroponics Backroom"; req_access_txt = "35" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -28858,10 +28872,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -28878,10 +28892,10 @@ /turf/open/floor/wood, /area/medical/exam_room) "iiF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "iiH" = ( @@ -28920,8 +28934,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/checker, @@ -28954,7 +28968,7 @@ /area/engine/atmos) "ijO" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/plating, @@ -28964,10 +28978,10 @@ icon_state = "1-2" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -28976,31 +28990,32 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "ikh" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "ikk" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -29015,7 +29030,7 @@ /area/maintenance/fore/secondary) "ikw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark/textured_large, @@ -29063,7 +29078,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/spray/cleaner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/light{ @@ -29072,11 +29087,11 @@ /turf/open/floor/iron/white, /area/medical/virology) "ilh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -29097,10 +29112,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -29116,10 +29131,10 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "ilC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet, @@ -29141,21 +29156,21 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "imz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "imP" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /turf/open/space, @@ -29168,6 +29183,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/port) "imW" = ( @@ -29184,10 +29203,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -29202,30 +29221,23 @@ /area/maintenance/starboard/fore) "ins" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /turf/open/space, /area/space/nearstation) "int" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, /area/maintenance/port/fore) "inH" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/entry) +/turf/open/floor/plating, +/area/maintenance/port/aft) "inT" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ @@ -29270,10 +29282,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "ipn" = ( @@ -29290,10 +29302,10 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -29320,8 +29332,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -29332,7 +29344,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "iqh" = ( -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -29343,10 +29355,13 @@ "iqj" = ( /obj/machinery/airalarm/directional/west, /obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "iqH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/bed/dogbed/vector, @@ -29358,10 +29373,10 @@ id_tag = "Dorm2"; name = "Dorm 2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -29371,19 +29386,19 @@ /area/crew_quarters/dorms) "irm" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "irK" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/catwalk_floor, /area/quartermaster/exploration_dock) "irX" = ( @@ -29437,12 +29452,9 @@ name = "MiniSat External Access"; req_access_txt = "65;13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) "isD" = ( @@ -29476,10 +29488,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -29494,16 +29506,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"iui" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = 25 - }, -/turf/open/floor/catwalk_floor, -/area/maintenance/aft) "iuA" = ( /obj/effect/turf_decal/bot_white/right, /turf/open/floor/engine/light, @@ -29544,8 +29546,8 @@ /turf/open/floor/wood/big, /area/maintenance/aft) "ivk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -29560,15 +29562,13 @@ /turf/open/floor/iron/dark, /area/security/main) "ivt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "ivE" = ( @@ -29592,10 +29592,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -29608,7 +29608,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -29620,7 +29620,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/techfloorgrid{ dir = 6 }, @@ -29664,10 +29664,10 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "iwQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -29686,16 +29686,16 @@ /area/hallway/secondary/exit) "ixA" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/space, /area/space/nearstation) "ixK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/checker, @@ -29704,7 +29704,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/machinery/meter, @@ -29727,10 +29727,10 @@ name = "Visitation" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -29739,17 +29739,17 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "iyq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/engine, /area/science/xenobiology) "iyA" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -29775,7 +29775,7 @@ "iBi" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/cafeteria, @@ -29788,8 +29788,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 1 }, @@ -29800,11 +29800,17 @@ codes_txt = "patrol;next_patrol=AftH"; location = "AIW" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "iBK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -29819,6 +29825,20 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"iBW" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "iCb" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -29871,8 +29891,8 @@ req_access_txt = "4" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -29901,8 +29921,8 @@ /turf/open/floor/engine/light, /area/engine/engineering) "iDt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -29928,15 +29948,15 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "iEk" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) "iEl" = ( @@ -29945,10 +29965,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -29985,10 +30005,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -30000,27 +30020,26 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "iFx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, /area/chapel/main) "iFG" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) +/turf/open/floor/plating, +/area/maintenance/aft) "iGx" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -23 @@ -30048,10 +30067,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -30060,17 +30079,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/stripes/white/end{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) +"iHt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard) "iHK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -30089,19 +30114,19 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, /area/maintenance/port) "iHS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -30127,9 +30152,6 @@ /obj/machinery/door/airlock/external{ name = "Cargo Escape Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "iIx" = ( @@ -30145,8 +30167,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -30162,7 +30184,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -30172,10 +30194,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) "iJy" = ( @@ -30189,11 +30211,8 @@ /turf/open/floor/wood, /area/maintenance/fore/secondary) "iJB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -30204,11 +30223,10 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 3" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "iJR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -30224,16 +30242,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "iKc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/preopen{ id = "quarantineshutters"; name = "Quarantine Shutters" @@ -30263,7 +30281,7 @@ /turf/open/floor/iron, /area/science/robotics/mechbay) "iKJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -30286,12 +30304,6 @@ name = "External Access"; req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "iLi" = ( @@ -30317,20 +30329,21 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "iMy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/entry) "iMA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/port) +/turf/open/space, +/area/space/nearstation) "iNa" = ( /obj/machinery/light{ dir = 8 @@ -30342,7 +30355,7 @@ /area/hallway/primary/central) "iNb" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/space/basic, @@ -30402,10 +30415,10 @@ /turf/open/floor/iron, /area/security/checkpoint/supply) "iOZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -30458,12 +30471,9 @@ name = "External Access"; req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "iQe" = ( @@ -30473,8 +30483,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "iQo" = ( @@ -30510,24 +30520,26 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) "iRk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/entry) "iRl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30554,7 +30566,7 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "iRX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -30569,8 +30581,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -30619,10 +30631,10 @@ "iTO" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -30636,17 +30648,17 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, /area/maintenance/port/fore) "iUc" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -30706,10 +30718,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -30721,10 +30733,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "iVQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -30733,12 +30745,9 @@ /turf/open/floor/iron/dark, /area/chapel/main) "iWb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) "iWh" = ( @@ -30794,9 +30803,6 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/crew_quarters/locker) "iXY" = ( @@ -30823,7 +30829,7 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -30857,8 +30863,7 @@ /turf/open/floor/iron, /area/engine/engineering) "iYT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, @@ -30884,10 +30889,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/camera/directional/east, @@ -30913,31 +30918,40 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/stripes/white/corner{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "jai" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/maintenance/starboard/fore) "jaC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/engineering) "jaD" = ( /obj/structure/disposalpipe/segment, @@ -30987,10 +31001,10 @@ /turf/open/floor/iron/dark, /area/bridge) "jbZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31020,10 +31034,10 @@ /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31045,10 +31059,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -31075,18 +31089,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"jdt" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "jeB" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -31107,10 +31109,10 @@ /area/engine/engineering) "jfd" = ( /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -31120,12 +31122,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "jfw" = ( @@ -31140,10 +31137,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -31162,8 +31159,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -31190,10 +31187,10 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) "jfW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31202,8 +31199,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "jgJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -31216,7 +31213,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -31234,10 +31231,10 @@ /turf/open/floor/iron, /area/security/checkpoint/supply) "jgX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31267,10 +31264,10 @@ /turf/open/floor/iron/dark, /area/security/main) "jhf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -31308,10 +31305,10 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "jhK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/chair/fancy/bench/pew/left{ @@ -31360,10 +31357,10 @@ /turf/open/floor/iron, /area/science/lab) "jip" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31379,10 +31376,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/white, @@ -31392,10 +31389,7 @@ /turf/open/floor/plating/rust, /area/maintenance/aft) "jjp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31432,8 +31426,8 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, @@ -31479,17 +31473,17 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "jlQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -31514,9 +31508,11 @@ /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "jmH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) @@ -31524,10 +31520,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -31567,7 +31563,7 @@ /turf/open/floor/iron/dark, /area/security/prison) "jnB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -31583,7 +31579,7 @@ req_access_txt = "49" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -31592,7 +31588,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -31619,10 +31615,10 @@ name = "MiniSat Foyer"; req_one_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -31632,12 +31628,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/miningdock) "joD" = ( @@ -31645,10 +31636,10 @@ icon_state = "1-4" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -31657,10 +31648,10 @@ /obj/machinery/holopad{ pixel_y = -16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -31705,10 +31696,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/hallway/primary/starboard) "jpE" = ( @@ -31718,10 +31709,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -31758,16 +31749,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "jrc" = ( @@ -31785,10 +31766,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes, @@ -31827,7 +31808,7 @@ "jsj" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 8 }, /turf/open/floor/iron/dark/textured_large, @@ -31846,10 +31827,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -31859,10 +31840,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -31871,26 +31852,26 @@ /turf/open/floor/plating, /area/maintenance/starboard) "jto" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, /area/engine/break_room) "jty" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jtE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/camera/directional/south, @@ -31916,10 +31897,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison, @@ -31934,10 +31915,10 @@ /turf/open/floor/iron/white, /area/security/brig) "juH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -31958,10 +31939,10 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "juV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -31976,10 +31957,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -32006,12 +31987,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/engine, /area/engine/engineering) "jvN" = ( @@ -32048,8 +32023,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/janitor) "jwC" = ( @@ -32104,7 +32079,7 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "jxw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -32113,7 +32088,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction, @@ -32128,10 +32103,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light/small, @@ -32167,27 +32142,27 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/robotics/lab) "jyt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -32221,10 +32196,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -32233,14 +32205,17 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/cafeteria, /area/hallway/secondary/entry) "jzn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -32277,9 +32252,9 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) @@ -32290,6 +32265,13 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"jzS" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/turf/open/floor/iron, +/area/engine/atmos) "jAf" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -32311,8 +32293,8 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -32337,10 +32319,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -32356,20 +32338,16 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "jAR" = ( /obj/structure/closet/emcloset{ anchored = 1 }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "jBp" = ( @@ -32377,10 +32355,10 @@ name = "Cargo Office"; req_one_access_txt = "50;48" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -32426,8 +32404,8 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "jCm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -32436,8 +32414,8 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "jCq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -32446,7 +32424,7 @@ /turf/open/floor/iron/dark, /area/security/brig) "jCs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -32456,8 +32434,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -32477,10 +32455,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -32494,18 +32472,18 @@ icon_state = "1-2" }, /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/camera/directional/west, /turf/open/floor/iron/white, /area/medical/virology) "jDj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /mob/living/carbon/monkey/punpun, @@ -32519,7 +32497,7 @@ dir = 4 }, /obj/machinery/camera/directional/west, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "jDW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -32562,10 +32540,10 @@ /turf/open/floor/prison/dark, /area/security/prison) "jEK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -32592,10 +32570,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/port/fore) "jGm" = ( @@ -32608,15 +32582,14 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "jGr" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" + }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "jGs" = ( @@ -32627,18 +32600,27 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, /area/science/research) -"jGH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"jGF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) +"jGH" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -32647,7 +32629,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -32659,16 +32641,22 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"jGV" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/port) "jHa" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ name = "Engineering External Access"; req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/engine/engineering) "jHD" = ( @@ -32690,8 +32678,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/circuit, @@ -32707,10 +32695,7 @@ /area/security/prison) "jHX" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -32718,26 +32703,22 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge) -"jIB" = ( -/obj/structure/chair/fancy/comfy, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) "jIE" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "jIS" = ( @@ -32770,7 +32751,7 @@ /turf/open/floor/iron, /area/science/robotics/lab) "jJw" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "jJF" = ( @@ -32787,8 +32768,8 @@ /turf/open/floor/iron, /area/tcommsat/computer) "jJU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32812,18 +32793,15 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "jKu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "jKG" = ( @@ -32861,16 +32839,16 @@ /turf/open/floor/wood/big, /area/maintenance/aft) "jLl" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/dark{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/aft) "jLx" = ( /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -32890,10 +32868,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32912,10 +32890,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -32936,17 +32914,17 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, /area/library) "jMd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/grimy, @@ -32999,12 +32977,9 @@ /turf/open/floor/iron/techmaint, /area/engine/engineering) "jOj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/crew_quarters/locker) "jOt" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted, /obj/effect/turf_decal/tile/dark_green{ @@ -33021,10 +32996,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/catwalk_floor, /area/security/brig) @@ -33051,10 +33022,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -33066,7 +33037,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -33078,10 +33049,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "jPq" = ( @@ -33102,10 +33073,10 @@ /turf/open/floor/plating, /area/security/prison) "jPx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -33131,19 +33102,16 @@ /turf/open/floor/plating, /area/bridge) "jPN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "jPP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -33157,7 +33125,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/white, @@ -33175,20 +33143,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "jQf" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/catwalk_floor, +/turf/open/floor/plating, /area/maintenance/port/aft) "jQt" = ( /obj/machinery/navbeacon{ @@ -33201,15 +33159,15 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "jQJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -33217,13 +33175,13 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "jRC" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, @@ -33235,7 +33193,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "jSz" = ( @@ -33275,10 +33232,10 @@ departmentType = 5; pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -33290,7 +33247,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -33314,10 +33271,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "jUk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -33327,15 +33284,15 @@ /area/crew_quarters/cryopods) "jUs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plating, /area/maintenance/starboard) "jUv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -33349,10 +33306,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -33391,15 +33348,15 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "jVQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "jWa" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/layer_manifold/orange/visible{ + dir = 8 }, /turf/open/floor/plating, /area/engine/engineering) @@ -33447,10 +33404,10 @@ /area/tcommsat/computer) "jWu" = ( /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -33460,10 +33417,10 @@ name = "Chapel Office"; req_access_txt = "22" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, @@ -33488,14 +33445,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; sortType = 25 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "jXi" = ( @@ -33530,11 +33487,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -33577,13 +33534,13 @@ /obj/effect/turf_decal/caution{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -33592,10 +33549,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -33605,10 +33562,10 @@ /turf/open/floor/glass/reinforced, /area/science/nanite) "jYX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/power/apc/auto_name/directional/east{ @@ -33621,10 +33578,10 @@ /turf/open/floor/iron, /area/security/checkpoint/auxiliary) "jYZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -33668,20 +33625,17 @@ /area/quartermaster/miningdock) "kaz" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/hallway/secondary/exit) "kaV" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/item/clipboard, @@ -33701,10 +33655,10 @@ /turf/open/floor/iron, /area/quartermaster/office) "kbu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -33789,10 +33743,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -33805,7 +33759,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -33817,10 +33771,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -33839,10 +33793,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -33861,10 +33815,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -33879,7 +33833,7 @@ /turf/open/floor/iron, /area/hydroponics) "keR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "keZ" = ( @@ -33903,8 +33857,8 @@ }, /area/crew_quarters/dorms) "kfp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -33932,8 +33886,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -33951,15 +33905,15 @@ name = "MiniSat Teleporter"; req_access_txt = "17;65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "kgY" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/space, /area/maintenance/disposal/incinerator) "khn" = ( @@ -33979,10 +33933,10 @@ name = "Starboard Bow Solar Access"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -33995,7 +33949,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/circuit, @@ -34013,11 +33967,11 @@ /turf/closed/wall, /area/crew_quarters/bar) "kjL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron, /area/engine/engineering) @@ -34058,10 +34012,10 @@ /area/maintenance/port/aft) "kmr" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -34075,7 +34029,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/telecomms, @@ -34111,10 +34065,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -34166,8 +34120,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "knz" = ( @@ -34181,10 +34135,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34203,10 +34157,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -34226,32 +34180,22 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "koC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/quartermaster/storage) +/area/hallway/secondary/entry) "koI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -34265,7 +34209,7 @@ /turf/open/floor/plating, /area/engine/engineering) "kpk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/circuit, @@ -34274,10 +34218,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison/dark, @@ -34295,8 +34239,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes, @@ -34310,13 +34254,13 @@ /turf/closed/wall, /area/maintenance/starboard/aft) "kqx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "kqP" = ( @@ -34327,29 +34271,29 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "kqX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/aft) "krJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "krN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -34425,8 +34369,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/dark_blue/filled/line, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /obj/structure/disposalpipe/junction, @@ -34439,10 +34383,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/cmo_office, @@ -34452,10 +34396,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/library) "kso" = ( @@ -34482,10 +34426,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -34501,10 +34445,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -34513,8 +34457,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison, @@ -34523,10 +34467,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes{ @@ -34554,7 +34498,7 @@ /area/security/brig) "ktv" = ( /obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue, @@ -34599,8 +34543,8 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitory" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -34609,12 +34553,25 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"ktL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "kub" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -34632,7 +34589,7 @@ /area/maintenance/starboard) "kum" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/dark, @@ -34644,8 +34601,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "kuS" = ( @@ -34711,10 +34668,10 @@ /turf/open/floor/iron/white, /area/science/explab) "kvS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34803,7 +34760,7 @@ /area/security/main) "kxW" = ( /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -34823,8 +34780,8 @@ id_tag = "Dorm5"; name = "Cabin 1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -34884,8 +34841,11 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "kzD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/central) "kzV" = ( @@ -34895,10 +34855,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/detectives_office) "kzZ" = ( @@ -34954,18 +34914,18 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "kBL" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -35030,10 +34990,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -35055,16 +35015,16 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "kDj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "kDq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -35084,11 +35044,8 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "kDF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -35099,10 +35056,10 @@ /turf/open/floor/iron, /area/engine/atmos) "kEM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -35116,10 +35073,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -35188,34 +35145,32 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/science/nanite) "kFU" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/machinery/door/firedoor, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering/glass{ + name = "Laser Room"; + req_access_txt = "10" + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "kGk" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -35228,10 +35183,10 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "kGB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -35250,8 +35205,8 @@ name = "Atmospherics Maintenance"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -35297,8 +35252,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) "kHz" = ( @@ -35336,10 +35291,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -35349,10 +35304,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "kIg" = ( @@ -35374,20 +35329,20 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "kII" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -35397,15 +35352,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/miningdock) "kIP" = ( @@ -35423,10 +35375,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/flip{ sortType = 24 }, @@ -35492,8 +35444,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -35665,9 +35617,6 @@ /area/crew_quarters/heads/cmo) "kNO" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/central) "kOf" = ( @@ -35677,10 +35626,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -35699,11 +35648,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -35772,7 +35721,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hop) "kQe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/fitness) "kQk" = ( @@ -35782,12 +35731,14 @@ /turf/open/floor/iron, /area/hallway/primary/central) "kQq" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/door/airlock/external{ + req_access_txt = "13" }, -/turf/open/floor/engine, -/area/engine/engineering) +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/starboard/aft) "kQw" = ( /obj/structure/sink{ dir = 4; @@ -35838,11 +35789,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/miningdock) @@ -35872,7 +35820,6 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "kSb" = ( -/obj/effect/landmark/event_spawn, /obj/effect/turf_decal/loading_area{ dir = 1 }, @@ -35883,10 +35830,10 @@ id_tag = "Dorm4"; name = "Dorm 4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -35914,10 +35861,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -35978,7 +35925,7 @@ /area/crew_quarters/fitness) "kTY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -35988,16 +35935,16 @@ /area/science/explab) "kUg" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "kUi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/button/door/directional/north{ @@ -36008,7 +35955,7 @@ /area/maintenance/starboard/fore) "kUk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "kUm" = ( @@ -36020,8 +35967,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -36035,7 +35982,7 @@ /turf/open/floor/plating, /area/medical/medbay/lobby) "kUB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -36061,10 +36008,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "kUF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -36076,13 +36023,12 @@ /turf/open/space/basic, /area/space/nearstation) "kVh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/iron, -/area/quartermaster/exploration_dock) +/turf/open/floor/carpet, +/area/hallway/secondary/entry) "kVJ" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -36147,10 +36093,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "kWO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/orange, @@ -36188,10 +36134,10 @@ /area/science/research) "kYa" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -36206,19 +36152,19 @@ /obj/machinery/holopad{ pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/start/cook, /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "kYh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -36374,10 +36320,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -36410,6 +36356,15 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"lbJ" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "lbV" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, @@ -36429,10 +36384,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -36456,7 +36411,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -36508,10 +36463,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -36524,15 +36479,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "lds" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36546,7 +36501,7 @@ /turf/open/floor/wood/big, /area/maintenance/aft) "ldN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /obj/machinery/light/directional/west, @@ -36562,10 +36517,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -36603,10 +36558,10 @@ /area/gateway) "leU" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36652,8 +36607,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -36673,15 +36628,17 @@ /turf/open/floor/plating, /area/bridge) "lhP" = ( -/obj/structure/chair/fancy/comfy{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, /area/hallway/secondary/entry) "lhV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -36701,18 +36658,21 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "lie" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "liI" = ( @@ -36743,10 +36703,10 @@ req_access_txt = "39"; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -36775,7 +36735,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/red, @@ -36812,10 +36772,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -36828,11 +36788,8 @@ icon_state = "1-2" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) @@ -36878,10 +36835,10 @@ /area/security/checkpoint/science) "llv" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, @@ -36890,10 +36847,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -36936,12 +36893,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -36949,7 +36900,7 @@ /area/maintenance/starboard/aft) "lmr" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -36968,11 +36919,8 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/catwalk_floor, /area/ai_monitored/turret_protected/aisat_interior) @@ -36981,17 +36929,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "lmL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/holopad, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ @@ -37001,12 +36949,12 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "lna" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -37020,31 +36968,22 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"lnp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "lns" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "atmos"; name = "Atmospherics Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "lnB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -37073,8 +37012,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -37090,16 +37029,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"loh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "lom" = ( /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; @@ -37111,10 +37040,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -37132,8 +37061,8 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/bar/atrium) "lpu" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -37144,7 +37073,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/white, @@ -37164,10 +37093,10 @@ /area/hallway/secondary/entry) "lqk" = ( /mob/living/carbon/monkey, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/freezer, @@ -37219,12 +37148,6 @@ /turf/open/floor/plating, /area/maintenance/central) "lrz" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_x = -32 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/security/brig) "lrH" = ( @@ -37272,10 +37195,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -37356,10 +37279,10 @@ name = "Cell 3" }, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "lvx" = ( @@ -37367,7 +37290,7 @@ name = "MiniSat Maintenance"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -37388,8 +37311,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -37432,7 +37355,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "lwA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -37441,7 +37364,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -37467,7 +37390,7 @@ /turf/open/floor/iron, /area/security/brig) "lxF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/siding/wood, @@ -37489,10 +37412,10 @@ icon_state = "2-8" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -37538,10 +37461,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "lzr" = ( @@ -37564,8 +37487,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) "lzP" = ( @@ -37597,16 +37520,16 @@ /obj/effect/turf_decal/pool/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/crew_quarters/fitness) "lAJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Unisex Showers" @@ -37618,8 +37541,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -37651,10 +37574,10 @@ "lBv" = ( /obj/structure/bed/roller, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, @@ -37667,10 +37590,10 @@ /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "lBC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -37717,20 +37640,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "lCw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -37759,16 +37682,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "lDj" = ( @@ -37787,10 +37700,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison/dark, @@ -37803,7 +37716,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "lDO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -37825,8 +37738,8 @@ /turf/open/floor/carpet/blue, /area/bridge/meeting_room) "lEP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -37835,13 +37748,13 @@ /turf/open/floor/iron/white/side, /area/science/research) "lEW" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/machinery/meter, /turf/open/floor/iron, /area/science/mixing) "lFc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/iron, @@ -37867,10 +37780,10 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) "lFJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -37898,10 +37811,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -37944,10 +37857,10 @@ /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) "lHY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -37996,7 +37909,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -38029,13 +37942,10 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 2" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "lKT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow, @@ -38094,23 +38004,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "lMB" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/plating, +/area/maintenance/port/aft) "lMP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38129,9 +38037,6 @@ "lMW" = ( /obj/machinery/light/small, /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "lMZ" = ( @@ -38145,11 +38050,11 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "lNf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -38162,6 +38067,16 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"lNx" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "lNE" = ( /obj/machinery/status_display/shuttle{ pixel_y = -32 @@ -38170,11 +38085,14 @@ /turf/open/floor/wood, /area/vacant_room/office) "lOa" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "lOe" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -38201,21 +38119,22 @@ /turf/open/floor/iron, /area/ai_monitored/security/armory) "lPN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/main) "lQb" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/quartermaster/office) "lQd" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; @@ -38225,10 +38144,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -38255,10 +38174,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/item/radio/intercom{ @@ -38281,21 +38200,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/port/aft) "lSa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/maintenance/starboard/aft) "lSd" = ( @@ -38306,12 +38220,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -38328,7 +38236,7 @@ /area/crew_quarters/heads/captain) "lTm" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -38349,10 +38257,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/junction{ dir = 1 }, @@ -38362,8 +38270,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -38404,10 +38312,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -38455,19 +38363,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard) "lXQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -38486,10 +38394,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -38542,10 +38450,10 @@ /turf/open/floor/iron/dark, /area/bridge) "mat" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/circuit, @@ -38592,17 +38500,17 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/prison, /area/security/prison) "mcn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -38617,27 +38525,27 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/janitor) "mcV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "mde" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -38648,23 +38556,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/quartermaster/qm) "mdE" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/port/fore) "mdH" = ( @@ -38675,10 +38575,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -38687,10 +38587,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -38720,7 +38620,7 @@ /area/ai_monitored/turret_protected/aisat/service) "mfn" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/plating, /area/engine/atmos) "mfX" = ( @@ -38729,8 +38629,8 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "mgd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -38828,7 +38728,7 @@ /area/engine/gravity_generator) "mig" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron, @@ -38878,7 +38778,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -38958,10 +38858,10 @@ dir = 1 }, /obj/structure/railing, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light/small, @@ -38973,11 +38873,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -39016,10 +38916,10 @@ name = "Auxillary Base Construction"; req_one_access_txt = "72" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -39057,9 +38957,6 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "mmR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -39073,10 +38970,10 @@ name = "MiniSat Atmospherics"; req_one_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -39090,10 +38987,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "mnE" = ( @@ -39104,13 +39001,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -39128,7 +39025,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -39141,8 +39038,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "moo" = ( @@ -39162,10 +39059,10 @@ /turf/open/floor/iron/dark, /area/security/main) "moB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -39180,6 +39077,7 @@ name = "Supermatter Engine Room"; req_access_txt = "10" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/engine/engineering) "mpr" = ( @@ -39189,12 +39087,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "mpC" = ( @@ -39204,10 +39096,10 @@ /turf/open/floor/iron, /area/quartermaster/miningdock) "mpK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -39241,10 +39133,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -39269,22 +39161,20 @@ pixel_x = -6; pixel_y = 26 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white/corner{ dir = 1 }, /area/hallway/secondary/exit) "msB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/iron/white, +/area/science/xenobiology) "msG" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -39313,13 +39203,17 @@ /turf/open/floor/wood, /area/security/detectives_office) "msW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "msY" = ( /obj/structure/closet/emcloset, @@ -39366,8 +39260,8 @@ /turf/open/floor/iron/dark, /area/security/warden) "mtD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -39480,10 +39374,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "myL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -39517,12 +39411,9 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "mzC" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/construction/mining/aux_base) "mzV" = ( /obj/effect/turf_decal/trimline/white/line, /obj/effect/turf_decal/trimline/dark_red/line{ @@ -39531,10 +39422,10 @@ /turf/open/floor/wood/big, /area/maintenance/aft) "mAa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -39600,23 +39491,21 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/mixing) "mBa" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -39648,11 +39537,16 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4; - name = "Output to Waste" +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "mBz" = ( /obj/effect/turf_decal/stripes/line{ @@ -39661,11 +39555,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/cable/yellow, -/obj/machinery/camera/directional/east, -/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron, -/area/science/mixing/chamber) +/area/science/mixing) "mBG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39674,11 +39565,15 @@ dir = 8; name = "Gas to Cooling Loop" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "mBL" = ( /obj/item/screwdriver{ @@ -39691,14 +39586,6 @@ /turf/open/floor/iron, /area/security/checkpoint/science) "mCd" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/fore) "mCl" = ( @@ -39745,10 +39632,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/port) "mCH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/carpet/green, @@ -39760,20 +39650,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, /area/engine/engineering) "mDD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -39782,8 +39672,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "mDJ" = ( @@ -39798,24 +39688,18 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics/garden) +"mDY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "mEb" = ( /obj/machinery/gravity_generator/main/station, /obj/effect/turf_decal/bot_white, /turf/open/floor/engine/light, /area/engine/gravity_generator) -"mEd" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/entry) "mEz" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/filingcabinet/chestdrawer, @@ -39838,7 +39722,6 @@ /turf/open/floor/iron, /area/hydroponics) "mFg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/light{ dir = 1 }, @@ -39852,7 +39735,7 @@ /area/security/brig) "mFR" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /turf/open/space, @@ -39866,23 +39749,15 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "mGj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat_interior) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/port) "mGw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39910,10 +39785,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -39935,7 +39810,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/storage/tech) "mGS" = ( @@ -39961,7 +39836,7 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "mIb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/firealarm{ @@ -39971,17 +39846,14 @@ /turf/open/floor/iron, /area/engine/atmos) "mIQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "mIZ" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -39994,10 +39866,10 @@ /area/science/mixing) "mJp" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "mJF" = ( @@ -40014,20 +39886,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/security/checkpoint/science) "mJS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -40036,10 +39908,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/airalarm/server{ - pixel_x = -22; - dir = 8 - }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/iron/dark/telecomms, /area/science/server) "mKG" = ( @@ -40066,6 +39935,12 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"mKN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "mKP" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -40084,7 +39959,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "mLU" = ( @@ -40097,17 +39971,13 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "mMM" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "mMT" = ( /obj/machinery/camera/directional/north{ c_tag = "MiniSat AI Chamber South" @@ -40137,14 +40007,14 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/dorms) "mNs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -40158,7 +40028,10 @@ /turf/open/floor/iron, /area/engine/engineering) "mNB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -40190,29 +40063,26 @@ /turf/open/floor/iron/white, /area/security/brig) "mOi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "mOt" = ( /obj/effect/landmark/start/head_of_security, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "mOX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/firealarm/directional/north, @@ -40234,8 +40104,8 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "mPn" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -40247,10 +40117,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "mPO" = ( @@ -40290,10 +40160,10 @@ /turf/open/floor/iron/dark, /area/security/warden) "mQw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -40312,8 +40182,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -40450,10 +40320,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/aft) "mUj" = ( @@ -40463,11 +40333,23 @@ }, /turf/open/floor/iron, /area/science/mixing) +"mUP" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/entry) "mUU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -40492,13 +40374,13 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_x = 8; pixel_y = 24 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "mVs" = ( @@ -40510,10 +40392,10 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "mVI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -40535,10 +40417,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -40572,11 +40454,13 @@ /turf/open/floor/iron, /area/hallway/primary/central) "mXg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "mXi" = ( /obj/machinery/door/window{ @@ -40621,8 +40505,8 @@ /obj/machinery/door/airlock/mining{ req_access_txt = "48" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -40675,15 +40559,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "mYL" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -40696,10 +40580,10 @@ /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -40742,10 +40626,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40772,10 +40656,10 @@ /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "mZL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -40810,10 +40694,10 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "naN" = ( @@ -40821,8 +40705,8 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -40844,8 +40728,8 @@ /area/ai_monitored/storage/eva) "nbF" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -40867,7 +40751,7 @@ /area/crew_quarters/bar/atrium) "ncy" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -40877,10 +40761,10 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "ncJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/white, @@ -40895,7 +40779,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/arrows{ @@ -40913,6 +40797,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "ndg" = ( @@ -40920,7 +40810,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -40933,10 +40823,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "ndv" = ( @@ -40978,10 +40868,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -41050,7 +40940,7 @@ "neL" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "nfd" = ( @@ -41084,10 +40974,8 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/cable{ icon_state = "0-8" }, @@ -41099,8 +40987,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -41110,7 +40998,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/white, @@ -41119,8 +41007,8 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "nhM" = ( @@ -41146,19 +41034,16 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "niE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/entry) "niG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -41169,10 +41054,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "njw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -41217,10 +41102,10 @@ /area/bridge/meeting_room) "nkq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) "nkv" = ( @@ -41292,10 +41177,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -41305,6 +41190,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/office) "nlS" = ( @@ -41322,7 +41213,7 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/engine, /area/science/mixing/chamber) "nmA" = ( @@ -41368,15 +41259,10 @@ }, /area/chapel/main) "nnz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/crew_quarters/locker) "nnM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -41424,10 +41310,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/checker, @@ -41436,11 +41322,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -41477,10 +41363,10 @@ /turf/open/floor/iron, /area/science/robotics/lab) "npc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "npm" = ( @@ -41518,10 +41404,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -41541,10 +41427,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41553,28 +41439,26 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "nqH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/warden) "nqI" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, -/area/hallway/primary/port) +/area/hallway/primary/central) "nrr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -41591,8 +41475,8 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -41644,7 +41528,7 @@ /obj/structure/sign/warning/fire{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply{ dir = 4 }, /turf/open/floor/engine, @@ -41668,8 +41552,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -41706,7 +41590,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/arrows, @@ -41721,22 +41605,22 @@ "nup" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/grimy, /area/crew_quarters/bar) "nux" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/poddoor/preopen{ @@ -41755,10 +41639,10 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/freezer, @@ -41792,10 +41676,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -41821,10 +41705,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -41856,21 +41740,18 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) "nxu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/iron, -/area/quartermaster/miningdock) +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat_interior) "nxv" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/window/reinforced{ @@ -41940,10 +41821,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/hallway/secondary/command) @@ -41954,7 +41835,7 @@ /turf/open/floor/carpet/blue, /area/bridge/meeting_room) "nzC" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -41966,10 +41847,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -41982,7 +41863,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -41991,16 +41872,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "nBo" = ( @@ -42024,8 +41895,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -42034,7 +41905,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/siding/wood/corner, @@ -42057,11 +41928,11 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "nCx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -42137,10 +42008,10 @@ /area/engine/engineering) "nDi" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -42164,11 +42035,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "nDK" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted{ @@ -42212,10 +42087,10 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "nEl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -42228,11 +42103,11 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "nEx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron/dark, /area/security/brig) @@ -42268,10 +42143,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /mob/living/simple_animal/bot/secbot/beepsky{ @@ -42283,10 +42158,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -42357,8 +42232,8 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "nGk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -42370,22 +42245,32 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "nGz" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "nGC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -42409,6 +42294,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/science/explab) +"nHE" = ( +/obj/machinery/power/apc/auto_name/directional/west{ + areastring = "/area/science/mixing/chamber" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/mixing) "nHV" = ( /obj/machinery/light/small{ dir = 1 @@ -42446,19 +42343,19 @@ /turf/open/floor/iron, /area/hallway/primary/central) "nIQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/medical/morgue) "nJl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -42493,7 +42390,7 @@ /turf/open/floor/iron/white, /area/security/brig) "nKg" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -42519,20 +42416,14 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/storage/art) -"nKI" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "nKL" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -42568,10 +42459,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -42606,8 +42497,6 @@ dir = 8 }, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/computer/cargo{ dir = 4 }, @@ -42636,7 +42525,7 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -42645,6 +42534,13 @@ }, /turf/open/floor/iron, /area/security/brig) +"nNf" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/space, +/area/space/nearstation) "nNg" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -42658,7 +42554,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -42681,8 +42577,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -42732,10 +42628,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -42766,23 +42662,15 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "nPi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/catwalk_floor, -/area/maintenance/starboard/aft) +/turf/open/floor/iron, +/area/hallway/primary/central) "nPq" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/light{ @@ -42794,10 +42682,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -42836,10 +42724,10 @@ /turf/open/floor/iron, /area/ai_monitored/security/armory) "nQK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -42851,10 +42739,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -42887,7 +42775,7 @@ /area/hallway/secondary/entry) "nRu" = ( /obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -42901,20 +42789,20 @@ /area/medical/chemistry) "nRF" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2, /turf/open/space, /area/space/nearstation) "nRK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/green/opposingcorners, @@ -42936,7 +42824,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -42945,8 +42833,8 @@ /turf/open/floor/iron, /area/hydroponics) "nSq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -42968,10 +42856,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -43029,20 +42917,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/quartermaster/qm) "nTj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -43052,6 +42940,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "nTI" = ( @@ -43134,6 +43025,11 @@ /obj/structure/table/wood, /turf/open/floor/carpet/grimy, /area/vacant_room/office) +"nUH" = ( +/obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "nVi" = ( /obj/machinery/light{ dir = 4 @@ -43147,10 +43043,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -43181,10 +43077,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "nWl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -43217,7 +43113,7 @@ /turf/open/floor/iron, /area/science/mixing) "nWU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/green, @@ -43226,9 +43122,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/primary/central) "nWY" = ( @@ -43245,13 +43138,16 @@ /area/medical/surgery) "nXc" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "nXi" = ( /obj/effect/decal/cleanable/dirt, @@ -43318,10 +43214,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "nYQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -43334,7 +43230,7 @@ name = "Gateway Access"; req_access_txt = "62" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -43369,17 +43265,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/virology) "nZs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -43392,10 +43288,10 @@ /turf/open/floor/iron/white, /area/medical/surgery) "nZz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "oax" = ( @@ -43429,16 +43325,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, /turf/open/floor/catwalk_floor, /area/maintenance/fore/secondary) "obv" = ( @@ -43451,20 +43337,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/port) "obO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -43484,10 +43372,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -43531,7 +43419,7 @@ /turf/open/floor/prison, /area/security/prison) "odz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -43548,7 +43436,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -43558,7 +43446,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/tech) "oed" = ( @@ -43568,10 +43456,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -43581,9 +43469,6 @@ /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/construction/mining/aux_base) @@ -43632,33 +43517,33 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "ofK" = ( /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ofL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -43670,7 +43555,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating{ @@ -43705,7 +43590,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "ogQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/cafeteria_red, @@ -43735,10 +43620,10 @@ id_tag = "Dorm3"; name = "Dorm 3" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -43751,10 +43636,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "ohL" = ( @@ -43786,13 +43671,13 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "ojH" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/medical/cryo) @@ -43808,7 +43693,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "okf" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 5 }, /turf/open/space/basic, @@ -43859,10 +43744,10 @@ /obj/structure/railing/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -43899,18 +43784,18 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "onS" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -43924,13 +43809,12 @@ /obj/item/gavelhammer, /turf/open/floor/iron, /area/security/courtroom) -"ool" = ( -/obj/effect/turf_decal/stripes/line{ +"onU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/hallway/primary/central) "oon" = ( /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/iron/freezer, @@ -44010,10 +43894,10 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "opv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44031,25 +43915,32 @@ }, /turf/open/floor/iron/white, /area/medical/patients_rooms) +"opw" = ( +/obj/structure/closet/firecloset, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "opC" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/landmark/blobstart, /turf/open/floor/iron/dark, /area/security/main) "opQ" = ( -/obj/machinery/computer/atmos_control/tank/mix_tank{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) "oqq" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -44067,7 +43958,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -44086,10 +43977,10 @@ /turf/open/floor/iron, /area/quartermaster/sorting) "org" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -44107,14 +43998,14 @@ /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "orR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "orW" = ( @@ -44143,8 +44034,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light{ dir = 4 }, @@ -44191,10 +44082,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -44208,10 +44099,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "otK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -44239,10 +44130,10 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "ouu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -44270,10 +44161,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -44314,7 +44205,7 @@ location = "Tool Storage" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "ovY" = ( @@ -44371,10 +44262,10 @@ /turf/open/floor/iron, /area/quartermaster/qm) "oxh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -44383,10 +44274,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -44399,46 +44290,37 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oyM" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) "oyU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "ozl" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, /area/science/mixing/chamber) -"ozo" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_x = 32 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/security/brig) "ozs" = ( /obj/structure/table/glass, /obj/item/storage/fancy/candle_box, @@ -44462,10 +44344,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -44480,15 +44362,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "ozK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -44497,8 +44377,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "ozR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/landmark/event_spawn, @@ -44533,10 +44413,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -44552,7 +44432,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "oBj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -44567,16 +44447,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) "oBM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/meter, @@ -44591,7 +44471,7 @@ /area/science/robotics/lab) "oCA" = ( /obj/structure/chair/foldable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -44610,10 +44490,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light/small{ @@ -44623,7 +44503,7 @@ /area/security/prison) "oDb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /turf/open/floor/iron/dark/textured_large, @@ -44633,10 +44513,10 @@ /turf/open/floor/plating, /area/engine/engineering) "oDS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/grimy, /area/chapel/office) @@ -44730,10 +44610,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "oGT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/white, @@ -44774,10 +44654,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -44792,12 +44672,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "oIT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/white/opposingcorners, /obj/effect/turf_decal/tile/white{ dir = 4 @@ -44818,10 +44697,10 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "oJk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -44833,10 +44712,10 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -44845,10 +44724,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -44858,7 +44737,7 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "oJI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -44896,8 +44775,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -44910,7 +44789,7 @@ name = "Engineering External Access"; req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/engine/engineering) "oKv" = ( @@ -44947,15 +44826,10 @@ req_access_txt = "32" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor, /turf/open/floor/wood, /area/vacant_room/office) "oLg" = ( @@ -44996,7 +44870,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "oMw" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -45017,7 +44891,7 @@ /area/science/nanite) "oNw" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "oNL" = ( @@ -45028,32 +44902,29 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, /area/science/robotics/lab) "oNS" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "oOk" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -45065,10 +44936,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -45078,7 +44949,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -45116,10 +44987,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -45153,10 +45024,10 @@ /area/security/prison) "oPO" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -45175,10 +45046,10 @@ /area/crew_quarters/heads/chief) "oQN" = ( /obj/machinery/seed_extractor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/power/apc/auto_name/directional/north{ @@ -45190,10 +45061,7 @@ /turf/open/floor/iron, /area/hydroponics/garden) "oRo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -45203,6 +45071,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "oRK" = ( @@ -45218,8 +45089,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/engine/engineering) "oRM" = ( @@ -45227,8 +45096,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -45252,7 +45121,7 @@ /turf/closed/wall/r_wall, /area/maintenance/aft) "oSH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -45267,7 +45136,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 1 @@ -45282,10 +45150,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -45294,12 +45162,6 @@ /obj/structure/reflector/double/anchored{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "oTf" = ( @@ -45315,8 +45177,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "oTT" = ( @@ -45324,15 +45186,6 @@ /obj/structure/closet, /turf/open/floor/plating, /area/maintenance/aft) -"oTV" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/entry) "oUq" = ( /obj/machinery/atmospherics/components/trinary/filter{ dir = 8 @@ -45361,26 +45214,23 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, /area/security/brig) "oUQ" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/quartermaster/miningdock) "oUR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/checker, @@ -45390,13 +45240,13 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -45406,7 +45256,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/circuit/telecomms/mainframe, +/turf/open/floor/circuit/telecomms, /area/tcommsat/server) "oVg" = ( /obj/machinery/door/airlock/medical{ @@ -45424,16 +45274,23 @@ /turf/open/floor/iron/white, /area/medical/virology) "oVi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "oVr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard) "oVw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45441,10 +45298,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white/side{ @@ -45478,7 +45335,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark/side, /area/engine/atmos) "oXj" = ( @@ -45493,29 +45350,26 @@ name = "External Access"; req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/fore) "oXS" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) "oYm" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/plating, /area/engine/atmos) "oYy" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/color_adapter{ dir = 4 }, /turf/open/floor/plating, @@ -45541,9 +45395,6 @@ dir = 1 }, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/carpet, /area/hallway/secondary/entry) "oZC" = ( @@ -45649,6 +45500,12 @@ dir = 4 }, /obj/machinery/camera/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -45657,10 +45514,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -45669,7 +45526,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "pdt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -45685,10 +45542,10 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "pdL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45722,10 +45579,10 @@ /turf/open/floor/plating, /area/security/detectives_office) "pdT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -45756,10 +45613,10 @@ /turf/open/floor/iron, /area/crew_quarters/bar) "peP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45778,11 +45635,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -45816,25 +45673,23 @@ /turf/open/floor/wood, /area/library) "pfK" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "pgo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -45996,10 +45851,6 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "pkl" = ( @@ -46033,8 +45884,8 @@ /turf/open/floor/plating/rust, /area/maintenance/starboard/fore) "plr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "plw" = ( @@ -46048,7 +45899,7 @@ /turf/open/floor/iron, /area/crew_quarters/theatre/backstage) "pmc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -46065,10 +45916,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/carpet/blue, @@ -46077,10 +45928,10 @@ /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -46113,20 +45964,17 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "pnh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/open/floor/plating, +/area/maintenance/port/aft) "pnk" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitory" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -46140,7 +45988,7 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "pnq" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /obj/structure/disposalpipe/segment, @@ -46162,7 +46010,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/closet/l3closet/virology, @@ -46185,10 +46033,10 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -46239,10 +46087,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -46271,10 +46119,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, @@ -46304,8 +46152,8 @@ name = "Monkey Pen"; req_access_txt = "39" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -46330,7 +46178,7 @@ /turf/open/floor/iron/checker, /area/engine/break_room) "pqq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood{ broken = 1 }, @@ -46346,7 +46194,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -46355,7 +46203,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -46376,10 +46224,10 @@ dir = 1 }, /obj/structure/railing, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -46400,10 +46248,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -46416,7 +46264,7 @@ /area/crew_quarters/bar/atrium) "prI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron, @@ -46449,7 +46297,7 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "psk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -46496,10 +46344,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -46512,11 +46360,11 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "ptl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "AI Satelite Distro" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -46537,10 +46385,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -46557,7 +46405,7 @@ /turf/open/floor/plating, /area/crew_quarters/toilet) "puK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -46605,10 +46453,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -46620,27 +46468,27 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) "pwN" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space/basic, /area/space/nearstation) "pxn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -46650,10 +46498,10 @@ /turf/open/space/basic, /area/space) "pxz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -46683,19 +46531,16 @@ pixel_x = -32; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/open/floor/iron, /area/hallway/primary/central) "pxQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -46742,17 +46587,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/tcommsat/computer) "pyz" = ( @@ -46779,10 +46624,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/theatre/backstage) "pyS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/chair/fancy/bench/pew/right{ @@ -46798,10 +46643,10 @@ }, /obj/effect/landmark/xeno_spawn, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -46809,10 +46654,10 @@ "pzb" = ( /obj/machinery/door/firedoor, /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -46832,9 +46677,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/science/research) "pzq" = ( @@ -46861,10 +46707,10 @@ /area/security/checkpoint/medical) "pAd" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -46877,7 +46723,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/tech) "pAC" = ( @@ -46885,18 +46731,20 @@ /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "pAE" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "pBi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -46905,8 +46753,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -46917,16 +46765,16 @@ pixel_y = -2 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, /area/medical/morgue) "pBn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -46977,10 +46825,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -47046,13 +46894,9 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "pDB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/science/xenobiology) "pDJ" = ( /obj/machinery/requests_console{ department = "Science"; @@ -47070,7 +46914,7 @@ /turf/open/floor/iron, /area/science/lab) "pDK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -47079,7 +46923,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/explab) "pDL" = ( @@ -47133,10 +46977,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "pEU" = ( @@ -47170,6 +47014,13 @@ dir = 8 }, /area/teleporter) +"pFT" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "pGq" = ( /obj/machinery/light{ dir = 8 @@ -47195,10 +47046,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "pGz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/purple, @@ -47232,8 +47083,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -47258,10 +47109,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -47283,8 +47134,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "pIp" = ( @@ -47340,8 +47191,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison, @@ -47352,8 +47203,8 @@ /turf/open/floor/iron/dark, /area/bridge) "pJi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -47367,10 +47218,10 @@ /area/hallway/primary/central) "pJA" = ( /obj/effect/spawner/xmastree, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -47397,10 +47248,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/light, @@ -47418,10 +47269,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "pKm" = ( @@ -47476,8 +47327,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail{ @@ -47509,10 +47360,10 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "pMj" = ( @@ -47529,16 +47380,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "pNe" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron, /area/quartermaster/miningdock) "pNh" = ( /obj/structure/railing, @@ -47568,7 +47413,7 @@ /turf/open/floor/wood, /area/medical/break_room) "pNZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/iron/dark/side{ @@ -47600,20 +47445,20 @@ req_access_txt = "39"; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/virology) "pOq" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -47641,10 +47486,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -47654,11 +47499,11 @@ /turf/open/floor/plating, /area/engine/engineering) "pPG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -47782,16 +47627,16 @@ dir = 4 }, /obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/virology) "pSV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -47800,10 +47645,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "pSX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -47813,25 +47658,25 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard/aft) "pTd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/patients_rooms) "pTk" = ( @@ -47847,10 +47692,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/junction, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -47881,10 +47726,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -47893,10 +47738,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -47920,7 +47765,7 @@ /turf/open/floor/iron/dark, /area/chapel/main) "pVO" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, @@ -47937,8 +47782,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -48005,14 +47850,15 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "pXm" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "pXG" = ( /obj/machinery/airalarm/directional/south{ @@ -48088,7 +47934,7 @@ }, /area/engine/atmos) "pYE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/cafeteria, @@ -48102,10 +47948,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -48129,7 +47975,7 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "pZJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -48140,10 +47986,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -48228,11 +48074,11 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -48256,6 +48102,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white/corner, /area/hallway/secondary/exit) "qcS" = ( @@ -48327,10 +48174,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "qgs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -48366,12 +48213,12 @@ /obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "qho" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/bot_white, @@ -48392,10 +48239,10 @@ req_access_txt = "49" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -48431,24 +48278,33 @@ /obj/effect/turf_decal/tile/dark_blue, /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) +"qiF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "qiH" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/opposingcorners, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/maintenance/starboard/fore) "qiN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -48468,8 +48324,8 @@ /turf/open/floor/iron/dark, /area/bridge) "qjl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48487,14 +48343,14 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "qkh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -48535,10 +48391,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48546,8 +48402,8 @@ /area/security/brig) "qlI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/east, @@ -48555,10 +48411,10 @@ /turf/open/floor/iron/dark, /area/chapel/office) "qlP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/white/side{ @@ -48571,7 +48427,7 @@ /area/maintenance/solars/starboard/fore) "qmj" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /turf/open/floor/iron, /area/engine/atmos) "qmr" = ( @@ -48580,8 +48436,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -48592,8 +48448,8 @@ name = "Medbay Storage"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ @@ -48650,10 +48506,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -48702,10 +48558,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/white, @@ -48731,15 +48587,15 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "qpi" = ( @@ -48765,10 +48621,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -48786,18 +48642,12 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance"; - req_access_txt = "10; 13" - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance"; + req_access_txt = "10; 13" }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) @@ -48822,13 +48672,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -48837,19 +48687,19 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, /area/quartermaster/qm) "qrt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -48863,7 +48713,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/supply, /turf/open/floor/plating, /area/maintenance/port) "qrL" = ( @@ -48944,10 +48794,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -48963,6 +48813,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/camera/directional/east, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "qtK" = ( @@ -48993,7 +48844,7 @@ /area/hallway/secondary/command) "quz" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ dir = 4 }, /obj/machinery/light/small{ @@ -49012,9 +48863,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "quT" = ( @@ -49033,7 +48881,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "qvO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -49050,10 +48898,10 @@ /turf/open/floor/iron, /area/security/checkpoint/auxiliary) "qvT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -49106,10 +48954,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -49121,7 +48969,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -49137,10 +48985,10 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "qxh" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "qxL" = ( @@ -49179,21 +49027,12 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "qyd" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) @@ -49224,10 +49063,10 @@ /turf/open/floor/iron/white, /area/medical/genetics) "qyK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -49243,8 +49082,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -49262,10 +49101,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "qzT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -49280,10 +49119,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -49292,10 +49131,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/airalarm/directional/north, @@ -49327,7 +49166,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/spray/cleaner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/light{ @@ -49350,6 +49189,12 @@ }, /turf/open/floor/carpet, /area/crew_quarters/theatre) +"qBp" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/main) "qBA" = ( /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 @@ -49391,10 +49236,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/carpet/grimy, @@ -49403,22 +49248,22 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, /area/maintenance/starboard) "qCA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -49428,12 +49273,13 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "qCJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qCO" = ( @@ -49468,7 +49314,7 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -49487,14 +49333,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) +"qEI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "qEK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -49505,8 +49360,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "qFi" = ( @@ -49551,14 +49406,22 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "qFL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/security/brig) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "qFV" = ( /obj/structure/table, /obj/item/clipboard, @@ -49574,12 +49437,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "qGo" = ( @@ -49630,10 +49488,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ name = "Service Maintenance"; req_one_access_txt = "12;25;26;35;28;22;37;46;38" @@ -49641,10 +49499,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "qIg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -49656,7 +49514,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -49670,10 +49528,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -49692,10 +49550,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -49705,8 +49563,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/public/glass{ @@ -49717,15 +49575,14 @@ /turf/open/floor/iron, /area/storage/tools) "qJv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/engine/engineering) "qJw" = ( /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ @@ -49755,10 +49612,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -49779,10 +49636,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -49823,24 +49680,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron, /area/quartermaster/miningdock) "qLU" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; - req_access_txt = "10" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, +/turf/open/floor/iron/dark, /area/engine/engineering) "qLW" = ( /obj/structure/window/reinforced{ @@ -49886,8 +49738,8 @@ name = "Garden Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -49919,21 +49771,21 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "qMR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/orange/visible{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "qNw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -49960,12 +49812,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"qOj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron, -/area/quartermaster/exploration_dock) "qOk" = ( /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness) @@ -49996,12 +49842,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "qPv" = ( @@ -50013,7 +49853,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "qPz" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space/basic, @@ -50023,7 +49863,7 @@ /turf/open/floor/iron, /area/engine/engineering) "qPE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/computer/security/telescreen/minisat{ @@ -50038,11 +49878,11 @@ /area/medical/genetics/cloning) "qPT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -50077,13 +49917,13 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "qRO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50132,7 +49972,7 @@ /area/medical/medbay/lobby) "qSv" = ( /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -50156,10 +49996,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -50169,7 +50009,7 @@ /area/crew_quarters/theatre/backstage) "qTo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/plasma{ +/obj/machinery/atmospherics/components/tank/plasma{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -50191,10 +50031,10 @@ /turf/open/floor/iron/white, /area/science/explab) "qTN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "qUb" = ( @@ -50217,10 +50057,10 @@ /turf/open/floor/iron/white, /area/medical/surgery) "qUm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -50233,7 +50073,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "qUr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/machinery/meter, @@ -50252,10 +50092,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -50264,10 +50104,10 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "qVj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50284,10 +50124,7 @@ req_access_txt = "10; 13" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -50299,12 +50136,6 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "qVP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/machinery/light_switch{ pixel_x = -23; pixel_y = 26 @@ -50316,10 +50147,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "qWr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -50367,7 +50198,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -50398,10 +50229,10 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "qXk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -50434,7 +50265,7 @@ /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "qXP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/effect/spawner/structure/window/reinforced, @@ -50467,8 +50298,8 @@ name = "Research Division Access"; req_access_txt = "47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -50478,21 +50309,21 @@ /turf/open/floor/iron/white, /area/science/research) "qYN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "qZd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "qZE" = ( @@ -50508,8 +50339,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/virology) @@ -50521,10 +50352,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -50552,8 +50383,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -50580,10 +50411,10 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "rbK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -50602,10 +50433,10 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) "rbT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50621,23 +50452,17 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/security/brig) -"rcc" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/atmos) "rcg" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/grunge{ @@ -50661,10 +50486,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -50687,7 +50512,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -50702,10 +50527,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -50730,10 +50555,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "rdu" = ( @@ -50747,7 +50572,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -50801,20 +50626,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "ren" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -50830,10 +50655,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -50851,7 +50676,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -50920,10 +50745,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -50964,10 +50789,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -50983,7 +50808,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -51002,15 +50827,15 @@ codes_txt = "patrol;next_patrol=CHW"; location = "Lockers" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/port) "rgY" = ( @@ -51049,7 +50874,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "rhu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -51082,10 +50907,10 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "rhI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -51132,10 +50957,10 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -51162,12 +50987,9 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_dock) "riU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "rjl" = ( @@ -51198,7 +51020,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/carpet/royalblue, @@ -51234,7 +51056,7 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -51243,27 +51065,27 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rls" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/engine/break_room) "rlB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -51291,8 +51113,18 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) +"rme" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "rmh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/green, @@ -51320,10 +51152,10 @@ /area/ai_monitored/turret_protected/ai_upload) "rmD" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "rmG" = ( @@ -51345,7 +51177,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -51358,13 +51190,18 @@ codes_txt = "patrol;next_patrol=QM"; location = "CHW" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "rng" = ( @@ -51372,8 +51209,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -51393,30 +51230,35 @@ name = "Cell 1" }, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison/dark, /area/security/prison) "rnF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/hallway/primary/port) "rnL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, /area/engine/engineering) "rnM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/rack, /obj/item/wrench, /obj/item/crowbar/red, /obj/item/clothing/head/utility/welding, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "rnU" = ( @@ -51433,6 +51275,15 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"roT" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "roW" = ( /obj/effect/turf_decal/tile/white{ dir = 1 @@ -51446,10 +51297,11 @@ "rpg" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/mixing) "rpN" = ( @@ -51472,14 +51324,14 @@ /area/teleporter) "rqE" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/space/basic, /area/space/nearstation) "rqG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -51489,9 +51341,6 @@ /area/maintenance/port/aft) "rqJ" = ( /obj/structure/chair/fancy/comfy, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/carpet, /area/hallway/secondary/entry) "rqS" = ( @@ -51508,10 +51357,10 @@ name = "Locker Room Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51567,8 +51416,8 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) "rrR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "rrX" = ( @@ -51582,10 +51431,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "rsd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -51608,18 +51457,18 @@ /turf/open/floor/iron, /area/engine/atmos) "rsl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "rsz" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -51646,7 +51495,7 @@ /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "rsU" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -51694,10 +51543,10 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -51762,10 +51611,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "rtN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "rtT" = ( @@ -51783,14 +51632,14 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "rtY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) "ruo" = ( @@ -51808,7 +51657,7 @@ /area/crew_quarters/kitchen) "ruF" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -51817,8 +51666,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -51842,10 +51691,10 @@ name = "Power Storage"; req_access_txt = "11" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/structure/cable{ icon_state = "1-2" @@ -51856,8 +51705,11 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/wood, /area/vacant_room/office) @@ -51884,7 +51736,7 @@ /area/crew_quarters/heads/hop) "rwl" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -51899,10 +51751,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "rwW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -51924,7 +51776,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rxf" = ( @@ -51953,33 +51805,30 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "rxO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, /area/science/mixing) "rxR" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron, -/area/crew_quarters/locker) +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "rya" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -52022,10 +51871,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/button/door{ @@ -52055,12 +51904,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "rzF" = ( @@ -52071,13 +51914,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit) "rAe" = ( @@ -52098,7 +51939,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /turf/open/floor/iron/dark/textured_large, @@ -52111,10 +51952,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/sign/warning/electricshock{ pixel_x = -32; @@ -52132,13 +51973,13 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -52147,18 +51988,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/dark, /area/medical/storage) "rCK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -52167,6 +52005,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -52175,18 +52016,18 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "rDe" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space/basic, @@ -52195,8 +52036,8 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -52221,10 +52062,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/execution/transfer) "rDZ" = ( @@ -52244,10 +52085,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -52265,8 +52106,8 @@ /area/crew_quarters/locker) "rEX" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -52315,8 +52156,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -52343,10 +52184,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -52358,10 +52199,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -52380,16 +52221,25 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white/side{ dir = 5 }, /area/science/research) +"rGV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "rHa" = ( /obj/structure/sign/plaques/kiddie{ pixel_y = 32 @@ -52397,10 +52247,10 @@ /obj/machinery/camera/directional/north{ c_tag = "AI Upload Chamber - Fore" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/circuit, @@ -52415,20 +52265,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"rHo" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, -/area/engine/engineering) "rHq" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/lavendergrass, @@ -52439,10 +52275,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -52486,9 +52322,6 @@ target_pressure = 500 }, /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -52502,10 +52335,10 @@ name = "Psychologist" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -52517,10 +52350,10 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Air to Mix" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -52532,10 +52365,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -52545,7 +52378,7 @@ /area/maintenance/aft) "rJf" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -52560,6 +52393,10 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/research) "rJL" = ( @@ -52582,9 +52419,6 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /turf/open/floor/iron/white/side{ dir = 5 }, @@ -52604,9 +52438,6 @@ name = "Supply Dock Airlock"; req_access_txt = "31" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/quartermaster/storage) "rLd" = ( @@ -52663,8 +52494,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -52682,7 +52513,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -52709,7 +52540,7 @@ /turf/open/floor/plating, /area/security/prison) "rMC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/chapel/main) "rMF" = ( @@ -52740,10 +52571,10 @@ /area/security/brig) "rNa" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -52760,10 +52591,10 @@ name = "MiniSat Service Bay"; req_one_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -52804,17 +52635,11 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "rOm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -52822,6 +52647,15 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"rOv" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "rOJ" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; @@ -52844,13 +52678,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "rPl" = ( /obj/structure/table/wood, @@ -52886,8 +52724,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -52901,8 +52739,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "rQu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -52916,6 +52754,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"rQL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "rQV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -52929,12 +52772,6 @@ /area/bridge/meeting_room) "rQW" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "rQX" = ( @@ -52942,18 +52779,18 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "rRb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plating, /area/maintenance/port/aft) "rRi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -52980,23 +52817,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "rRH" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -53005,10 +52842,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -53017,12 +52854,14 @@ /turf/open/floor/iron/white, /area/science/research) "rRY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat/hallway) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit) "rSr" = ( /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/green/telecomms, @@ -53032,9 +52871,6 @@ pixel_x = 32 }, /obj/structure/closet/emcloset/anchored, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /turf/open/floor/plating, /area/engine/engineering) "rSQ" = ( @@ -53046,8 +52882,8 @@ /area/crew_quarters/bar/atrium) "rST" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) @@ -53065,7 +52901,7 @@ /area/crew_quarters/fitness) "rTt" = ( /obj/machinery/telecomms/bus/preset_four, -/turf/open/floor/circuit/green, +/turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "rTw" = ( /obj/structure/table, @@ -53134,12 +52970,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "rWC" = ( @@ -53181,10 +53011,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/green/opposingcorners, @@ -53198,7 +53028,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "rXD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -53207,8 +53037,8 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "rXI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -53226,8 +53056,8 @@ /area/hydroponics) "rYs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -53267,18 +53097,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, /turf/open/floor/plating, /area/maintenance/port) "rYO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -53294,10 +53124,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -53325,9 +53155,6 @@ pixel_y = -32 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/primary/central) "rZG" = ( @@ -53408,10 +53235,6 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "sbv" = ( @@ -53419,10 +53242,10 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/green, @@ -53431,8 +53254,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/firealarm/directional/west, @@ -53464,20 +53287,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "scX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -53487,10 +53307,10 @@ name = "Cargo Bay"; req_access_txt = "31" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -53498,9 +53318,6 @@ /area/quartermaster/storage) "sdl" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/aft) "sdq" = ( @@ -53517,8 +53334,8 @@ uses = 10 }, /mob/living/simple_animal/bot/secbot/pingsky, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "sdv" = ( @@ -53533,25 +53350,16 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "sdx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, -/area/hallway/primary/port) +/area/hallway/primary/central) "sdS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -53596,13 +53404,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "sgX" = ( @@ -53616,19 +53424,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron, /area/quartermaster/storage) "shL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -53639,10 +53447,10 @@ name = "MiniSat Access"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -53659,12 +53467,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "siP" = ( @@ -53703,10 +53505,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -53726,7 +53528,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -53792,7 +53594,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/virology) "sll" = ( @@ -53802,10 +53604,10 @@ /turf/open/floor/iron, /area/engine/atmos) "slr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -53817,8 +53619,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -53856,10 +53658,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -53871,10 +53673,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -53900,10 +53702,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -53935,10 +53737,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "spa" = ( @@ -53960,10 +53762,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "spg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -53977,13 +53779,11 @@ name = "Holding Area"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit) "spq" = ( @@ -54010,7 +53810,7 @@ /turf/open/floor/iron/dark, /area/teleporter) "spz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria_red, @@ -54058,10 +53858,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -54102,10 +53902,10 @@ /turf/open/floor/carpet, /area/vacant_room/office) "srf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -54147,10 +53947,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -54172,13 +53972,13 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/floor/plating, @@ -54225,12 +54025,6 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/fore/secondary) "svw" = ( @@ -54238,6 +54032,12 @@ codes_txt = "patrol;next_patrol=AIW"; location = "QM" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/central) "svA" = ( @@ -54255,19 +54055,19 @@ /area/library) "swv" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2, /turf/open/space, /area/space/nearstation) "swy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -54326,9 +54126,17 @@ /turf/open/floor/plating, /area/security/brig) "sxY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/aisat/hallway) "syd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, @@ -54346,10 +54154,10 @@ /turf/open/floor/wood, /area/lawoffice) "syz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -54373,10 +54181,10 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -54447,7 +54255,6 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay 4" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "sBr" = ( @@ -54483,10 +54290,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ name = "Testing Lab Maintenance"; req_access_txt = "47" @@ -54497,12 +54304,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "sBO" = ( @@ -54511,8 +54314,8 @@ /area/maintenance/starboard) "sBT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -54525,10 +54328,14 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "sCg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "sCh" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -54568,10 +54375,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "sCA" = ( @@ -54579,7 +54386,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/camera/directional/south, @@ -54601,7 +54408,7 @@ /turf/open/floor/wood/big, /area/maintenance/aft) "sCT" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) @@ -54675,10 +54482,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/telecomms, @@ -54700,10 +54507,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "sEy" = ( @@ -54727,10 +54534,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -54786,8 +54593,8 @@ name = "Warehouse Shutters" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -54813,16 +54620,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard/aft) "sGn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -54838,10 +54645,11 @@ /area/hallway/primary/starboard) "sGv" = ( /obj/machinery/telecomms/processor/preset_exploration, -/obj/machinery/airalarm/server{ +/obj/machinery/airalarm{ pixel_x = -22; dir = 8 }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/circuit/telecomms/server, /area/quartermaster/exploration_dock) "sGB" = ( @@ -54856,10 +54664,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -54871,10 +54679,10 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "sHa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/siding/wood, @@ -54888,22 +54696,22 @@ dir = 1 }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, /area/crew_quarters/theatre/backstage) "sHA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/blue, @@ -54917,7 +54725,7 @@ /area/medical/medbay/lobby) "sHM" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 10 }, /turf/open/space, @@ -54926,7 +54734,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -54960,8 +54768,8 @@ /area/security/prison) "sIM" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 10 }, /turf/open/space, @@ -54970,20 +54778,20 @@ /obj/effect/turf_decal/siding/wideplating_new/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "sIR" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/prison, /area/security/prison) @@ -54991,10 +54799,10 @@ /obj/machinery/door/window/brigdoor/westleft{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -55026,7 +54834,7 @@ /turf/open/floor/iron, /area/engine/break_room) "sJE" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55044,7 +54852,7 @@ req_one_access_txt = "1" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -55076,34 +54884,30 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "sKx" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "sKX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "sLc" = ( @@ -55118,16 +54922,17 @@ name = "Engine Room"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) "sLO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -55159,27 +54964,14 @@ }, /turf/open/floor/iron/white, /area/security/brig) -"sMw" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/quartermaster/storage) "sMQ" = ( /obj/effect/decal/cleanable/oil, /obj/item/cigbutt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -55191,17 +54983,21 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 }, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "sMZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -55223,9 +55019,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/miningdock) "sNL" = ( @@ -55273,10 +55066,10 @@ /turf/open/floor/iron, /area/security/prison) "sPc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -55285,7 +55078,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -55297,17 +55090,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "sPM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -55356,10 +55149,10 @@ /obj/machinery/door/airlock/public/glass{ name = "Cryogenic Lounge" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -55430,10 +55223,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "sQZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -55475,10 +55268,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison/dark, @@ -55490,10 +55283,10 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -55517,10 +55310,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -55571,9 +55364,7 @@ /area/crew_quarters/kitchen) "sTG" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/atmos) "sTK" = ( @@ -55597,14 +55388,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) @@ -55642,8 +55430,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "sVh" = ( @@ -55659,10 +55447,10 @@ name = "Bridge"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55732,7 +55520,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "sWO" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, @@ -55751,8 +55539,8 @@ /turf/open/floor/iron, /area/security/courtroom) "sXp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -55765,14 +55553,12 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "sXq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/port) +/area/engine/engineering) "sXV" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_x = -32 @@ -55790,10 +55576,11 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "sYx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "sYA" = ( @@ -55802,8 +55589,8 @@ /turf/open/floor/iron/dark, /area/bridge) "sYX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -55938,22 +55725,22 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/chemistry) "tct" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55972,8 +55759,8 @@ /turf/open/floor/plating, /area/security/brig) "tcO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56005,7 +55792,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -56032,15 +55819,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningdock) "tdq" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/plating, /area/engine/atmos) "tdv" = ( @@ -56063,23 +55849,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "tdQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/side{ dir = 8 }, /area/engine/atmos) "tdZ" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 5 }, /turf/open/space/basic, @@ -56138,13 +55924,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -56153,23 +55939,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/aft) "teH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "teR" = ( @@ -56186,10 +55972,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -56309,6 +56095,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) +"tgB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "tgG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56329,10 +56121,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/prison, @@ -56348,19 +56140,15 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "thW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/entry) "thX" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "tiU" = ( @@ -56369,10 +56157,7 @@ /turf/open/floor/iron/ridged/steel, /area/hydroponics) "tjd" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -56382,13 +56167,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/chemistry) "tjf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/green, @@ -56398,7 +56186,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -56459,22 +56247,16 @@ /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) "tlO" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/engine/engineering) "tlZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -56535,13 +56317,13 @@ }, /area/engine/atmos) "top" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/security/brig) "toq" = ( @@ -56571,6 +56353,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/grid, /area/medical/patients_rooms) "tpc" = ( @@ -56581,7 +56364,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "tpe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/circuit, @@ -56644,10 +56427,10 @@ /turf/closed/wall/r_wall, /area/maintenance/fore/secondary) "tqH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -56668,9 +56451,19 @@ /turf/open/floor/iron/dark, /area/bridge) "tqW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "trA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -56715,10 +56508,10 @@ /area/crew_quarters/bar/atrium) "tsb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -56737,10 +56530,10 @@ /area/medical/cryo) "tsJ" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 10 }, /turf/open/space, @@ -56797,10 +56590,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -56810,7 +56603,7 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/execution/transfer) "tud" = ( @@ -56838,10 +56631,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -56864,15 +56657,15 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, /turf/open/floor/iron, /area/hydroponics) "tuB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/carpet, /area/hallway/secondary/entry) @@ -56887,7 +56680,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "tvg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark/side, @@ -56899,10 +56692,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -56915,10 +56708,10 @@ /turf/open/floor/iron/white, /area/medical/surgery) "tvP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/carpet, @@ -56935,12 +56728,6 @@ req_access = null; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "twu" = ( @@ -56953,14 +56740,14 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) "twA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -56976,8 +56763,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/port) "twX" = ( @@ -56988,8 +56777,8 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "txw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -57035,7 +56824,7 @@ "tyj" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general, /turf/open/floor/plating, /area/maintenance/central) "tyn" = ( @@ -57055,10 +56844,10 @@ /area/crew_quarters/dorms) "tyr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -57070,7 +56859,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -57109,10 +56898,10 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -57121,10 +56910,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -57140,10 +56929,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -57198,7 +56987,7 @@ pixel_y = 10 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -57216,10 +57005,10 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "tAl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -57251,10 +57040,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -57267,16 +57056,8 @@ /turf/open/floor/grass, /area/hallway/secondary/command) "tAH" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/carpet, /area/hallway/secondary/entry) "tBb" = ( /obj/structure/table/reinforced, @@ -57318,10 +57099,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/prison, @@ -57361,24 +57142,24 @@ pixel_x = 29; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "tDe" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/machinery/camera/directional/north, /turf/open/floor/engine, /area/engine/engineering) "tDp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -57393,11 +57174,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "tDx" = ( /obj/effect/turf_decal/tile/green/half/contrasted, @@ -57427,8 +57214,6 @@ /obj/structure/rack, /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tEs" = ( @@ -57439,13 +57224,17 @@ dir = 4; sortType = 22 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "tEu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -57533,7 +57322,7 @@ "tFM" = ( /obj/machinery/camera/directional/east, /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/button/door{ @@ -57573,7 +57362,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -57586,7 +57375,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/circuit/telecomms/mainframe, +/turf/open/floor/circuit/telecomms, /area/tcommsat/server) "tGL" = ( /obj/structure/table/reinforced, @@ -57594,10 +57383,10 @@ /obj/item/stamp/chief_engineer, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -57627,25 +57416,36 @@ name = "Security Escape Airlock"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) +"tHi" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/mixing) "tHw" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, +/obj/machinery/portable_thermomachine, /turf/open/floor/iron/dark, /area/engine/atmos) "tHz" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -57659,6 +57459,15 @@ }, /turf/open/floor/prison, /area/security/prison) +"tHD" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "tHI" = ( /obj/machinery/button/door{ id = "chemistry_shutters"; @@ -57745,7 +57554,7 @@ /turf/closed/wall, /area/science/explab) "tIE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -57761,10 +57570,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -57792,15 +57601,12 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "tJF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) "tJL" = ( @@ -57814,8 +57620,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -57831,12 +57637,12 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "tKy" = ( /obj/structure/chair/fancy/sofa/old/right{ color = "#742925"; @@ -57849,10 +57655,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -57870,10 +57676,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/airalarm/server{ - pixel_x = -22; - dir = 8 - }, /turf/open/floor/circuit/telecomms, /area/tcommsat/server) "tLg" = ( @@ -57903,10 +57705,10 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -57964,10 +57766,10 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "tMe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -57986,10 +57788,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58027,8 +57829,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -58051,9 +57853,6 @@ name = "External Access"; req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "tOc" = ( @@ -58065,6 +57864,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"tOn" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/engine/supermatter) "tOI" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/grid, @@ -58089,10 +57892,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -58107,16 +57910,14 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "tPl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "tPs" = ( @@ -58125,7 +57926,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, /turf/open/floor/iron/dark/textured_large, @@ -58134,13 +57935,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "tPT" = ( @@ -58148,10 +57949,10 @@ name = "Chapel Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -58167,8 +57968,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -58187,8 +57988,8 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) "tRF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -58203,10 +58004,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -58233,6 +58034,7 @@ dir = 4 }, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "tSt" = ( @@ -58247,17 +58049,17 @@ /area/security/main) "tSH" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 4 }, /turf/open/space/basic, /area/space/nearstation) "tSO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -58380,8 +58182,8 @@ /turf/open/floor/prison, /area/security/prison) "tUw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -58449,7 +58251,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/purple, @@ -58463,10 +58265,10 @@ name = "Autopsy Room A"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -58483,14 +58285,15 @@ /turf/open/floor/iron/dark, /area/security/warden) "tXA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/iron/dark, +/area/security/brig) "tXO" = ( /obj/effect/turf_decal/pool{ dir = 1 @@ -58499,13 +58302,13 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "tXX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/bridge) "tYa" = ( @@ -58527,10 +58330,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "tYc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -58559,10 +58362,10 @@ /turf/open/floor/wood, /area/vacant_room/office) "tYI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, @@ -58572,7 +58375,7 @@ /turf/open/floor/prison, /area/security/prison) "tYJ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /obj/structure/lattice, @@ -58593,27 +58396,25 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) "tZZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, -/area/quartermaster/miningdock) +/area/hallway/secondary/entry) "uah" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -58649,10 +58450,10 @@ /turf/open/floor/iron, /area/security/brig) "uaC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -58677,7 +58478,7 @@ /area/science/nanite) "ubW" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -58693,10 +58494,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -58755,7 +58556,10 @@ /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) "uea" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "ueB" = ( @@ -58774,21 +58578,30 @@ /obj/machinery/camera/directional/north, /turf/open/space, /area/space/nearstation) +"ueT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "ufk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/fore) "ufu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/showroomfloor, @@ -58803,7 +58616,7 @@ /turf/open/floor/iron/dark, /area/bridge) "ufU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -58816,10 +58629,10 @@ /obj/item/radio/intercom{ pixel_y = 20 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -58831,16 +58644,16 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, /area/crew_quarters/locker) "ugl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison, @@ -58864,10 +58677,17 @@ /turf/open/floor/iron/dark, /area/bridge) "ugK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "ugU" = ( /obj/effect/turf_decal/siding/thinplating_new/corner{ @@ -58879,20 +58699,20 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "uht" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, /area/science/mixing) "uhz" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -58965,13 +58785,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "uiS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -58986,10 +58812,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -59023,10 +58849,10 @@ /turf/open/floor/iron/dark, /area/bridge) "ulq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -59052,10 +58878,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/fore) "ulM" = ( @@ -59100,28 +58922,19 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "unH" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron, /area/engine/engineering) "unJ" = ( /obj/machinery/light/small{ @@ -59181,12 +58994,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "uog" = ( @@ -59196,10 +59003,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -59245,8 +59052,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -59261,8 +59068,8 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "upc" = ( -/obj/machinery/meter/atmos/distro_loop, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/meter/monitored/distro_loop, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 8 }, /turf/open/floor/iron, @@ -59275,16 +59082,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "upK" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/space, /area/space/nearstation) "upT" = ( @@ -59308,10 +59115,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -59336,10 +59143,10 @@ req_one_access_txt = "1;40" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -59392,10 +59199,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -59407,10 +59214,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -59419,7 +59226,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, @@ -59487,8 +59294,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/fore) "utC" = ( @@ -59513,10 +59320,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -59525,13 +59332,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -59547,10 +59354,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59618,13 +59425,13 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/circuit/telecomms/mainframe, +/turf/open/floor/circuit/telecomms, /area/tcommsat/server) "uwR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/green, @@ -59690,10 +59497,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -59746,10 +59553,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -59758,10 +59565,10 @@ /turf/open/floor/iron/white, /area/medical/patients_rooms) "uzz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -59782,7 +59589,7 @@ /turf/open/floor/iron, /area/science/mixing) "uzV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -59861,11 +59668,11 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "uCI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -59893,20 +59700,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"uDa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) "uDi" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -59917,10 +59713,15 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) +"uDX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "uDZ" = ( @@ -59964,19 +59765,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"uFg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "uFk" = ( /obj/structure/disposalpipe/junction/yjunction{ dir = 8 @@ -60063,10 +59859,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -60075,7 +59871,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "uGK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -60084,7 +59880,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "uHd" = ( @@ -60104,19 +59900,28 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) -"uHQ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 +"uHt" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"uHQ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/engineering) "uHS" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ @@ -60163,6 +59968,13 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"uIF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "uJd" = ( /obj/machinery/light/small, /obj/machinery/airalarm/directional/south{ @@ -60172,10 +59984,10 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "uJp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -60184,11 +59996,11 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) @@ -60211,20 +60023,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "uKA" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/floor/iron, /area/maintenance/aft) "uKS" = ( @@ -60238,7 +60047,7 @@ /turf/open/floor/wood, /area/library) "uLg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -60248,10 +60057,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -60259,12 +60068,21 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"uLK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "uMh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60282,10 +60100,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -60310,10 +60128,10 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "uNx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/chapel{ dir = 1 }, @@ -60341,10 +60159,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -60360,12 +60178,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/quartermaster/office) +"uOP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "uPo" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -60389,10 +60216,10 @@ name = "Toxins Lab"; req_access_txt = "7" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -60428,7 +60255,7 @@ /turf/open/floor/iron, /area/engine/engineering) "uQt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -60443,10 +60270,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -60479,8 +60306,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -60507,7 +60334,7 @@ "uSj" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 + dir = 4 }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) @@ -60534,20 +60361,17 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "uSR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/turf/open/floor/iron, +/area/hallway/secondary/exit) "uTq" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -60555,10 +60379,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue, @@ -60576,8 +60400,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -60594,10 +60418,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -60609,10 +60433,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -60632,7 +60456,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/circuit, @@ -60680,12 +60504,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "uWw" = ( @@ -60701,15 +60519,15 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "uWO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "uWP" = ( @@ -60733,13 +60551,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/white/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "uXB" = ( /obj/structure/chair/fancy/bench/right{ @@ -60755,10 +60574,10 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -60773,20 +60592,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron, /area/quartermaster/storage) "uYC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -60810,28 +60623,26 @@ /area/hallway/primary/starboard) "uYV" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, /area/crew_quarters/theatre) "uZc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/light{ dir = 4 }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) "uZe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -60860,16 +60671,16 @@ uses = 8 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/bot_red, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "vaj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -60878,10 +60689,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, @@ -60961,7 +60772,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) "vdd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -60987,7 +60798,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -61040,17 +60851,17 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "vem" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "veo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61083,6 +60894,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "vfF" = ( @@ -61092,10 +60904,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -61107,22 +60919,16 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "vfI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "vfN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "vfO" = ( @@ -61153,10 +60959,10 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "vgk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61201,7 +61007,7 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "vgU" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/dark, /area/security/execution/transfer) "vhd" = ( @@ -61214,10 +61020,10 @@ /turf/open/floor/plating, /area/hallway/secondary/command) "vhB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -61258,10 +61064,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -61276,14 +61082,6 @@ /obj/machinery/vending/medical, /turf/open/floor/iron/techmaint, /area/security/brig) -"vjg" = ( -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/chair/stool/directional/west, -/turf/open/floor/iron, -/area/crew_quarters/locker) "vjl" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, @@ -61294,10 +61092,10 @@ /turf/open/floor/prison, /area/security/prison) "vjJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -61319,10 +61117,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -61346,13 +61144,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/medical/storage) "vkx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/blue, @@ -61369,7 +61167,7 @@ icon_state = "2-8" }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/detectives_office) "vkZ" = ( @@ -61389,8 +61187,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -61425,7 +61223,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -61458,6 +61256,9 @@ name = "External Access"; req_access_txt = "13" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "vmb" = ( @@ -61488,7 +61289,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -61507,21 +61308,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "vmV" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -61576,7 +61373,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "vnK" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, /turf/open/space, @@ -61615,7 +61412,7 @@ /turf/open/floor/iron/techmaint, /area/gateway) "vog" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Mix to Engine" @@ -61635,10 +61432,10 @@ /turf/open/floor/iron, /area/security/brig) "voG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -61652,7 +61449,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "vpk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -61743,24 +61540,24 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "vqX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "vrb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -61788,15 +61585,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, /area/security/warden) "vrN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -61808,10 +61605,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -61838,10 +61635,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -61854,7 +61651,7 @@ /turf/open/floor/iron, /area/security/brig) "vsO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -61882,8 +61679,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -61905,7 +61702,7 @@ /turf/open/floor/wood, /area/medical/exam_room) "vtH" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /obj/structure/lattice, @@ -61915,16 +61712,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "vtX" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -61941,6 +61732,20 @@ /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"vue" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "vuA" = ( /obj/structure/noticeboard{ dir = 4; @@ -61958,8 +61763,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -61994,9 +61799,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -62006,17 +61811,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "vyz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "vzd" = ( @@ -62037,10 +61842,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -62072,10 +61877,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating/rust, @@ -62088,10 +61893,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock{ name = "Service Hall"; req_one_access_txt = "22;25;26;28;35;37;38;46" @@ -62103,10 +61908,10 @@ name = "SMES Chamber"; req_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -62115,10 +61920,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -62139,15 +61944,15 @@ /area/medical/patients_rooms) "vAu" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/catwalk_floor, /area/quartermaster/exploration_dock) "vAK" = ( @@ -62158,13 +61963,13 @@ /obj/effect/turf_decal/pool{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, /area/crew_quarters/fitness) "vBe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/green, @@ -62183,10 +61988,10 @@ /turf/open/floor/iron/white, /area/science/lab) "vBQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62199,16 +62004,12 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vCa" = ( -/obj/structure/chair/fancy/comfy{ - color = "#596479"; - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) +/turf/open/space, +/area/space/nearstation) "vCs" = ( /obj/structure/closet, /obj/item/clothing/shoes/sneakers/white, @@ -62240,7 +62041,7 @@ /turf/open/floor/iron, /area/science/mixing) "vCw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -62316,7 +62117,7 @@ /area/security/prison) "vDA" = ( /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -62328,8 +62129,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes{ @@ -62344,14 +62145,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/east, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -62373,10 +62174,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -62388,7 +62189,7 @@ /turf/open/floor/iron/dark, /area/bridge) "vFt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -62401,10 +62202,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -62419,7 +62220,7 @@ /turf/open/floor/iron, /area/security/checkpoint/science) "vFO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -62488,8 +62289,8 @@ /turf/open/floor/prison/dark, /area/security/prison) "vGP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow, @@ -62520,7 +62321,7 @@ /turf/open/floor/grass, /area/hallway/secondary/command) "vHh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -62533,11 +62334,18 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/aft) +"vHk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat/hallway) "vHo" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; @@ -62549,10 +62357,10 @@ }, /area/science/research) "vHr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -62561,10 +62369,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -62583,8 +62391,8 @@ /turf/open/floor/iron/white, /area/science/explab) "vHT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -62596,10 +62404,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -62640,10 +62448,10 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "vJp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -62656,8 +62464,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -62697,10 +62505,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "vJV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) @@ -62737,10 +62545,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -62778,20 +62586,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "vLp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -62882,10 +62690,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -62894,10 +62702,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/red, @@ -62913,10 +62721,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -62933,10 +62741,10 @@ pixel_x = -5; pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/camera/directional/north, @@ -62954,15 +62762,11 @@ /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) "vPD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "vPE" = ( @@ -62992,10 +62796,10 @@ name = "Control Room"; req_access_txt = "19; 61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63006,10 +62810,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -63043,10 +62847,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -63084,7 +62888,7 @@ /turf/open/floor/iron/dark, /area/medical/storage) "vSt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "vSv" = ( @@ -63100,10 +62904,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating/rust, @@ -63117,12 +62921,6 @@ /turf/open/floor/plating, /area/science/explab) "vSG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -63150,7 +62948,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vTj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -63167,7 +62965,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/techfloorgrid{ @@ -63185,8 +62983,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/science/xenobiology) "vUB" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -63211,8 +63010,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "vUU" = ( @@ -63228,7 +63027,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "vVk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -63264,10 +63063,10 @@ "vWy" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -63319,10 +63118,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -63330,6 +63129,20 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"vXR" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "vXY" = ( /obj/machinery/camera/directional/east, /obj/machinery/power/apc/auto_name/directional/east, @@ -63339,7 +63152,7 @@ /turf/open/floor/iron/white, /area/medical/genetics) "vYA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 5 }, /obj/structure/rack, @@ -63359,10 +63172,10 @@ /turf/open/floor/wood, /area/security/detectives_office) "vYD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -63388,10 +63201,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -63416,11 +63229,15 @@ dir = 4; name = "Cooling Loop to Gas" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "vZv" = ( /obj/effect/turf_decal/tile/red/half/contrasted, @@ -63436,10 +63253,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/firealarm{ @@ -63452,10 +63269,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -63468,7 +63285,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -63479,23 +63296,20 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "way" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "atmos_external" }, /obj/machinery/door/airlock/external{ name = "Atmospherics External Airlock"; - req_access_txt = "13" + req_access_txt = "24" }, /turf/open/floor/plating, /area/maintenance/aft) "waz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -63594,10 +63408,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -63687,14 +63501,14 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/science/mixing/chamber) "wel" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63704,7 +63518,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "wen" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/machinery/meter, @@ -63717,6 +63531,10 @@ }, /turf/open/floor/iron/white, /area/medical/genetics/cloning) +"weH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "weV" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -63781,17 +63599,12 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "wfM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat/hallway) "wfU" = ( /obj/machinery/atmospherics/components/trinary/mixer{ dir = 8 @@ -63824,8 +63637,8 @@ id_tag = "Dorm6"; name = "Cabin 2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -63860,12 +63673,6 @@ req_access_txt = "48"; shuttledocked = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningdock) "wgM" = ( @@ -63875,21 +63682,21 @@ /turf/open/floor/iron, /area/security/checkpoint/auxiliary) "wgN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "wgP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) @@ -63940,8 +63747,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "whx" = ( @@ -63970,7 +63777,7 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -64009,10 +63816,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -64062,10 +63869,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor, @@ -64149,11 +63956,11 @@ /area/hallway/secondary/command) "wnd" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/space, /area/maintenance/starboard/aft) "wng" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, @@ -64171,10 +63978,10 @@ /obj/effect/turf_decal/siding/wideplating_new/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -64186,10 +63993,10 @@ /obj/machinery/firealarm{ pixel_y = 27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -64212,6 +64019,12 @@ dir = 8 }, /obj/machinery/camera/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "wnQ" = ( @@ -64244,10 +64057,10 @@ req_access_txt = "3"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -64273,6 +64086,7 @@ name = "old radio"; pixel_x = 2 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/tcommsat/computer) "wpc" = ( @@ -64393,10 +64207,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -64461,10 +64275,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -64476,10 +64290,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -64571,7 +64385,7 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "wvY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -64579,10 +64393,10 @@ }, /area/engine/atmos) "wwh" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/structure/chair/stool/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, -/obj/structure/chair/stool/directional/east, /turf/open/floor/iron, /area/engine/atmos) "wwv" = ( @@ -64650,8 +64464,8 @@ name = "Operating Theatre"; req_access_txt = "45" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -64662,7 +64476,7 @@ /turf/open/floor/iron/dark, /area/medical/surgery) "wyb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "wyf" = ( @@ -64672,10 +64486,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison, @@ -64709,8 +64523,8 @@ name = "Theatre Stage"; dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/siding/wood, @@ -64722,16 +64536,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "wAg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -64744,7 +64562,7 @@ pixel_x = -25; pixel_y = -36 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/siding/wood/corner{ @@ -64759,19 +64577,16 @@ /obj/machinery/door/airlock/external{ name = "Escape Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "wBd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -64808,12 +64623,12 @@ /turf/open/floor/plating, /area/hallway/primary/central) "wCr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "wCw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -64861,20 +64676,20 @@ /turf/open/floor/iron, /area/hallway/primary/port) "wDc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /turf/open/floor/iron, /area/engine/engineering) "wDt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -64890,7 +64705,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -64918,21 +64733,21 @@ /area/medical/apothecary) "wEC" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible/layer2, /turf/open/space, /area/space/nearstation) "wEJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -64955,10 +64770,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -64987,11 +64802,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -65006,10 +64821,10 @@ icon_state = "1-8" }, /obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -65033,7 +64848,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/red, @@ -65094,6 +64909,7 @@ /area/hallway/secondary/command) "wIR" = ( /obj/machinery/airalarm/directional/west, +/obj/machinery/portable_thermomachine, /turf/open/floor/plating, /area/maintenance/starboard) "wIU" = ( @@ -65111,7 +64927,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "wIY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -65126,13 +64942,13 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "wJI" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -65154,14 +64970,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "wKp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -65183,10 +64996,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -65212,14 +65025,14 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "wKW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron/dark/textured_large, @@ -65235,10 +65048,9 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "wLu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/brig) "wLD" = ( @@ -65298,21 +65110,16 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "wMp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "wMs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "wMu" = ( @@ -65322,14 +65129,14 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "wMx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -65368,8 +65175,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "wND" = ( @@ -65378,8 +65185,8 @@ icon_state = "2-8" }, /obj/effect/landmark/start/cyborg, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ai_monitored/turret_protected/aisat_interior) "wNJ" = ( @@ -65394,7 +65201,7 @@ /area/medical/medbay/central) "wOB" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, /area/space/nearstation) @@ -65437,7 +65244,7 @@ /turf/open/floor/iron/dark, /area/security/main) "wPJ" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /obj/structure/lattice, @@ -65445,10 +65252,10 @@ /area/space/nearstation) "wPR" = ( /obj/effect/turf_decal/tile/dark_red/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -65457,12 +65264,9 @@ /turf/closed/wall/r_wall, /area/security/detectives_office) "wQz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/security/brig) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/crew_quarters/locker) "wQB" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ @@ -65476,10 +65280,10 @@ pixel_x = -24 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow, @@ -65533,10 +65337,10 @@ dir = 8; name = "Air to External" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -65549,7 +65353,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat/atmos) "wTg" = ( @@ -65570,13 +65374,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "wTO" = ( @@ -65639,8 +65443,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "wUH" = ( @@ -65659,10 +65463,17 @@ /area/crew_quarters/heads/chief) "wUU" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "wVH" = ( /obj/effect/decal/cleanable/dirt, /mob/living/basic/cockroach, @@ -65709,6 +65520,9 @@ pixel_x = -28 }, /obj/structure/chair/stool/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "wWy" = ( @@ -65757,10 +65571,10 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "wWY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "wXj" = ( @@ -65779,28 +65593,28 @@ /turf/open/floor/iron, /area/hydroponics) "wXP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) +/obj/machinery/portable_thermomachine, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "wXQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/stairs, /area/hallway/secondary/command) "wXU" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -65819,10 +65633,10 @@ /obj/structure/disposalpipe/sorting/mail{ sortType = 11 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -65831,13 +65645,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "wYT" = ( /obj/structure/chair{ @@ -65849,19 +65666,19 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "wYW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) "wZI" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible/layer4, /turf/open/space, /area/space/nearstation) "wZO" = ( @@ -65871,10 +65688,10 @@ name = "Genetics Lab"; req_access_txt = "9" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -65883,7 +65700,7 @@ /turf/open/floor/iron/white, /area/medical/genetics) "xaf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -65923,10 +65740,10 @@ /turf/open/floor/iron, /area/security/checkpoint/engineering) "xbp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -65941,10 +65758,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -65953,10 +65770,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) @@ -65972,22 +65789,22 @@ name = "Cell 2" }, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "xcE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) "xcQ" = ( @@ -66015,22 +65832,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/aft) "xdh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -66061,19 +65878,19 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "xew" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "xeC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -66086,8 +65903,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "xeZ" = ( @@ -66115,10 +65930,10 @@ /turf/open/floor/iron, /area/science/explab) "xfs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -66141,6 +65956,7 @@ icon_state = "1-4" }, /obj/machinery/light/floor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/bridge) "xfL" = ( @@ -66154,7 +65970,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "xfX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -66231,8 +66047,8 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -66250,10 +66066,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "xiZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white/side{ @@ -66262,7 +66078,7 @@ /area/science/research) "xjr" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet, @@ -66276,8 +66092,8 @@ name = "Captain's Desk"; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "xjE" = ( @@ -66396,10 +66212,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -66431,10 +66247,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/machinery/door/firedoor, @@ -66477,8 +66293,8 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -66529,10 +66345,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -66545,10 +66361,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -66585,7 +66401,7 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -66597,10 +66413,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/detectives_office) "xpa" = ( @@ -66610,12 +66426,6 @@ /obj/machinery/door/airlock/external{ req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/starboard) "xpc" = ( @@ -66657,18 +66467,15 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "xqa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/central) "xql" = ( @@ -66678,8 +66485,8 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/locker) "xqm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -66710,6 +66517,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/kitchen) +"xqG" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/airlock/engineering/glass{ + name = "Laser Room"; + req_access_txt = "10" + }, +/turf/open/floor/plating, +/area/engine/engineering) "xqO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -66730,10 +66545,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -66760,8 +66575,8 @@ /turf/open/floor/iron/grid, /area/medical/patients_rooms) "xrZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/siding/wood{ @@ -66770,20 +66585,20 @@ /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "xsl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/engine/engineering) "xso" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66804,22 +66619,17 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "xth" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat_interior) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/quartermaster/storage) "xtm" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -66840,14 +66650,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "xua" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66897,10 +66713,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66915,10 +66731,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -66936,10 +66752,10 @@ /turf/open/floor/circuit/green/off, /area/teleporter) "xvI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /mob/living/simple_animal/sloth/paperwork, @@ -66968,10 +66784,10 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -66993,7 +66809,7 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -67006,7 +66822,7 @@ /area/crew_quarters/bar/atrium) "xxx" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -67032,25 +66848,30 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "xxY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, /area/science/robotics/lab) "xyb" = ( /obj/machinery/camera/directional/north, +/obj/machinery/portable_thermomachine, /turf/open/floor/iron/dark, /area/engine/atmos) "xyy" = ( @@ -67090,16 +66911,16 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "xyW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/plating, /area/maintenance/port/aft) "xzq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /obj/machinery/meter, @@ -67110,15 +66931,15 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/quartermaster/office) "xzU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "xAd" = ( @@ -67135,20 +66956,20 @@ /area/crew_quarters/kitchen/coldroom) "xAx" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plating, /area/maintenance/port) "xAH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -67160,10 +66981,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "xAJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ @@ -67172,14 +66993,14 @@ /turf/open/floor/engine, /area/science/mixing/chamber) "xBf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/carpet, +/area/vacant_room/office) "xBA" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -67197,13 +67018,13 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) "xBE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -67236,23 +67057,25 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/main) "xBV" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -67264,7 +67087,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/item/extinguisher, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron/dark/textured_large, @@ -67287,20 +67110,23 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/dorms) "xDQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/machinery/camera/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -67319,6 +67145,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hydroponics) +"xEi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "xEr" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -67340,20 +67173,17 @@ }, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/fore/secondary) "xFo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/exit) "xFF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -67398,7 +67228,7 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "xGE" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 5 }, /turf/open/floor/iron, @@ -67423,7 +67253,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/freezer, @@ -67432,10 +67262,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -67452,7 +67282,7 @@ /area/engine/supermatter) "xHM" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/plating, @@ -67462,14 +67292,14 @@ /turf/open/floor/carpet, /area/library) "xHP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -67486,24 +67316,24 @@ /turf/open/floor/iron, /area/hallway/primary/central) "xIi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "xIt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "xIQ" = ( @@ -67528,10 +67358,15 @@ /turf/closed/wall, /area/medical/chemistry) "xJi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/turf/open/floor/carpet, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, /area/hallway/secondary/entry) "xJC" = ( /obj/structure/chair/office{ @@ -67543,10 +67378,10 @@ /turf/open/floor/wood, /area/library) "xJI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/chapel{ dir = 8 }, @@ -67560,14 +67395,10 @@ /turf/open/floor/engine, /area/science/explab) "xKk" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/engine, -/area/engine/engineering) +/turf/closed/wall/r_wall, +/area/maintenance/starboard/aft) "xKF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -67617,10 +67448,10 @@ /area/crew_quarters/dorms) "xMa" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, @@ -67678,10 +67509,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -67690,7 +67521,7 @@ /turf/open/floor/iron, /area/engine/engineering) "xNI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) @@ -67703,10 +67534,10 @@ /turf/open/floor/wood, /area/library) "xNZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -67745,10 +67576,10 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) "xON" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -67763,10 +67594,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -67775,25 +67606,26 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xPk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "xPB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/turf/open/space, +/area/space/nearstation) "xPR" = ( /obj/item/book/manual/wiki/security_space_law, /obj/item/camera/detective, @@ -67825,7 +67657,7 @@ "xQE" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "xQG" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -67843,29 +67675,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison, /area/security/prison) "xRo" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 }, -/turf/open/floor/catwalk_floor, -/area/maintenance/starboard/aft) +/turf/open/floor/iron/dark, +/area/engine/engineering) "xRJ" = ( /obj/item/stack/sheet/glass, /obj/structure/table/glass, @@ -67891,17 +67714,17 @@ /turf/open/floor/iron/white, /area/science/lab) "xRN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "xSj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -67924,7 +67747,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/prison/dark, @@ -67945,10 +67768,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/item/radio/intercom/directional/west, @@ -67972,8 +67795,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -67989,10 +67812,10 @@ dir = 4; sortType = 19 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -68020,10 +67843,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "xVe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68037,10 +67860,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/hallway/secondary/command) @@ -68063,7 +67886,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/iron/dark/textured_large, @@ -68072,10 +67895,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -68084,10 +67907,10 @@ /turf/open/floor/iron/white, /area/medical/virology) "xVS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68101,10 +67924,12 @@ /turf/open/floor/iron/freezer, /area/security/prison) "xWy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xWz" = ( @@ -68138,21 +67963,11 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/hor) "xWZ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "xXr" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, @@ -68169,7 +67984,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -68178,13 +67993,18 @@ /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_dock) "xXF" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 }, -/turf/open/floor/iron, /area/hallway/secondary/entry) "xXW" = ( /obj/effect/spawner/structure/window/reinforced, @@ -68195,10 +68015,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68227,10 +68047,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/light{ @@ -68244,20 +68064,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, /area/security/prison) "xYv" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -68268,10 +68088,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -68291,17 +68111,15 @@ /area/crew_quarters/heads/chief) "xZy" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/engineering) "xZK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -68330,9 +68148,6 @@ dir = 8 }, /obj/structure/closet/emcloset/anchored, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /turf/open/floor/plating, /area/engine/engineering) "yax" = ( @@ -68346,6 +68161,18 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/medical/medbay/central) +"yaU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "yaV" = ( /obj/structure/chair/fancy/comfy{ color = "#742925"; @@ -68362,10 +68189,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -68402,10 +68229,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -68414,7 +68241,7 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron/dark/side{ @@ -68434,7 +68261,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/orange, @@ -68449,10 +68276,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -68465,10 +68292,10 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/light{ @@ -68499,10 +68326,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -68535,7 +68362,7 @@ /turf/open/floor/iron, /area/engine/engineering) "yeY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -68554,10 +68381,10 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "yfw" = ( @@ -68573,11 +68400,15 @@ /turf/open/floor/wood, /area/security/detectives_office) "yfN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "yga" = ( @@ -68592,7 +68423,7 @@ dir = 8; name = "Mix to Incinerator" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -68605,10 +68436,10 @@ name = "Crematorium"; req_access_txt = "27" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -68629,19 +68460,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ygK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/freezer, @@ -68657,10 +68488,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "yhl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -68699,10 +68530,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -68711,7 +68542,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68720,14 +68551,14 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "yhZ" = ( /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/storage/primary) @@ -68761,8 +68592,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -68786,7 +68617,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_dock) "yjI" = ( @@ -68804,14 +68635,17 @@ /area/engine/atmos) "ykh" = ( /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/brig) "ykJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -78474,10 +78308,10 @@ apN apN apJ lna -iea -aUL -oTV -hiN +dlZ +mLR +fhP +siJ aaa aaa aaa @@ -78486,10 +78320,10 @@ aaa aaa aaa mLR -inH +fhP siJ hJN -aRY +oNS rQX aaa aaa @@ -78497,10 +78331,10 @@ aaa aaa aaa rQX -awZ +lna dlZ sbq -aBf +fhP sAE cyd aaa @@ -78730,8 +78564,8 @@ apN apN apN apJ -fUR -mzC +jGH +ayk rQX rQX rQX @@ -78755,7 +78589,7 @@ aaa aaa rQX awZ -qJv +ayk asE asE asE @@ -78987,8 +78821,8 @@ apN apN apN apJ -fUR -lMB +jGH +aQH azz dao rQX @@ -79002,7 +78836,7 @@ aaa rQX oWb azz -jdt +aym aRY rQX aaa @@ -79012,7 +78846,7 @@ aaa aaa rQX awZ -oNS +aQH azz dao rQX @@ -79244,8 +79078,8 @@ apN apN apN apJ -fUR -msW +vXR +iJB ayl rQp rQX @@ -79259,8 +79093,8 @@ aaa rQX fgR ayl -iMy -aRY +koC +mUP rQX aaa aaa @@ -79269,7 +79103,7 @@ aaa aaa rQX awZ -lnp +ayl ayl iNZ rQX @@ -79502,7 +79336,7 @@ apN apN apJ xDQ -rnF +ayl ayl hYu rQX @@ -79516,8 +79350,8 @@ aaa rQX rya ayl -iMy -aRY +ayl +iRk rQX aaa aaa @@ -79525,8 +79359,8 @@ aaa aaa aaa rQX -awZ -lnp +iBW +iJB ayl hYu rQX @@ -79758,7 +79592,7 @@ apN apN apN apJ -jGH +vue rQW azA aAG @@ -79774,7 +79608,7 @@ rQX cYD qUb vfN -aRY +iRk rQX aaa aaa @@ -79782,8 +79616,8 @@ aaa aaa aaa rQX -awZ -gbg +tqW +rQW azA bgh rQX @@ -80015,8 +79849,8 @@ apN apN apN apJ -uDa -pXm +vue +ayk rQX rQX rQX @@ -80031,7 +79865,7 @@ rQX rQX rQX rzy -aRY +iRk rQX aaa aaa @@ -80039,8 +79873,8 @@ aaa aaa aaa rQX -awZ -qJv +tqW +ayk asE asE asE @@ -80273,10 +80107,10 @@ asF asF apJ fUp -ewv -aUL -aBf -hiN +dlZ +mLR +fhP +siJ aaa aaa aaa @@ -80285,10 +80119,10 @@ aaa aaa aaa mLR -mEd +fhP siJ -hfS -aRY +hJN +aUL rQX aaa aaa @@ -80296,10 +80130,10 @@ cxE aaa aaa rQX -awZ -xBf +xXF +dlZ eSs -oTV +fhP iJJ aaa aaa @@ -80523,14 +80357,14 @@ aaf apJ xLk wWX -wWX +hiN wWX bcw wWX qwD avp cOl -jOj +ayk asE esU asE @@ -80544,8 +80378,8 @@ aaa asE asE asE -aUM -aRX +rxr +msW arB aaa hcR @@ -80553,8 +80387,8 @@ lKI rQX aaa arB -awY -dXE +qFL +ayk rQX gYe rQX @@ -80780,14 +80614,14 @@ aaa asF gMT auQ -auQ -auQ +fry +mzC wMs qZd gds mmg tPl -xXF +aQH azB rQX aaa @@ -80801,17 +80635,17 @@ aaa aaa asE aPt -jdt +aym wnL arB arB arB -tAH +fhP rQX rQX arB pcM -tlO +aQH azB rQX aaf @@ -81058,7 +80892,7 @@ arB arB arB aPv -iMy +ayl aRZ asE dao @@ -81068,7 +80902,7 @@ rQX baF asE bbb -iJB +ayl beN arB aaf @@ -81301,31 +81135,31 @@ apJ apJ apJ rCK -ayl +iJB aQH azz -aBH -azz +tZZ azz azz +uOP azz azz azz aLv aBH azz -aym -iMy -ayl +oyU +lhP +lOa lqg aQH -ool +azz thW -tXA +azz aym ayl +fvo ayl -iJB beM aAC aaf @@ -81561,7 +81395,7 @@ jzf ayr azD azD -azD +pXm vfC tSr aFG @@ -81576,13 +81410,13 @@ iMy ayl rmG nRr -ayl +koC gLK pfK sgs cOI sBN -hGV +ayl beM asE aaa @@ -82339,9 +82173,9 @@ sGB aGZ aIM ofr -jIB +rqJ bTL -iFG +wXZ oZu jPx ayl @@ -82596,11 +82430,11 @@ nIn aHy aIM ofr -tTq +tAH tuB -cxu -tTq -jPx +tuB +kVh +xJi ayl czK iNG @@ -82852,11 +82686,11 @@ org afI aHa aIM -fuR +ofr rqJ -gov -xJi -lhP +tTq +tTq +gtQ dDz ayl czK @@ -83109,7 +82943,7 @@ wgM ihV aHy ayl -loh +ofr nBU sgX vJi @@ -83377,7 +83211,7 @@ czK hvV pRA tHS -aXL +xBf aXL emU sKX @@ -83640,7 +83474,7 @@ czK dMm xAx iyA -aSg +dXE beO wrc beO @@ -84378,7 +84212,7 @@ aaa aaf aaa ali -amC +atJ heo alU alU @@ -85167,7 +85001,7 @@ aBM aAQ aKn aLE -aNm +jGV aOl aPB akF @@ -86195,13 +86029,13 @@ mje mje qwU jGL -aNk +rnF aOo aPA aQQ aQN -aQN -aQN +hXz +nnz xIt vmV vGP @@ -86457,7 +86291,7 @@ aOn aPA aQP aQN -vjg +uVJ vAb jtE aXQ @@ -86732,7 +86566,7 @@ aaa aaa qjV bqj -sMw +dTb aZE dTb bvT @@ -86971,7 +86805,7 @@ aOl tHW aQN aQN -rxR +aTz pjI yfN aXr @@ -87248,7 +87082,7 @@ ozF dSm fCd nMy -koC +uYw bvV qjV aaa @@ -87485,7 +87319,7 @@ aOl aPA aQS aQN -fry +vAb uVJ dtF aXt @@ -87500,11 +87334,11 @@ aPz inn aZE dZQ -mJS bjr -bps bjr +bps bjr +hfS buB bvU aZE @@ -87758,10 +87592,10 @@ rEh hkC shn jff -bjr -bjr -bjr -bjr +xth +xth +xth +hSt bjr bvV qjV @@ -87993,15 +87827,15 @@ iKJ bSu ovQ yhZ +mGj otj -aLE aOl aPA aQU aQN -aQN -aQN -dtF +jOj +wQz +gov aXw aZA aZA @@ -88298,7 +88132,7 @@ bHE bHE bHE bCq -nKI +bHE gME bLv aaa @@ -88813,7 +88647,7 @@ bHE bHE bCq bHE -pdT +inH bHE agO bCq @@ -89070,7 +88904,7 @@ bHE bHE bCq bHE -pdT +pnh bHE bHE bCq @@ -89343,7 +89177,7 @@ met bHE bLu bCq -jQf +iLg bCq aaa aaa @@ -89536,7 +89370,7 @@ aBa aJd aKv aLN -iMA +aLE mCE aPF nKD @@ -89584,7 +89418,7 @@ bCq pdT bCq bHE -bHE +iea bHE bHE bCq @@ -89598,9 +89432,9 @@ cqn oBF qET coe -coe +lMB ikh -xyW +jQf bCq bLv bLv @@ -89780,7 +89614,7 @@ aqQ aqQ aqQ arP -aqR +ceh mUU ayA aaa @@ -89829,7 +89663,7 @@ aaf aaf jZP nVG -pNe +cIV eZm jZP aoV @@ -89855,7 +89689,7 @@ cqy xrC bQa bHE -bHE +iea bHE bHE bHE @@ -90050,7 +89884,7 @@ aHF aJd aKv aLN -nqI +aOx obv kIF kIa @@ -90307,7 +90141,7 @@ aBa aaa aKt aLN -fqu +aLE aOt aPK aPK @@ -90564,7 +90398,7 @@ aBa aaf aKt aLN -fqu +aLE nde aLE aPK @@ -90821,7 +90655,7 @@ aaa aaa aKx aLN -fqu +aLE gKu meO aRc @@ -90856,7 +90690,7 @@ bCo bDk qJc qVP -sCg +byE kRq eSn jZP @@ -91101,20 +90935,20 @@ qwT yaW bny bbR -niG +lQb bbR bbR rdF bxy eVL gZT -byE +pNe byE bAb byE -nxu +byE fMC -vUf +kRq bKn jZP aoV @@ -91365,12 +91199,12 @@ fNw mXP lAK aHt -lAK +gcZ lAK qLK tdp jop -tZZ +jop hMJ bKp jZP @@ -91592,8 +91426,8 @@ ayE ayE ayE wdN -fqu -aNm +aLE +aul huE aSs aSs @@ -91849,8 +91683,8 @@ aaa aaa fHM wCW -fqu -aNm +aLE +aul dCJ aSs aRV @@ -92106,8 +91940,8 @@ aaa aaa aKu aLN -fqu -aNm +aLE +aul aOl aSs aRT @@ -92363,7 +92197,7 @@ bfv aaa eYm aJo -sdx +meO cnT cOS mcF @@ -92380,7 +92214,7 @@ tav aZH pnY jKO -ebc +cNG bjw xnk bbR @@ -92620,7 +92454,7 @@ bfv gXs fHM uGA -sXq +aLE uiB akC aSs @@ -92637,7 +92471,7 @@ tav beA pXX cNG -ebc +cNG ore aZK cvJ @@ -92877,8 +92711,8 @@ bfv bfv bfv aLE -sXq -aNm +aLE +aul aSs aSs aTL @@ -93134,7 +92968,7 @@ bfv sQV bfv nIK -aul +nIK xtS aSs aSs @@ -93391,7 +93225,7 @@ aDs eYL sYX tcO -pDB +hPy eqc aJq cMI @@ -93652,10 +93486,10 @@ uYC rnd sYx hPy -bnM -bnM -bnM -bnM +hPy +hPy +nqI +sdx bnM nxR vbT @@ -93663,20 +93497,20 @@ bnM cbd vdd vdd -vdd -vdd +iaP +mMM vPD -keR +uDX bjQ -keR -keR -pvy -aJq -aJq -aJq -aJq -aJq -aJq +uDX +eJq +cjs +ilh +ccZ +ccZ +ccZ +ccZ +ccZ svw aJq bCq @@ -93905,7 +93739,7 @@ bfv bfv bfv lzG -iRX +bcJ bBi klN klN @@ -93920,21 +93754,21 @@ nbZ nbZ sEj aYl -aYl +ebc aYl aYl sEj aLh klN +gJA +eBb klN klN klN klN klN klN -klN -klN -aJq +czo aJq aJw aaa @@ -94162,7 +93996,7 @@ bfv gXs dxw tJd -iRX +bcJ kUE dgB dgB @@ -94191,7 +94025,7 @@ qwY aZM aZM klN -aJq +czo byU aJw aaa @@ -94448,7 +94282,7 @@ tLg fPa aZM xTN -aJq +czo aJq aJw gXs @@ -94676,7 +94510,7 @@ aaa aaa wCo tfS -aJq +hKs aOE dgB aaa @@ -94705,7 +94539,7 @@ nzr tyH mgE klN -aJq +jGF vJE aJw aaa @@ -94919,7 +94753,7 @@ kOu mpK jTP ajo -aqR +ceh aqR gfW ayE @@ -94933,7 +94767,7 @@ aaa aaa dxw bwb -aJq +hKs bJx dgB aaa @@ -94962,7 +94796,7 @@ isN tyH waL klN -aJq +onU aJq bCs bCs @@ -95190,7 +95024,7 @@ ayE ayE dxw aMm -aJq +qiF aOE dgB aaa @@ -95447,7 +95281,7 @@ aqR aqR gJg aJq -aJq +onU aOE dgB aaa @@ -95517,7 +95351,7 @@ cqu mDu eLT unH -hPY +mNw cmr oRL gDw @@ -96415,10 +96249,10 @@ oFP bee lrz jOv -wQz +dmT nEx top -jCq +tXA jCq rEX ctY @@ -96504,8 +96338,8 @@ aaa aaa vWd klN -aJq -uHQ +gQu +pFT bCs xfZ azv @@ -96541,7 +96375,7 @@ mYL ckG clJ cje -eDN +qJv cMm mTL rPf @@ -96558,9 +96392,9 @@ cSH nXc cMm csd +qLU csd -csd -csd +gOp csd ccw aaa @@ -96761,7 +96595,7 @@ aaa aaa vWd klN -aJq +mKN byU bCs tpu @@ -96814,7 +96648,7 @@ cFK cGe ceu kFU -ceh +oIC cHb cHg cHn @@ -97018,7 +96852,7 @@ gXs gXs hbS klN -aJq +mKN aJq bCs wOZ @@ -97069,9 +96903,9 @@ cEz cMD cFL cGf -xKk -gOp -wXP +nXc +xqG +dfK cHc cAu cAu @@ -97275,7 +97109,7 @@ vPa vPa hbS whp -aJq +mKN kNO bCs bCs @@ -97326,9 +97160,9 @@ cFe cMD cFM czE -kQq +nXc ccw -gPH +ryf csd csd csd @@ -97441,10 +97275,10 @@ aaa aaa aaa bee -ozo +lrz jOv -wQz -qFL +dmT +dmT lMQ rfQ atx @@ -97583,10 +97417,10 @@ cEw cFw tDe csH -csR +pAE cMm oTb -gTc +csd csd cHo csd @@ -97740,7 +97574,7 @@ qfW ouI ooL dMB -qfW +mGw qfW qfW sPM @@ -97829,17 +97663,17 @@ cIa cnv cMm chG -xxT +ugK cqg cqE pbP crt -cMH +tOn cAm cMH cMN qDH -cSI +fEL cSI cMm gww @@ -97997,7 +97831,7 @@ gdq guV xbp qXk -eqi +bSi xVw eqi iZC @@ -98099,8 +97933,8 @@ hnV csI cAt cMm -jaC -ugK +dfK +csd csd cHp csd @@ -98354,7 +98188,7 @@ cFh cMD cFM czE -kQq +nXc ccw ryf csd @@ -98600,7 +98434,7 @@ cje cgR ccw fzQ -xxT +gPH cDw cDE cEa @@ -98611,7 +98445,7 @@ cEz cMD cFR cSJ -kQq +nXc cMm dfK cHd @@ -98857,7 +98691,7 @@ cje cgR cMm chG -xxT +gPH cDw cDF cEa @@ -98869,10 +98703,10 @@ cEf cFS cGg mBv -qLU +kFU oIC cHe -cHe +cGC cHr oDF ccw @@ -99073,8 +98907,8 @@ soL aaa aaa vWd -klN -hKs +hGi +xEi fUM bzs bAw @@ -99110,11 +98944,11 @@ tGL tBb wUH nNv -cje +uHQ cgR cMm cDj -rPf +bIm cql cDG cDG @@ -99128,9 +98962,9 @@ cSK cGx cMm csd +jaC csd -csd -csd +hPY csd ccw aaf @@ -99257,7 +99091,7 @@ xkA qet hRz qat -kSX +fRJ kSX kSX aaP @@ -99382,7 +99216,7 @@ cqb cAr cqb cGh -cGC +cGi ccw ijc csd @@ -99514,7 +99348,7 @@ jSF aaZ aaZ jJF -aEU +qBp mbF aEU aaP @@ -99559,7 +99393,7 @@ mgt oAu aJw aJq -kAD +aJq aOE dgB aaa @@ -99628,7 +99462,7 @@ hCM cgR cMm cMm -cjb +cip cDy cqC crc @@ -99638,8 +99472,8 @@ crc crc cFy crc -cGi -cGD +csR +ccw ccw ccw ccw @@ -99885,7 +99719,7 @@ hCM cgR cDe cMm -rHo +gZJ cqa cig ccw @@ -99895,7 +99729,7 @@ csd csd cFz csd -csd +xRo xZy cGM cGZ @@ -100073,8 +99907,8 @@ ktK mgd mgd rQu -gJM -aOE +rQL +rOv dgB aaa aPR @@ -100331,7 +100165,7 @@ eqT gDJ lOe ifY -aOE +fKr dgB aaa aaa @@ -100358,9 +100192,9 @@ xqo fVm aII bqH -klN -hKs -uHQ +hGi +nPi +lNx bzs mzV qwC @@ -100587,8 +100421,8 @@ aAh aAh aAh aLR -ifY -aOE +rGV +roT dgB aaa aaa @@ -100601,7 +100435,7 @@ keZ hyg bmx pOb -vCa +gFv gFv kzC bbw @@ -100805,7 +100639,7 @@ mEz chv oPU adR -spM +wXP aoJ aoJ aoJ @@ -100844,7 +100678,7 @@ uxg obl aAh uEE -ifY +hKs aOE dgB aaa @@ -100913,15 +100747,15 @@ ccw ccw ccw eKo -hCM -cgR +hZN +dsH cgR -etu gtt +tlO jHa bPw oKu -aag +xPB aaa aaa aaa @@ -101068,7 +100902,7 @@ aiA aiA ahn ahn -apt +rxR iQx tqF yfF @@ -101101,7 +100935,7 @@ xHw dIg aAh aMn -ifY +hKs aOE dgB aaa @@ -101157,7 +100991,7 @@ gbb xzU nCx iYT -nnz +jKu bOd vGb oWz @@ -101173,12 +101007,12 @@ jmC eMx rsl rsl -pnh +sXq mJp ccw rSI cfK -aag +iMA aaa aaa aaa @@ -101358,7 +101192,7 @@ vlM lYV aAh aMm -jDW +hKs aOE dgB dgB @@ -101435,10 +101269,10 @@ shQ ccw ccw cig -aag -aag -aag -aag +vCa +cxB +cxB +xPB aaa aaa aaa @@ -101615,7 +101449,7 @@ fmN wCU aAh aJq -aJq +hKs aJq tjO tjO @@ -101629,17 +101463,17 @@ xHU aOE mSM iNa -aOE +tHD aOE aOE aOE spf -ilh +tjO tjO pTk jfE sJt -tjO +lbJ ouj tjO tjO @@ -101654,7 +101488,7 @@ wVP bzs fDn bLK -bJF +fsB bMQ bJF bMQ @@ -101675,7 +101509,7 @@ mIQ bUS qxh vGm -oYm +tdq imP pwN ckY @@ -101695,7 +101529,7 @@ aaf aaf aaf aaf -aag +iMA aaa aaa aae @@ -101873,29 +101707,29 @@ kKW aAh kQk aNC -aJq -aJq -aJq -aJq -aJq -aJq -aJq +uDX +uDX +uDX +uDX +uDX +uIF +pvy aJq aJq qVS bco aJq beo -aJq -aJq -aJq -aJq -aJq xaf keR keR -kzD keR +mDY +uHt +jgJ +jgJ +kzD +jgJ giI jgJ jgJ @@ -101930,7 +101764,7 @@ bRA bOd wMp bTO -cfQ +dZf owx mfn mFR @@ -101952,7 +101786,7 @@ aaa aaa aaa aaf -aag +iMA aaa aaa aaa @@ -102147,7 +101981,7 @@ aJq fZA aJq aJq -aJq +onU aJq khB aJq @@ -102209,7 +102043,7 @@ dPd aaa aaa aaf -aag +iMA aaa aaa aaa @@ -102357,7 +102191,7 @@ anF dwH ahn eMP -riU +sCg ahn anF anF @@ -102466,7 +102300,7 @@ aaa uxy aaa aaf -aag +iMA aaa aaa aaa @@ -102723,7 +102557,7 @@ aaf cso aaf aaf -aag +iMA aaa aaa aaa @@ -102941,7 +102775,7 @@ oyg bLK bLK fRd -rcc +gZV bSf bMZ bSJ @@ -102955,10 +102789,10 @@ bXT caG cbE bOd -rcc +gZV wMp cdA -cfQ +jzS iNO mfn mFR @@ -103237,7 +103071,7 @@ aaa qGK aaa aaf -aag +iMA aaa aaa aaa @@ -103421,12 +103255,12 @@ xrZ wWY wWY wgP -fyT +tgB lyC uwA hUm aYV -aYV +bnT bFO btZ voa @@ -103470,7 +103304,7 @@ bUR bTT bUR xwR -dTD +xWZ xWZ thX fHJ @@ -103494,7 +103328,7 @@ aaa qGK aaa aaf -aag +iMA aaa aaa aaa @@ -103642,7 +103476,7 @@ aaa aaa ahn tkF -riU +etu anF anF ahn @@ -103973,11 +103807,11 @@ grQ xNI lpu gxp -qMR +dEo xNI lpu qMR -qMR +dEo xNI lpu xNI @@ -104007,8 +103841,8 @@ bRK aaa qGK aag -aag -aag +nNf +dXo aag aaa aaa @@ -104178,7 +104012,7 @@ kSk fPc alP aAM -aFm +fwG rHS asw asw @@ -104758,7 +104592,7 @@ cdD bLK aaf oSu -iui +ctl ctl bPn wPJ @@ -105015,8 +104849,8 @@ cbH bLK aaf haj -fvo -clI +ctl +ctl haj ixA aoV @@ -105054,8 +104888,8 @@ mkj mkj mkj rST -dZf -rRY +mkj +mkj mkj mkj cva @@ -105225,7 +105059,7 @@ syZ vwl hUm aYV -cuf +kDj rpN rYC pcD @@ -105291,7 +105125,7 @@ xrw bRK csM wQL -mGj +dqO lNf biH jok @@ -105309,12 +105143,12 @@ fGv qPq qPq edc -qPq +mXg lkt mGd sTS -qPq -qPq +sxY +grJ hOm qNw mWp @@ -105482,7 +105316,7 @@ gBj kIP tTC aYV -cuf +kDj rpN vzd ipn @@ -105530,7 +105364,7 @@ bLK gXs oSu oSu -hSt +haj oSu lTm cnb @@ -105548,8 +105382,8 @@ ktF bRK csM kcM -xth -kcM +xnu +nxu lMW cua awo @@ -105565,12 +105399,12 @@ tBH cvk mkj mkj -mXg -ruF -kUg -mkj mkj mkj +kUg +ruF +vHk +wfM mkj exU pwt @@ -105739,7 +105573,7 @@ gMi sKo ncd aYV -cuf +kDj cOt uwZ sHB @@ -105996,7 +105830,7 @@ tgj djY hUm aYV -xPB +kDj nEu uwZ kve @@ -106253,7 +106087,7 @@ vpD hUm hUm bcs -aYV +kDj uYQ bok bok @@ -106510,7 +106344,7 @@ xEO hUm ryN aYV -aYV +kDj aYV bok tHI @@ -106558,8 +106392,8 @@ bNd bNd bNd bNd -gcZ -lOa +kOf +bAw bxa cfj rAw @@ -106767,7 +106601,7 @@ sFx hUm eTm aYV -aYV +kDj aYV fqJ jqO @@ -106815,8 +106649,8 @@ hjj cFU lgX bNd -kOf -bAw +gbg +iFG eVB cfj bsp @@ -107024,7 +106858,7 @@ vZl hUm hUm aYV -aYV +kDj aYV bok krR @@ -107281,7 +107115,7 @@ nvw dUI uzW qSd -aYV +eFO aYV bok cQf @@ -107598,7 +107432,7 @@ xVv rVz cqs mVg -aCs +nUH dEO cfj cfj @@ -108797,7 +108631,7 @@ fpV alP awE bSD -aqA +opw aAM cVb uYF @@ -109052,7 +108886,7 @@ aag oXN mCd ulG -xWy +aBf qCJ xWy pAd @@ -109337,7 +109171,7 @@ dnm mkR aIp aYV -aYV +bnT aYV gdS xJf @@ -109348,7 +109182,7 @@ cTO jLS ied tci -jLS +fWD jLS ofM but @@ -109594,7 +109428,7 @@ sfk buE bBr aYV -aYV +cuf aYV eHr xJf @@ -109851,7 +109685,7 @@ maS oHH aIP aYV -aYV +cuf aYV aBC xJf @@ -109859,7 +109693,7 @@ vUD bpL vWb tjd -uSR +bpL bpL bre jLS @@ -110107,8 +109941,8 @@ tDx jOt buE jnV -tqW -oVr +aYV +cuf bez nCl xJf @@ -110158,10 +109992,10 @@ eMZ wdF ciH vtT -hZN -fWD +uYp +uYp ktb -cOe +lSa vwb xnx cNW @@ -110341,12 +110175,12 @@ anf alP awH ajY -anf +aBF apE fyV alP awG -gYi +gTc anf mGN aIp @@ -110365,7 +110199,7 @@ nDK hxy aIp aYV -mNB +cuf sYn xJf xJf @@ -110673,8 +110507,8 @@ iIE wFn mpr rex -nPi -lQb +hUb +hUb hQf aag aaa @@ -111409,7 +111243,7 @@ box eek eao byf -bzu +cVd mKv bzu bDb @@ -112469,7 +112303,7 @@ chu tGp aaf cOT -uKv +bEv cAa cOT aaa @@ -112715,7 +112549,7 @@ bUf bTc bRX bTc -bUf +wUU bTc bRX bTc @@ -112963,16 +112797,16 @@ bJN bJN vmb dOL -bMi -bMi +pDB +pDB qtI -bRZ -bMi -bMi +vUf +pDB +pDB bVk -bRZ -bMi -bMi +vUf +pDB +msB bZb bRZ bMi @@ -113448,9 +113282,9 @@ aYW aYW ljk aFu -aYV -aXq -aYV +mkg +cfu +mkg bfV bfV jBP @@ -113507,7 +113341,7 @@ aaa aaa uRq cOT -oyU +cOT cOT aag aaa @@ -114278,7 +114112,7 @@ cNW cNW cNW cOe -lSa +cOe ahO cOT aaa @@ -114477,7 +114311,7 @@ ijs aCR aCR bcs -aXq +uLK aYV eZA bfV @@ -114532,10 +114366,10 @@ cNW cNW cNW cNW -msB +cOe ezz -uFg -bZR +cOe +cOe cOe cOT aaa @@ -114734,7 +114568,7 @@ aRS aCP aCR wsh -aXq +ueT aYV xaE bhA @@ -114742,7 +114576,7 @@ biR xFZ bjZ bvx -eek +geT boM bzE bsX @@ -114784,12 +114618,12 @@ gjW ofL mkF sKq -wUU +cnG tEp aVg -wUU +cnG hvG -mMM +rVB cNW cOe cOe @@ -114991,8 +114825,8 @@ aRS aFz vke aYV -aXq -bez +yaU +rme haa rJJ bvD @@ -115045,7 +114879,7 @@ cNW cOx cBL bMB -cOe +lSa cvO cNW cNW @@ -115248,7 +115082,7 @@ aRS aRS vke aYV -aXq +qEI sYn gHi bhA @@ -115505,7 +115339,7 @@ aRS aRS vke aYV -aXq +qEI sYn ulX bgc @@ -115762,7 +115596,7 @@ cUE aRS vke aYV -aXq +qEI sYn eZA vBt @@ -116019,7 +115853,7 @@ kXl aRS vke aYV -aXq +sGq sYn eZA qWu @@ -117047,7 +116881,7 @@ mrj aCR aCR msy -bdy +eiI qcK bgc bhF @@ -117586,7 +117420,7 @@ bFW rYJ rYJ bKa -xQE +nHE bMz cQR bOH @@ -117609,7 +117443,7 @@ aSI cNW uIa jVl -ciL +lSa ceR cBL jYZ @@ -117813,7 +117647,7 @@ spm xFo xFo xFo -xFo +rRY fJy aPq aPq @@ -117843,7 +117677,7 @@ bEA voe iEl rpg -krJ +tHi iDZ dCW tKj @@ -118071,11 +117905,11 @@ aPq aPq dud fAA -wfM -sxY -sxY -iRk -cxB +dud +aPq +aPq +scX +cBl aPq cNP aNa @@ -118357,11 +118191,11 @@ bEC bEC gik bEC -dGF -dGF -dGF -dGF -dGF +bEC +bEC +bEC +bEC +bEC dMZ nWo bFU @@ -118588,7 +118422,7 @@ sPP ixj aPq aPq -scX +uSR aPq aNa aNa @@ -118617,7 +118451,7 @@ bKc cNW bMB bNA -cOe +lSa bEC eZz flc @@ -118635,8 +118469,8 @@ cOe cOe cOe cNW -cOe -vYY +weH +ktL nDl cjD urW @@ -118845,7 +118679,7 @@ aPq aPq aPq aPq -scX +aPq aPq aNa aaf @@ -119101,9 +118935,9 @@ dud dud dud aPq -gXk +aPq hwO -kDF +aPq aNa aaa aaf @@ -119122,8 +118956,8 @@ hig gxO llC kch -btp -aCJ +iHt +oVr bky qif eLz @@ -119147,7 +118981,7 @@ pTa goX gjW gjW -pAE +goX pTa gjW gCL @@ -119408,8 +119242,8 @@ gEs cNW cNW cNW -cNW -cjD +cGD +xKk cjD cjD cjD @@ -119661,13 +119495,13 @@ ahO cNW cOe cOe -lSa +cOe cOe ahY cNW -aaa -aaa -aaa +hUb +cjb +cNW aaf aaf aaf @@ -119918,13 +119752,13 @@ cOe cNW cOe cOe -lSa +cOe cOe cOe cNW -aaa -aaf -aaa +kQq +cNW +cNW aaa aaa aaf @@ -120175,12 +120009,12 @@ cOe cNW cOe cOe -lSa +cOe cOe cOe cNW -aaa -aaf +uRq +aag aaf aaa aaf @@ -120432,11 +120266,11 @@ cOT cNW cNW cNW -bIm cNW cNW cNW -aaa +cNW +uRq aaf aaf aaa @@ -120662,7 +120496,7 @@ xcE ict hjM uyV -hXz +pqr cRa gQd atS @@ -120688,9 +120522,9 @@ aaf aaf aaf aaf -cNW -xRo -cNW +aaa +aaa +aaa aaa aaa aaa @@ -120917,9 +120751,9 @@ uAc xkR duR jjp -kVh +jjp tJF -qOj +pqr ezu gQd aaf @@ -120945,9 +120779,9 @@ aaf aaa aaa aaf -cNW -fwG -cNW +gXs +gXs +gXs aaf aaf aaf @@ -121202,9 +121036,9 @@ aaf aaa aaa aaf -aag -aag -aag +gXs +gXs +aaf aaf aaa aaa @@ -121460,7 +121294,7 @@ aaa aaa aaa aaa -aag +aaf aaa aaa aaa diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index c212980a491d8..26ebb07e13133 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -54,6 +54,12 @@ locked = 0; on = 0 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "aan" = ( @@ -67,18 +73,18 @@ /turf/open/floor/iron/freezer, /area/medical/genetics) "aap" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "aar" = ( @@ -87,7 +93,7 @@ /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "aaz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -100,12 +106,6 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/delivery/red, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; @@ -117,7 +117,7 @@ /turf/open/floor/iron/dark, /area/security/prison) "aaG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -125,24 +125,19 @@ /turf/open/floor/engine, /area/engine/engine_room) "aaQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) -"aaV" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/space/basic, -/area/space/nearstation) -"aaX" = ( -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) +"aaX" = ( +/obj/item/kirbyplants/random, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/bridge) @@ -154,16 +149,6 @@ }, /turf/open/floor/plating, /area/security/nuke_storage) -"abg" = ( -/obj/machinery/door/airlock/external{ - name = "Bridge External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "abm" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -178,23 +163,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/bar) "abp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /turf/open/floor/iron/dark, /area/medical/surgery) "abq" = ( @@ -216,9 +195,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "abL" = ( @@ -238,9 +217,12 @@ /turf/open/floor/iron/white, /area/medical/storage) "abT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "acj" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -269,6 +251,22 @@ }, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) +"acq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "acA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -312,9 +310,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/light/small{ dir = 1 }, @@ -352,8 +347,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/siding/white, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "adB" = ( @@ -365,10 +362,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage_shared) "adH" = ( @@ -386,13 +383,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -401,12 +398,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "adX" = ( @@ -416,29 +412,14 @@ }, /turf/open/floor/engine, /area/engine/engine_room) -"adY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/white, -/area/science/misc_lab/range) -"aeg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/science/shuttle) "aew" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 4; - name = "Gas to Filter" - }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Chamber" + }, /turf/open/floor/engine, /area/engine/supermatter) "aeA" = ( @@ -457,9 +438,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -469,6 +447,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "aeF" = ( @@ -486,10 +470,10 @@ /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -530,12 +514,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "afo" = ( @@ -548,24 +526,12 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"afr" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron/freezer, -/area/security/prison) "afz" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/dorms) "afO" = ( /obj/effect/landmark/start/bartender, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -585,12 +551,19 @@ dir = 1; name = "Engine to Space Loop" }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "agg" = ( /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "agn" = ( @@ -603,9 +576,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; @@ -634,10 +604,14 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "agE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -654,12 +628,12 @@ /area/engine/engine_room) "agK" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/engine/engine_room) "agL" = ( @@ -672,7 +646,7 @@ /obj/structure/window/plasma/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/circuit/green, /area/engine/supermatter) "agQ" = ( @@ -682,30 +656,27 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "agS" = ( /obj/machinery/computer/bank_machine, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "agY" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/aft) +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "ahc" = ( /obj/machinery/camera/directional/west, /obj/effect/turf_decal/tile/yellow{ @@ -723,22 +694,24 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "ahi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hydroponics) "ahk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/crew_quarters/bar) "ahy" = ( @@ -761,6 +734,12 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "aif" = ( @@ -769,7 +748,7 @@ /obj/structure/sign/warning/explosives{ pixel_x = -32 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "aik" = ( /obj/effect/turf_decal/stripes/line{ @@ -778,12 +757,12 @@ /turf/open/floor/iron, /area/engine/atmos) "ail" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/machinery/light, /turf/open/floor/engine, /area/engine/engine_room) "aio" = ( -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/engine/engine_room) "aip" = ( @@ -795,10 +774,16 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/quartermaster/office) "aiv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -814,20 +799,8 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engine_room) -"aiC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/heads/captain) "aiE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/line, @@ -843,7 +816,7 @@ /turf/open/space/basic, /area/space) "aiN" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/engine, @@ -861,18 +834,16 @@ /obj/machinery/door/airlock/external{ name = "Exploration Shuttle Bay" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "aiS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall28"; location = "hall27" }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) "aiX" = ( @@ -900,26 +871,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/engine_room) -"ajd" = ( -/obj/structure/chair/fancy/bench/right{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/prison, -/area/security/prison) "aje" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/iron, -/area/security/brig/dock) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "ajf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -927,7 +890,13 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Gas to Mix" }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "ajl" = ( /obj/effect/turf_decal/delivery, @@ -966,10 +935,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "ajU" = ( @@ -1027,12 +992,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/prison, /area/security/prison) "akF" = ( @@ -1046,10 +1005,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/space/basic, @@ -1058,12 +1017,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, @@ -1082,7 +1035,6 @@ /turf/open/floor/engine, /area/engine/engine_room) "akW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/camera/directional/west, /turf/open/floor/iron/white, /area/crew_quarters/bar) @@ -1108,7 +1060,7 @@ /turf/open/floor/iron, /area/security/courtroom) "alJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /turf/open/floor/engine, @@ -1143,21 +1095,17 @@ }, /turf/open/floor/plating, /area/bridge) -"ama" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "amk" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, -/area/engine/supermatter) +/area/engine/engine_room) "aml" = ( /obj/machinery/conveyor/inverted{ dir = 9; @@ -1173,12 +1121,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1187,6 +1129,12 @@ req_access_txt = "3"; security_level = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/ai_monitored/security/armory) "amz" = ( @@ -1206,7 +1154,7 @@ icon_state = "1-2" }, /obj/effect/landmark/start/warden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -1244,26 +1192,26 @@ /turf/open/floor/engine, /area/engine/engine_room) "amZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "anc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 6 }, /turf/open/floor/engine, /area/engine/engine_room) "anh" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engine_room) @@ -1291,10 +1239,6 @@ "anC" = ( /turf/open/floor/engine/plasma, /area/engine/atmos) -"anR" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/turf/open/floor/wood, -/area/crew_quarters/bar) "anT" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -1328,6 +1272,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "aor" = ( @@ -1357,34 +1304,42 @@ /turf/open/floor/iron/white, /area/medical/virology) "aoM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) +"aoQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/plating, +/area/hallway/primary/aft) "aoU" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "aoY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, +/turf/open/floor/iron/dark, /area/engine/engine_room) "api" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos, /turf/open/floor/engine, /area/engine/atmospherics_engine) "apk" = ( @@ -1408,14 +1363,13 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Ports" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "apt" = ( /obj/machinery/computer/cryopod{ @@ -1467,7 +1421,7 @@ /turf/open/floor/plating/airless, /area/science/test_area) "aqb" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/engine, @@ -1478,14 +1432,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"aql" = ( -/obj/machinery/door/airlock/external{ - name = "MiniSat External Access"; - req_one_access_txt = "65;61" - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/iron, -/area/ai_monitored/turret_protected/aisat/foyer) "aqt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1493,11 +1439,12 @@ /obj/machinery/requests_console{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "aqG" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/closed/wall/r_wall, @@ -1506,7 +1453,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine, @@ -1527,6 +1474,13 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"aqV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "arh" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -1535,11 +1489,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "ari" = ( /obj/machinery/ore_silo, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -1558,14 +1515,6 @@ /obj/machinery/camera/directional/east, /turf/open/floor/dock/drydock, /area/science/shuttle) -"arC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "arH" = ( /obj/structure/sign/warning/nosmoking{ pixel_x = -32 @@ -1589,7 +1538,7 @@ /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c500, /obj/item/gun/ballistic/automatic/pistol/deagle, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "arJ" = ( /turf/open/floor/iron, @@ -1613,9 +1562,8 @@ /turf/open/floor/iron, /area/maintenance/fore) "asD" = ( -/obj/machinery/atmospherics/components/binary/volume_pump/on{ +/obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; - icon_state = "volpump_on_map-2"; name = "Gas to Filter" }, /turf/open/floor/engine, @@ -1625,16 +1573,16 @@ /turf/open/floor/engine, /area/engine/supermatter) "asK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/engine_room) "atb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, /turf/open/floor/engine, /area/engine/engine_room) "atl" = ( @@ -1670,7 +1618,7 @@ /turf/open/floor/iron/dark, /area/bridge) "atE" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -1683,7 +1631,7 @@ /turf/open/floor/iron/dark, /area/engine/storage_shared) "atH" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -1710,13 +1658,16 @@ /turf/open/floor/carpet/red, /area/security/detectives_office) "auo" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/engine/atmos) "aus" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1729,7 +1680,13 @@ icon_state = "4-8" }, /obj/machinery/light, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "auG" = ( /obj/structure/cable{ @@ -1754,7 +1711,7 @@ /area/hallway/secondary/entry) "auU" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, @@ -1777,16 +1734,6 @@ }, /turf/open/floor/plating, /area/engine/engine_room) -"avl" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/port) "avp" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/structure/window/reinforced/spawner{ @@ -1796,12 +1743,12 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "avt" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 + }, /turf/open/floor/engine, /area/engine/engine_room) "avI" = ( @@ -1816,11 +1763,19 @@ luminosity = 2 }, /area/science/test_area) -"awb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"avW" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) +"awb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "awf" = ( @@ -1839,27 +1794,21 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/white, /area/science/research) "awq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "aws" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -1872,6 +1821,10 @@ /obj/structure/disposalpipe/sorting/mail/destination/testing_range/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/science) "awJ" = ( @@ -1879,12 +1832,6 @@ /turf/open/floor/plating, /area/crew_quarters/cryopods) "awK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/firealarm/directional/north, /turf/open/floor/prison/dark, /area/security/prison) @@ -1927,7 +1874,7 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "axl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "axn" = ( @@ -1952,7 +1899,9 @@ /turf/open/floor/engine, /area/engine/engine_room) "axI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -1989,7 +1938,7 @@ /turf/open/floor/iron, /area/quartermaster/storage) "ayp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/chair/office{ dir = 8 }, @@ -2012,12 +1961,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -2047,13 +1990,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"azd" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engine_room) "azh" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2073,9 +2009,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -2118,10 +2051,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/storage) "azZ" = ( @@ -2138,7 +2071,7 @@ /turf/open/space/basic, /area/space) "aAe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/closed/wall/r_wall, @@ -2187,7 +2120,6 @@ /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Dock" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/hallway/primary/fore) "aAP" = ( @@ -2200,7 +2132,7 @@ /turf/open/floor/plating, /area/engine/engine_room) "aBa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/lattice/catwalk, @@ -2270,7 +2202,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/floor/engine, /area/engine/engine_room) "aCr" = ( @@ -2327,17 +2259,24 @@ /turf/open/floor/plating, /area/engine/engine_room) "aDb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) +"aDg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "aDm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2353,10 +2292,7 @@ /turf/open/floor/engine, /area/engine/engine_room) "aDt" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2364,6 +2300,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/engine, /area/engine/engine_room) "aDz" = ( @@ -2422,6 +2361,12 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/security/checkpoint/engineering) +"aDR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "aDT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2435,10 +2380,10 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -2455,27 +2400,32 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "aEc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hydroponics) -"aEm" = ( +"aEe" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/central) +"aEm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "aEq" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/meter, @@ -2488,16 +2438,26 @@ /turf/closed/wall/r_wall, /area/engine/engine_room) "aEy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aEz" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) +"aED" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/security/brig) "aEU" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/stripes/line{ @@ -2518,7 +2478,13 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "aFn" = ( /turf/closed/wall, @@ -2526,7 +2492,7 @@ "aFr" = ( /obj/structure/window/plasma/reinforced, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/structure/cable, @@ -2582,20 +2548,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"aGK" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "aGN" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -2607,36 +2567,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/chapel{ dir = 9 }, /area/chapel/main/monastery) -"aHc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) "aHj" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/engine/engine_room) "aHm" = ( @@ -2646,7 +2591,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "aHp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/caution{ @@ -2660,7 +2605,7 @@ /turf/open/floor/circuit, /area/science/robotics) "aHE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/engine, @@ -2683,19 +2628,17 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "aHY" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "aHZ" = ( /turf/open/floor/iron/dark, @@ -2739,7 +2682,7 @@ /turf/open/floor/iron, /area/medical/storage) "aIw" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/closed/wall/r_wall, @@ -2756,7 +2699,7 @@ dir = 1 }, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/structure/cable{ @@ -2782,18 +2725,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "aJt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) +/turf/open/floor/iron, +/area/engine/atmos) "aJH" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2807,9 +2756,17 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"aJI" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "aJW" = ( /obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/machinery/power/rad_collector/anchored, @@ -2820,7 +2777,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -2856,7 +2813,7 @@ /turf/open/floor/iron/dark, /area/lawoffice) "aKi" = ( -/obj/machinery/air_sensor/atmos/sm_core, +/obj/machinery/air_sensor/engine_chamber, /turf/open/floor/engine, /area/engine/supermatter) "aKm" = ( @@ -2875,7 +2832,10 @@ /turf/open/floor/iron/white, /area/science/research) "aKv" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "aKx" = ( @@ -2904,6 +2864,12 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "aKQ" = ( @@ -2935,8 +2901,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "aKV" = ( @@ -2952,28 +2919,26 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/security/brig/dock) "aLj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, -/area/science/robotics/lab) -"aLk" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/iron, -/area/engine/atmos) +/area/science/robotics/lab) "aLm" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -2991,6 +2956,8 @@ }, /obj/effect/spawner/lootdrop/glowstick/lit, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "aLL" = ( @@ -3006,8 +2973,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) "aLU" = ( @@ -3018,6 +2985,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "aLW" = ( @@ -3068,9 +3037,6 @@ /area/crew_quarters/fitness/recreation) "aMw" = ( /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -3096,7 +3062,7 @@ /turf/open/floor/plating, /area/quartermaster/storage) "aNc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, @@ -3119,8 +3085,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -3141,7 +3105,7 @@ /turf/closed/wall, /area/engine/atmos) "aNJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -3156,7 +3120,7 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "aNQ" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/engine, @@ -3178,15 +3142,16 @@ /turf/open/floor/dock/drydock, /area/science/shuttle) "aNW" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 }, +/obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, /area/engine/engine_room) "aOd" = ( /obj/structure/window/plasma/reinforced, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/structure/cable, @@ -3198,13 +3163,6 @@ }, /turf/open/floor/engine, /area/engine/engine_room) -"aOz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/engine/atmos) "aOL" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/effect/turf_decal/tile/green{ @@ -3214,10 +3172,16 @@ /area/medical/virology) "aOM" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron, /area/bridge) "aON" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating/asteroid, @@ -3269,26 +3233,29 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 10 }, /turf/open/floor/engine, /area/engine/engine_room) "aPr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/quartermaster/storage) +/area/hallway/primary/aft) "aPu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/science) "aPv" = ( @@ -3304,15 +3271,10 @@ /obj/structure/table/reinforced, /obj/item/knife/kitchen, /obj/item/food/chocolatebar, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "aPF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3330,8 +3292,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "aPI" = ( @@ -3350,9 +3312,6 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "aPU" = ( @@ -3370,6 +3329,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "aQh" = ( @@ -3379,7 +3341,6 @@ /turf/open/floor/plating/airless, /area/science/test_area) "aQi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/item/radio/intercom{ pixel_x = -26 }, @@ -3387,6 +3348,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "aQl" = ( @@ -3394,14 +3359,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/security/brig) @@ -3432,18 +3397,25 @@ /turf/open/floor/plating, /area/quartermaster/storage) "aQO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/bar) +"aQP" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "aQQ" = ( /obj/structure/table/wood, /obj/item/pneumatic_cannon/pie, @@ -3456,7 +3428,7 @@ /turf/open/floor/engine, /area/engine/engine_room) "aQX" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /turf/open/floor/engine, @@ -3472,12 +3444,11 @@ /turf/open/floor/iron, /area/engine/atmos) "aRk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "aRr" = ( @@ -3487,7 +3458,7 @@ /turf/open/floor/engine, /area/engine/engine_room) "aRt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -3499,15 +3470,15 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aRB" = ( -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "aRI" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engine_room) "aRJ" = ( @@ -3534,10 +3505,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/ore_box, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/brown, @@ -3563,18 +3530,21 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "aSc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/engine, /area/engine/engine_room) "aSe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/lawoffice) "aSi" = ( @@ -3589,24 +3559,29 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"aSo" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hydroponics) "aSA" = ( /obj/structure/window/plasma/reinforced{ dir = 1 }, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/structure/cable{ icon_state = "0-2" }, /turf/open/floor/circuit/green, /area/engine/supermatter) "aSC" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/hallway/primary/fore) "aSU" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -3615,6 +3590,12 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/security/main) "aTc" = ( @@ -3627,7 +3608,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -3644,9 +3628,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engine_smes) "aTq" = ( @@ -3677,6 +3661,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "aTI" = ( @@ -3690,20 +3680,18 @@ /turf/closed/wall, /area/engine/storage_shared) "aTY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/door/airlock/external{ + name = "Bridge External Access"; + req_access_txt = "10;13" }, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/turf/open/floor/iron/dark, +/area/bridge) "aUa" = ( /obj/structure/window/reinforced/spawner{ dir = 1 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -3720,7 +3708,7 @@ /area/maintenance/fore) "aUc" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/plating, @@ -3734,29 +3722,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/port) -"aUn" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/item/radio/intercom{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "aUr" = ( /obj/structure/transit_tube{ dir = 8 @@ -3787,13 +3758,6 @@ }, /turf/open/floor/plating, /area/engine/engine_room) -"aUP" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/shuttle) "aUQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -3835,7 +3799,6 @@ /turf/open/floor/iron/white, /area/science/lab) "aVH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera{ dir = 6 }, @@ -3852,13 +3815,13 @@ /turf/open/floor/iron/dark, /area/engine/engine_smes) "aVT" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/engine, /area/engine/engine_room) "aVV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "aWc" = ( @@ -3895,9 +3858,6 @@ /turf/open/floor/plating, /area/security/main) "aWm" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/hallway/primary/central) @@ -3909,15 +3869,6 @@ "aWt" = ( /turf/open/floor/iron, /area/engine/atmos) -"aWu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "aWA" = ( /obj/structure/table, /obj/item/paper_bin, @@ -3925,7 +3876,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "aWF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3935,8 +3886,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/ai_slipper{ @@ -3955,15 +3906,15 @@ /turf/open/floor/plating, /area/maintenance/port) "aWR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "aWW" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -4001,15 +3952,16 @@ /turf/open/space/basic, /area/space) "aXu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = -24 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "aXD" = ( @@ -4038,47 +3990,36 @@ /turf/open/floor/iron/dark, /area/engine/engine_smes) "aYd" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, /area/engine/engine_room) "aYe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 6 }, /turf/open/floor/engine, /area/engine/engine_room) "aYg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/engine, /area/engine/engine_room) -"aYi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "aYk" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/loading_area{ dir = 8 }, @@ -4093,7 +4034,7 @@ /turf/open/floor/iron/dark, /area/security/main) "aYv" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/meter, @@ -4103,22 +4044,24 @@ /obj/machinery/door/airlock/external{ name = "Escape Airlock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "aYL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "aYN" = ( @@ -4134,6 +4077,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engine_room) "aYR" = ( @@ -4146,12 +4092,20 @@ /turf/closed/wall, /area/crew_quarters/kitchen) "aYX" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port) "aZd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -4161,6 +4115,16 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"aZg" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hydroponics) "aZj" = ( /obj/effect/turf_decal/caution/red{ dir = 1; @@ -4172,6 +4136,14 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"aZs" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/security/prison) "aZy" = ( /turf/open/floor/iron, /area/quartermaster/storage) @@ -4183,13 +4155,13 @@ /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "aZH" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine, /area/engine/engine_room) "aZI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, @@ -4200,7 +4172,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aZS" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, /turf/open/floor/engine, @@ -4209,17 +4181,14 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "bai" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/bridge) +/turf/open/floor/iron, +/area/engine/engineering) "baA" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, @@ -4246,7 +4215,6 @@ /turf/open/floor/plating, /area/maintenance/fore) "bbq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/lab) @@ -4272,11 +4240,8 @@ /area/security/brig/medbay) "bck" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron/dark, /area/medical/surgery) @@ -4299,8 +4264,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -4318,6 +4283,18 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/medical/genetics/cloning) +"bcJ" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "bdf" = ( /obj/structure/rack, /obj/item/circuitboard/computer/aiupload, @@ -4334,7 +4311,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -4364,9 +4341,13 @@ /area/hallway/primary/aft) "bdH" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) "bdQ" = ( @@ -4390,16 +4371,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) -"bei" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "bew" = ( /obj/structure/bed{ dir = 4 @@ -4425,6 +4396,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "bfe" = ( @@ -4441,26 +4418,49 @@ "bfm" = ( /turf/closed/wall, /area/medical/morgue) +"bfG" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "bfN" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bfQ" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "bfS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/quartermaster/office) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/chapel{ + dir = 5 + }, +/area/chapel/main/monastery) "bfU" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -4479,16 +4479,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/security/execution/education) -"bgd" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) "bgr" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -4541,7 +4531,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -4551,6 +4540,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "bhl" = ( @@ -4623,9 +4614,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/quartermaster/storage) @@ -4660,11 +4648,15 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "biz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "biK" = ( @@ -4685,18 +4677,22 @@ /turf/open/floor/plating, /area/maintenance/fore) "bjl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "bjq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "bjt" = ( /obj/machinery/light{ dir = 1 @@ -4711,7 +4707,6 @@ name = "Captain's Quarters"; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood/end{ dir = 1 @@ -4727,7 +4722,7 @@ /area/hallway/primary/starboard) "bjA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 + dir = 8 }, /turf/open/floor/iron/dark, /area/lawoffice) @@ -4735,10 +4730,11 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "bjI" = ( @@ -4761,19 +4757,19 @@ /obj/structure/sign/poster/official/no_erp{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "bjT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/chapel{ @@ -4785,11 +4781,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "bla" = ( @@ -4799,6 +4793,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "bld" = ( @@ -4832,7 +4828,6 @@ /turf/open/floor/iron, /area/security/warden) "blI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green{ dir = 8 @@ -4869,7 +4864,6 @@ /turf/open/floor/plating, /area/quartermaster/office) "blP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -4917,13 +4911,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage) "bmR" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -4961,7 +4955,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/robotics/lab) @@ -4972,16 +4965,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "boI" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -4990,7 +4983,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "bpn" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -4998,14 +4991,14 @@ /turf/open/floor/iron/dark/telecomms, /area/science/xenobiology) "bpq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/iron/white, /area/science/mixing) @@ -5024,7 +5017,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "bpU" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, @@ -5033,18 +5026,27 @@ /obj/machinery/vending/boozeomat, /turf/closed/wall, /area/maintenance/port) +"bqa" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/security/prison) "bql" = ( /obj/structure/window/reinforced/spawner{ dir = 4 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "bqm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/chair/stool, @@ -5069,21 +5071,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/iron/dark, /area/engine/atmos) "brt" = ( /obj/structure/dresser, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "brJ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -5094,7 +5090,7 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "brS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "brY" = ( @@ -5105,19 +5101,18 @@ /turf/open/floor/iron/dark, /area/security/brig) "bsc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/machinery/door/airlock/public/glass{ name = "Cell Showers" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/security/prison) "bse" = ( /obj/structure/chair/fancy/sofa/old/left, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "bsr" = ( @@ -5129,6 +5124,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"bsA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/aft) "bsB" = ( /obj/item/radio/intercom{ pixel_y = 24 @@ -5154,8 +5155,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) "btd" = ( @@ -5169,7 +5170,7 @@ /area/maintenance/starboard/central) "btt" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/space/basic, @@ -5195,6 +5196,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "but" = ( @@ -5214,6 +5221,8 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "buD" = ( @@ -5248,14 +5257,12 @@ "bvg" = ( /obj/structure/flora/ausbushes/pointybush, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "bvo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = 1; pixel_y = 28 @@ -5263,6 +5270,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/science/shuttle) "bvp" = ( @@ -5281,8 +5289,8 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "bvw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -5294,9 +5302,6 @@ /turf/open/floor/iron, /area/engine/atmos) "bvI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5309,11 +5314,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron, /area/medical/cryo) @@ -5329,7 +5334,7 @@ req_access_txt = "65" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -5343,9 +5348,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bwq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/door/poddoor/shutters/preopen{ id = "atmos"; name = "Atmospherics Lockdown" @@ -5356,10 +5359,12 @@ name = "Atmospherics Lockdown"; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/atmos) "bwW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/button/door{ id = "engsm"; name = "Radiation Shutters"; @@ -5374,13 +5379,21 @@ /turf/open/floor/iron, /area/science/shuttle) "bxE" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "bxI" = ( /turf/closed/wall, /area/storage/tools) +"bxO" = ( +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/hydroponics) "bya" = ( /obj/structure/chair/office{ dir = 1 @@ -5418,51 +5431,26 @@ /turf/open/floor/iron, /area/security/brig/dock) "byI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/engine_room) "byS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/turf/open/floor/iron, -/area/hallway/primary/aft) +/turf/open/floor/carpet/grimy, +/area/chapel/office) "byT" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/table, /obj/item/storage/belt/medical{ pixel_y = 2 }, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/white, /area/medical/virology) -"byW" = ( -/obj/structure/chair/fancy/comfy{ - color = "#666666"; - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood, -/area/library) "bzd" = ( /obj/structure/transit_tube/crossing{ dir = 1 @@ -5481,10 +5469,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light{ @@ -5500,8 +5488,8 @@ /area/hallway/secondary/exit) "bzS" = ( /obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/engine/storage_shared) @@ -5524,16 +5512,6 @@ /obj/effect/landmark/start/librarian, /turf/open/floor/carpet/green, /area/library) -"bAG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "bAY" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -5549,8 +5527,6 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "bBp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -5560,24 +5536,29 @@ req_access_txt = null; req_one_access_txt = "1;4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "bBq" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /turf/open/floor/plating, /area/science/xenobiology) "bBs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "bBx" = ( @@ -5590,7 +5571,6 @@ /turf/open/floor/plating, /area/maintenance/port/central) "bBz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall8"; location = "hall7" @@ -5646,8 +5626,6 @@ name = "Quartermaster's Office"; req_access_txt = "41" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -5655,6 +5633,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/qm) "bCP" = ( @@ -5671,16 +5651,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/machinery/light_switch{ pixel_x = -25; pixel_y = -25 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/iron, /area/medical/cryo) "bCW" = ( @@ -5705,9 +5682,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -5719,6 +5693,10 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"bDS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "bDY" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -5729,20 +5707,11 @@ /turf/open/floor/iron/white, /area/crew_quarters/toilet) "bEe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) -"bEw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/department/science) "bEy" = ( /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -5762,7 +5731,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -5778,8 +5747,8 @@ dir = 4 }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "bEI" = ( @@ -5814,9 +5783,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/security/detectives_office) @@ -5835,6 +5801,9 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "bGf" = ( @@ -5848,24 +5817,6 @@ /obj/effect/loot_jobscale/armoury/riot_helmet, /turf/open/floor/iron, /area/ai_monitored/security/armory) -"bGh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/atmos) "bGn" = ( /obj/machinery/light_switch{ pixel_y = -24 @@ -5875,7 +5826,7 @@ }, /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/mapping_helpers/atmos_auto_connect, -/turf/open/floor/iron/dark/telecomms, +/turf/open/floor/iron/dark, /area/tcommsat/relay) "bGs" = ( /obj/effect/turf_decal/tile/red{ @@ -5914,11 +5865,20 @@ /obj/machinery/holopad, /turf/open/floor/iron/white, /area/medical/storage) +"bGD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/medical/morgue) "bGE" = ( /obj/machinery/holopad{ pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -5947,16 +5907,16 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/port) "bGR" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -5966,25 +5926,24 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/storage/tools) "bHe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -5995,6 +5954,8 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "bHh" = ( @@ -6008,9 +5969,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "bHy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, /area/engine/atmos) "bHA" = ( /obj/structure/cable/yellow{ @@ -6022,6 +5984,12 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "bHJ" = ( @@ -6039,16 +6007,10 @@ /turf/open/floor/iron/dark, /area/security/main) "bHM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/holopad, /turf/open/floor/wood, /area/library) "bHN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -6065,10 +6027,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "bIn" = ( @@ -6087,22 +6048,17 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "bII" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/toilet) "bIT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -6114,6 +6070,8 @@ name = "Security Dock"; req_one_access_txt = "1;4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "bIX" = ( @@ -6144,22 +6102,13 @@ dir = 4 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "bKa" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/machinery/light/small, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/science/shuttle) "bKn" = ( @@ -6190,8 +6139,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bKV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron/white, /area/science/misc_lab/range) @@ -6224,39 +6173,41 @@ /turf/open/floor/wood, /area/maintenance/port) "bLp" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "bLw" = ( /obj/structure/dresser, /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "bLx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "bLy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/iron, +/area/hallway/primary/fore) "bLB" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -6264,9 +6215,6 @@ "bLE" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -6292,21 +6240,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/secondary/command) "bMa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "bMw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -6320,9 +6268,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "bMC" = ( @@ -6375,9 +6323,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -6415,9 +6366,6 @@ /turf/closed/wall, /area/hallway/secondary/exit) "bOi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old/right{ dir = 1 }, @@ -6441,9 +6389,6 @@ /area/maintenance/department/chapel/monastery) "bOr" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/crew_quarters/bar) "bOu" = ( @@ -6456,8 +6401,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -6509,10 +6452,7 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "bPk" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -6521,10 +6461,13 @@ /obj/machinery/holopad{ pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "bPu" = ( @@ -6577,15 +6520,6 @@ /obj/machinery/camera/directional/east, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"bQz" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "bQB" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, @@ -6636,21 +6570,10 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"bRv" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/storage) "bRV" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -6692,12 +6615,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bSn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -6714,26 +6640,26 @@ /turf/open/floor/iron/dark, /area/chapel/office) "bSu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "bSy" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "bSD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "bSH" = ( /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "bSM" = ( @@ -6747,9 +6673,14 @@ /turf/open/floor/iron/dark, /area/security/main) "bSP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/security/courtroom) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engine/engine_room) "bSR" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/firealarm/directional/east{ @@ -6769,15 +6700,11 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/aft) -"bSW" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +"bSY" = ( +/obj/machinery/atmospherics/components/tank/air, +/turf/open/floor/plating, +/area/hallway/primary/aft) "bTc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/mirror{ pixel_y = 29 }, @@ -6794,7 +6721,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -6804,6 +6731,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/storage) "bTr" = ( @@ -6837,16 +6770,9 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "bTU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output, /turf/open/floor/engine/o2, /area/engine/atmos) -"bUf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) "bUj" = ( /obj/structure/chair/office/light{ dir = 8; @@ -6868,7 +6794,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, @@ -6894,7 +6819,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -6907,6 +6832,18 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "bWu" = ( @@ -6930,12 +6867,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/junction{ dir = 2 }, @@ -6945,6 +6876,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/office) "bWV" = ( @@ -6997,9 +6930,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7008,22 +6938,30 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/hallway/secondary/command) "bXn" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "bXq" = ( @@ -7044,22 +6982,21 @@ /turf/open/floor/iron/white, /area/crew_quarters/bar) "bXs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/structure/sign/departments/minsky/medical/chemistry/chemical2{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/science/xenobiology) "bXu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/disposalpipe/sorting/mail/destination/hydroponics/flip{ dir = 2 @@ -7079,6 +7016,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "bXX" = ( @@ -7109,6 +7052,11 @@ }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) +"bZd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/chemistry) "bZj" = ( /obj/structure/window/reinforced/spawner, /obj/machinery/computer/security/hos{ @@ -7149,15 +7097,18 @@ /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "cap" = ( @@ -7171,21 +7122,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/mixing) "caC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "caF" = ( /obj/machinery/door/airlock/external{ @@ -7217,6 +7168,8 @@ name = "Evidence Closet 5" }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "caX" = ( @@ -7227,11 +7180,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/office) "cbg" = ( @@ -7243,18 +7196,22 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/customs) -"cbo" = ( -/obj/structure/cable/white{ - icon_state = "1-2" +"cbl" = ( +/obj/structure/sign/warning/docking{ + pixel_x = -32 }, -/obj/machinery/door/airlock/external{ - name = "Solar Panel Airlock"; - req_access_txt = "10" +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/aft) +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/central) "cby" = ( /obj/item/gun/energy/temperature/security{ pixel_y = 6 @@ -7270,6 +7227,12 @@ /obj/item/radio/intercom{ pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "cbL" = ( @@ -7279,22 +7242,18 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"cbN" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "cbQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/carpet/red, /area/security/detectives_office) "cca" = ( @@ -7305,6 +7264,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "ccd" = ( @@ -7312,17 +7277,21 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/medical/virology) +"ccm" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "ccA" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/engine/atmos) "ccF" = ( @@ -7332,11 +7301,12 @@ /turf/open/floor/plating, /area/maintenance/fore) "ccR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/west, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "cdb" = ( @@ -7374,27 +7344,15 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/white, -/area/science/lab) -"cdw" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/turf/open/floor/iron/white, +/area/science/lab) "cdI" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -7416,7 +7374,6 @@ /obj/effect/mapping_helpers/dead_body_placer/medbay_morgue{ bodycount = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/medical/morgue) "ceh" = ( @@ -7426,13 +7383,15 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "ceo" = ( /obj/machinery/power/apc/auto_name/directional/east, @@ -7440,9 +7399,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -7468,6 +7424,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "ceT" = ( @@ -7490,21 +7452,19 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "cfA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "cfL" = ( @@ -7523,13 +7483,30 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"cgp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"cgt" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, -/area/bridge) +/area/security/brig) "cgw" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole{ @@ -7558,17 +7535,17 @@ /area/maintenance/disposal) "cgF" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engine_room) @@ -7598,12 +7575,6 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/starboard) "chs" = ( @@ -7637,7 +7608,6 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) "chL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/sink{ dir = 8; pixel_x = -14; @@ -7670,6 +7640,12 @@ "cik" = ( /turf/closed/wall, /area/security/brig/medbay) +"cin" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "cir" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, @@ -7681,13 +7657,12 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/supply) "cix" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) "ciK" = ( @@ -7702,7 +7677,7 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "cjv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -7714,13 +7689,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/science/robotics/lab) -"cjE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "cjX" = ( /obj/structure/sign/barsign{ pixel_y = 32 @@ -7739,15 +7712,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -7756,13 +7723,14 @@ }, /turf/open/floor/iron, /area/security/prison) -"cky" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) +"ckj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ckO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -7820,12 +7788,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "cmD" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -7837,15 +7803,10 @@ /turf/open/floor/iron, /area/engine/atmos) "cmY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/maintenance/department/science) "cnk" = ( @@ -7866,18 +7827,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -7885,6 +7840,12 @@ name = "Head of Security's Office"; req_access_txt = "58" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "cnx" = ( @@ -7892,15 +7853,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/chemistry) "cny" = ( @@ -7921,16 +7882,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, /area/engine/engineering) "cnI" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -7942,16 +7903,6 @@ }, /turf/open/floor/plating, /area/security/brig/dock) -"cnQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/prison, -/area/security/prison) "cnT" = ( /obj/structure/window/reinforced/spawner{ dir = 1 @@ -7962,6 +7913,17 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"coa" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "cof" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -7972,12 +7934,6 @@ /turf/open/floor/iron, /area/engine/engineering) "com" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -7985,6 +7941,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "coy" = ( @@ -7994,12 +7956,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) -"coF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/courtroom) "coK" = ( /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -8013,13 +7969,11 @@ "cpb" = ( /obj/effect/landmark/start/station_engineer, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "cpe" = ( @@ -8033,9 +7987,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8051,7 +8002,7 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/foyer) "cpQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/power/apc/auto_name/directional/east{ areastring = "/area/engine/supermatter" }, @@ -8103,9 +8054,6 @@ /turf/open/space/basic, /area/space/nearstation) "cra" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/camera/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8113,8 +8061,21 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"cro" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/brig) "crG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8125,18 +8086,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "crW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -8185,22 +8143,13 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal) -"csP" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig) "csS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 8 - }, /obj/machinery/camera/directional/west{ c_tag = "Central Primary Hallway - Fore - Port Corner" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "csV" = ( @@ -8208,24 +8157,23 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "csY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "ctl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "ctw" = ( @@ -8233,9 +8181,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) "ctY" = ( @@ -8251,12 +8198,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/secondary) "cur" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/crew_quarters/toilet) "cus" = ( @@ -8290,21 +8235,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/quartermaster/storage) -"cvq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/science/explab) -"cvs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "cvz" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ @@ -8315,6 +8245,15 @@ "cvP" = ( /turf/closed/wall, /area/maintenance/solars/port/fore) +"cvR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/warehouse) "cwa" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -8333,9 +8272,6 @@ /area/medical/chemistry) "cwm" = ( /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -8344,16 +8280,13 @@ /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "cww" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/sleeper) "cwy" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/engine, @@ -8375,12 +8308,6 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "cxc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -8402,21 +8329,24 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "cxv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "cxO" = ( @@ -8427,12 +8357,15 @@ /turf/open/floor/iron, /area/medical/chemistry) "cxQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "cxY" = ( @@ -8447,9 +8380,6 @@ /turf/open/floor/plating, /area/science/lab) "cyv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/item/radio/intercom{ pixel_x = -26 }, @@ -8460,6 +8390,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "cyB" = ( @@ -8503,13 +8437,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/storage/tools) "czg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "czl" = ( @@ -8529,66 +8468,48 @@ /turf/open/space/basic, /area/space) "cAb" = ( -/obj/structure/chair/fancy/comfy{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 1 }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/turf/open/floor/iron/dark, -/area/chapel/office) +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/engine/atmos) "cAe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "cAu" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/engine/engine_room) -"cAC" = ( -/obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/quartermaster/storage) -"cAH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engine/atmos) "cBa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "cBq" = ( @@ -8610,7 +8531,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/science/central) "cBC" = ( @@ -8653,8 +8575,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -8672,24 +8594,24 @@ /area/crew_quarters/heads/captain) "cCm" = ( /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/engine, +/area/engine/engine_room) "cCs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, @@ -8703,7 +8625,6 @@ /turf/open/floor/iron, /area/science/lab) "cCB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -8727,25 +8648,29 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "cDr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "cDs" = ( @@ -8770,30 +8695,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/prison, /area/security/prison) -"cEb" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plating/asteroid, -/area/maintenance/port) "cEd" = ( /obj/structure/holohoop{ dir = 4 }, /obj/effect/mapping_helpers/tile_breaker, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/security/prison) "cEm" = ( @@ -8808,7 +8716,6 @@ /area/ai_monitored/turret_protected/AIsatextAP) "cFt" = ( /obj/structure/flora/ausbushes/pointybush, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) @@ -8817,6 +8724,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "cFU" = ( @@ -8839,14 +8748,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"cGd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "cGk" = ( /turf/closed/wall/r_wall, /area/engine/storage_shared) "cGq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/atmos) "cGv" = ( @@ -8872,16 +8787,25 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/grimy, /area/chapel/office) "cHl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/computer/shuttle_flight/science{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "cHm" = ( @@ -8918,7 +8842,8 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "cHW" = ( @@ -8926,12 +8851,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "cIa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/medical{ name = "Morgue"; req_access_txt = "6" @@ -8944,6 +8863,12 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/morgue) "cIu" = ( @@ -8983,9 +8908,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/science/robotics) "cJj" = ( @@ -9001,16 +8923,11 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"cJH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "cJI" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "cKt" = ( @@ -9019,9 +8936,6 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /turf/open/floor/iron/white, /area/crew_quarters/toilet) "cKw" = ( @@ -9032,6 +8946,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "cKH" = ( @@ -9047,22 +8967,6 @@ "cKR" = ( /turf/open/floor/carpet/green, /area/crew_quarters/bar) -"cKW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "cKY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9076,10 +8980,10 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -9100,7 +9004,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "cMh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/sign/departments/minsky/medical/medical2{ pixel_x = 32 @@ -9124,6 +9027,8 @@ "cME" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cMF" = ( @@ -9143,17 +9048,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"cMJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "cMT" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -9169,6 +9073,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "cMX" = ( @@ -9215,14 +9121,24 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "cNA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "cNK" = ( @@ -9240,13 +9156,19 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "cNQ" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/bot_white, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/prison/dark, /area/security/prison) "cNR" = ( @@ -9286,14 +9208,6 @@ }, /turf/open/floor/iron/dark, /area/science/explab) -"cOl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) "cOr" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -9302,12 +9216,25 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/medical/sleeper) -"cOz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"cOC" = ( +/obj/machinery/door/airlock/external{ + name = "Supply Dock Airlock"; + req_access_txt = "31" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/exit) +/area/quartermaster/storage) "cOV" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -9334,11 +9261,21 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "cPg" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 4 }, /turf/open/floor/engine/n2o, /area/engine/atmos) +"cPu" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "cPw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -9346,13 +9283,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -9388,22 +9325,23 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "cQx" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/white, -/area/science/misc_lab/range) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "cQS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) -"cRh" = ( -/obj/machinery/airalarm/server{ - pixel_y = 24; - dir = 1 - }, -/turf/open/floor/iron/dark/telecomms, -/area/tcommsat/server) "cRu" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -9419,53 +9357,31 @@ "cRM" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron, -/area/security/brig) -"cSd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/engine, -/area/engine/engine_room) -"cSf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) +/turf/open/floor/iron, +/area/security/brig) "cSs" = ( /turf/closed/wall, /area/maintenance/starboard/central) -"cSx" = ( -/obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"cSG" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron, +/area/hallway/primary/central) "cSO" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -9488,17 +9404,19 @@ /turf/open/floor/iron/dark, /area/security/main) "cTD" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "cTJ" = ( @@ -9523,18 +9441,12 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/engine, /area/engine/engine_room) "cUd" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/security/brig) "cUl" = ( @@ -9544,6 +9456,10 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "cUm" = ( @@ -9567,6 +9483,8 @@ req_one_access_txt = "1;4" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "cUo" = ( @@ -9585,17 +9503,19 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "cUA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/grass, +/area/hydroponics/garden) "cUF" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -9615,12 +9535,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, /obj/effect/turf_decal/tile/green/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "cUU" = ( @@ -9646,6 +9567,13 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/aft) +"cVh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "cVp" = ( /obj/machinery/light/small{ dir = 1 @@ -9653,11 +9581,8 @@ /obj/machinery/status_display/door_timer{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/prison/dark, /area/security/prison) @@ -9667,18 +9592,13 @@ department = "Surgery"; pixel_y = 32 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/medical/surgery) "cVG" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/pipe_dispenser, /obj/item/wrench, @@ -9722,20 +9642,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/medical/sleeper) "cWX" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, @@ -9746,7 +9663,6 @@ /turf/open/floor/plating, /area/science/nanite) "cXp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -9773,13 +9689,27 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "cXO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/robotics/lab) "cXV" = ( @@ -9824,9 +9754,6 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "cZw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "cZB" = ( @@ -9835,7 +9762,6 @@ pixel_x = -5; pixel_y = 14 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -9847,6 +9773,14 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"cZF" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "cZY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -9882,24 +9816,14 @@ /obj/machinery/processor, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"daB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/crew_quarters/bar) "daX" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "dbq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -9918,7 +9842,6 @@ /turf/open/floor/iron/white, /area/medical/storage) "dbu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -9938,15 +9861,18 @@ /area/maintenance/port/central) "dbD" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "dcc" = ( @@ -9958,14 +9884,19 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) +"dcj" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "dcn" = ( /obj/machinery/light_switch{ pixel_x = 1; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "dcp" = ( @@ -10032,9 +9963,6 @@ pixel_y = -28 }, /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/medical/chemistry) @@ -10055,7 +9983,6 @@ /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/trunk{ dir = 2 }, @@ -10068,18 +9995,18 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "ddE" = ( @@ -10094,36 +10021,30 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) -"ddU" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump, -/obj/machinery/advanced_airlock_controller/directional/east, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) "deg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "deF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "deN" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/construction/mining/aux_base) @@ -10140,11 +10061,19 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"dfi" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "dfn" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -10164,21 +10093,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) -"dfw" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/main) "dfA" = ( /obj/machinery/light{ dir = 8 @@ -10189,14 +10111,11 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "dfD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible, /turf/open/floor/plating, /area/hallway/secondary/entry) "dfL" = ( /obj/machinery/dna_scannernew, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/genetics) @@ -10212,12 +10131,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "dgf" = ( @@ -10247,7 +10164,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, @@ -10263,29 +10180,27 @@ /turf/open/floor/iron, /area/maintenance/fore) "dgC" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/structure/chair/office{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/dark, /area/engine/engine_room) "dgP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/prison/dark, /area/security/prison) +"dgU" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, +/turf/open/floor/plating, +/area/hallway/primary/aft) "dgZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -10311,17 +10226,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/engineering) -"dhp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/ai_monitored/storage/eva) "dhC" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ @@ -10342,29 +10250,23 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"dhK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, +"dhR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ai_monitored/storage/eva) -"dhR" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/bot, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) +/turf/open/floor/iron/white, +/area/science/research) +"dhV" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/bridge) "dib" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10377,8 +10279,8 @@ name = "MiniSat AI Access"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/shutters{ id = "aicoremain" }, @@ -10409,15 +10311,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, /area/medical/chemistry) -"diA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "diN" = ( /obj/machinery/requests_console{ department = "Medical"; @@ -10444,10 +10337,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -10479,21 +10372,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "djl" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/engine_room) "djm" = ( /obj/machinery/light, @@ -10507,11 +10399,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -10559,16 +10447,17 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"dky" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "dkF" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dkK" = ( @@ -10586,13 +10475,6 @@ /turf/open/floor/plating/airless, /area/chapel/office) "dla" = ( -/obj/machinery/advanced_airlock_controller/directional/north, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/exploration_prep) "dld" = ( @@ -10612,7 +10494,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -10635,10 +10517,10 @@ req_access = null; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -10646,17 +10528,28 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"dmf" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "dmg" = ( /obj/machinery/door/airlock/external{ name = "Bridge External Access"; req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/bridge) "dmv" = ( @@ -10708,6 +10601,12 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "doh" = ( @@ -10717,7 +10616,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -10769,15 +10668,14 @@ /turf/open/floor/iron/techmaint, /area/medical/genetics/cloning) "dpt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) +/turf/open/floor/iron, +/area/quartermaster/exploration_prep) "dpw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10786,9 +10684,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "dpG" = ( /obj/effect/spawner/structure/window/reinforced, @@ -10847,16 +10747,16 @@ /area/janitor) "dqr" = ( /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "dqF" = ( /obj/effect/turf_decal/caution, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) "dqJ" = ( @@ -10882,8 +10782,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_smes) "drj" = ( @@ -10891,8 +10791,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -10929,14 +10827,14 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "drZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/prison, -/area/security/prison) +/turf/open/floor/iron, +/area/hallway/secondary/exit) "dsa" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/spawner/randomvend/cola, @@ -10945,18 +10843,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"dsb" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "dsx" = ( /turf/open/floor/iron/freezer, /area/medical/genetics) @@ -10973,26 +10859,27 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + target_pressure = 4500 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "dtg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "dtD" = ( @@ -11017,13 +10904,6 @@ }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) -"dtY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "dtZ" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/green, @@ -11066,13 +10946,13 @@ /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/engineering) "dve" = ( @@ -11098,7 +10978,16 @@ req_access_txt = "24" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -11107,8 +10996,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -11126,6 +11015,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "dvF" = ( @@ -11148,11 +11040,11 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "dvY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "dwj" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) "dwo" = ( @@ -11176,10 +11068,10 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "dxb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/air_tank, +/obj/machinery/computer/atmos_control/air_tank, /turf/open/floor/iron/dark, /area/engine/atmos) "dxf" = ( @@ -11188,18 +11080,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"dxn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/engine, -/area/engine/engine_room) "dxz" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -11220,6 +11100,10 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + target_pressure = 500; + name = "Virology Distro Pressurization" + }, /turf/open/floor/iron/white, /area/medical/virology) "dxM" = ( @@ -11247,50 +11131,41 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/security/courtroom) +"dyz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/fore) "dyJ" = ( /obj/structure/grille, /turf/closed/wall, /area/space/nearstation) "dyR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) -"dyW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) -"dyZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ +/turf/open/floor/iron, +/area/hallway/secondary/exit) +"dyW" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /turf/open/floor/iron/dark, -/area/hallway/secondary/command) +/area/hallway/primary/central) "dzo" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -11298,9 +11173,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/hallway/primary/fore) "dzt" = ( @@ -11324,6 +11197,21 @@ }, /turf/open/floor/plating, /area/medical/virology) +"dzX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "dzZ" = ( /obj/structure/reagent_dispensers/nutriment/fat/oil, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -11331,13 +11219,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) -"dAc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plating, -/area/quartermaster/miningdock) "dAF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -11348,6 +11229,18 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"dAO" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "dBe" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -11398,18 +11291,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "dBV" = ( @@ -11446,7 +11339,7 @@ /turf/open/floor/plating, /area/maintenance/port) "dCW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) "dCY" = ( @@ -11456,10 +11349,18 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "dCZ" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/engine/engine_room) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/engine/atmos) "dDe" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2" @@ -11516,7 +11417,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -11537,18 +11438,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"dEF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "dEL" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -11561,6 +11450,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) "dFg" = ( @@ -11571,10 +11461,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -11591,10 +11484,10 @@ req_access = null; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -11607,7 +11500,6 @@ icon_state = "0-4" }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/advanced_airlock_controller/directional/west, /turf/open/floor/plating, /area/security/main) "dFu" = ( @@ -11622,13 +11514,14 @@ location = "hall25" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "dFA" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -11641,20 +11534,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "dGP" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "dGR" = ( @@ -11678,12 +11573,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dHn" = ( @@ -11697,14 +11586,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "dHA" = ( @@ -11721,12 +11610,9 @@ /turf/open/floor/plating, /area/tcommsat/computer) "dHJ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "dHO" = ( @@ -11736,7 +11622,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -11795,14 +11681,14 @@ name = "Teleporter and Minisat Access"; req_one_access_txt = "19; 61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) "dJE" = ( @@ -11823,18 +11709,16 @@ id_tag = "Dorm3"; name = "Cabin 3" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood/end, /turf/open/floor/wood, /area/crew_quarters/dorms) "dJV" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -11847,16 +11731,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/maintenance/department/science/central) -"dKv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "dKD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -11864,25 +11739,20 @@ /turf/open/floor/iron, /area/security/brig) "dKI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/chair{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) -"dKL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron, -/area/hallway/primary/aft) +/area/science/shuttle) "dKN" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -11900,12 +11770,6 @@ dir = 1 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/security/main) "dKU" = ( @@ -11930,21 +11794,12 @@ /turf/open/floor/prison, /area/security/prison) "dLb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/starboard) "dLv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = -28 }, @@ -11955,6 +11810,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "dLw" = ( @@ -12001,11 +11862,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/teleporter) @@ -12016,7 +11874,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/central) "dMj" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /obj/structure/cable/yellow{ @@ -12036,9 +11894,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -12049,6 +11904,12 @@ pixel_y = 24 }, /obj/machinery/camera/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "dMx" = ( @@ -12070,12 +11931,12 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_smes) "dMD" = ( @@ -12083,21 +11944,21 @@ name = "Labour Shuttle"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/plating, /area/security/brig/dock) "dMF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "dMM" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/engine, @@ -12108,6 +11969,9 @@ }, /obj/effect/turf_decal/delivery, /obj/item/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "dMU" = ( @@ -12134,9 +11998,6 @@ /area/security/main) "dNq" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -12147,12 +12008,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/science/research) -"dNw" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, -/turf/open/floor/plating, -/area/maintenance/port/fore) "dNQ" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -12174,9 +12034,24 @@ /obj/machinery/door/airlock/external{ name = "Escape Airlock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron/dark, /area/maintenance/starboard/secondary) +"dOt" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "dOz" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -12199,13 +12074,16 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "dPc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "dPk" = ( @@ -12216,15 +12094,14 @@ dir = 8; pixel_x = -3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/noslip/dark, /area/hallway/secondary/service) "dPq" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "dPZ" = ( @@ -12237,7 +12114,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "dQc" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -12255,16 +12132,16 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "dQx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/disposalpipe/sorting/mail/destination/research/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "dQy" = ( @@ -12280,6 +12157,16 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"dQF" = ( +/obj/structure/chair/fancy/bench/right{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/prison, +/area/security/prison) "dQH" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -12291,19 +12178,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "dQP" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -12314,24 +12195,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/structure/disposalpipe/sorting/mail/destination/hos_office/flip{ dir = 2 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "dRa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -12356,9 +12230,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, @@ -12381,12 +12252,12 @@ /turf/open/floor/iron, /area/science/shuttle) "dRI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "dRO" = ( @@ -12403,6 +12274,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/science/robotics) "dRX" = ( @@ -12422,25 +12296,31 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "dSe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "dSh" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) @@ -12448,10 +12328,11 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "dSp" = ( @@ -12459,12 +12340,7 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "dSs" = ( @@ -12498,10 +12374,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -12515,27 +12387,22 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/wood, /area/security/prison) "dTw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/siding/white{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "dTN" = ( @@ -12637,16 +12504,14 @@ /turf/open/floor/plating, /area/science/xenobiology) "dVx" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron/dark, +/area/engine/engine_room) "dVG" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -12661,11 +12526,11 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -12679,25 +12544,33 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "dWq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) "dWt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/fore) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engine/engineering) "dWH" = ( /obj/machinery/firealarm{ dir = 8; @@ -12712,10 +12585,11 @@ pixel_x = -25; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "dWS" = ( @@ -12724,12 +12598,9 @@ /turf/open/floor/iron/dark, /area/security/brig) "dWW" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/atmos) "dWX" = ( @@ -12747,11 +12618,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "dXj" = ( @@ -12765,10 +12634,10 @@ /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos, /turf/open/floor/engine, /area/engine/atmospherics_engine) "dXu" = ( @@ -12783,7 +12652,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/noslip/standard, @@ -12797,20 +12669,29 @@ id = "quarantineshutters"; name = "Isolation Shutters" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, /area/medical/virology) +"dYj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "dYA" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "dYI" = ( /obj/item/kirbyplants/random, @@ -12832,9 +12713,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -12854,7 +12732,6 @@ /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -12866,8 +12743,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"dZb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/quartermaster/warehouse) "dZd" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Shared Engineering Storage"; @@ -12877,13 +12764,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage_shared) "dZh" = ( @@ -12893,11 +12780,11 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fountain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/hallway/primary/starboard) "dZs" = ( @@ -12910,25 +12797,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hydroponics/garden) -"dZL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/chapel/main/monastery) "dZQ" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -12942,10 +12814,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "eag" = ( @@ -12958,6 +12829,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "eah" = ( @@ -12972,12 +12849,6 @@ /turf/open/floor/iron/white, /area/medical/surgery) "eal" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -13044,47 +12915,50 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/threatre/flip{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) +"eaK" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "eaL" = ( /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /turf/open/floor/engine, /area/engine/engine_room) "eaR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, /area/engine/atmos) "eaX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -13102,9 +12976,6 @@ }, /obj/machinery/airalarm/directional/east, /obj/item/bedsheet/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/prison/dark, /area/security/prison) "ebS" = ( @@ -13126,24 +12997,12 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ecs" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/library) "ecG" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) -"ecP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/library) "ecU" = ( /obj/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -13154,8 +13013,23 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"ecV" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "edi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) "edn" = ( @@ -13165,6 +13039,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "edw" = ( @@ -13172,7 +13052,7 @@ name = "Xenobiology Chamber Maintenance"; req_one_access_txt = "55" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/plating, /area/science/xenobiology) "edB" = ( @@ -13215,7 +13095,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron, @@ -13252,6 +13132,16 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/storage/tools) +"eex" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "eey" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -13274,21 +13164,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"eeJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) -"eeK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "eeR" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -13305,8 +13180,9 @@ icon_state = "1-2" }, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "efv" = ( @@ -13334,13 +13210,13 @@ /area/security/prison) "efT" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/dorms) "egu" = ( @@ -13360,12 +13236,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/engine, /area/engine/engine_room) "egU" = ( @@ -13393,10 +13263,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/storage) "ehB" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -13414,7 +13288,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "ehY" = ( @@ -13436,12 +13311,10 @@ /area/medical/medbay/lobby) "eii" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/siding/white{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "eiq" = ( @@ -13463,10 +13336,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/explab) "ejh" = ( @@ -13494,10 +13367,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) @@ -13529,10 +13399,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/machinery/camera/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "ejT" = ( @@ -13550,7 +13419,6 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -13575,11 +13443,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/cafeteria{ dir = 5 @@ -13593,6 +13461,12 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/main) "ekC" = ( @@ -13601,6 +13475,26 @@ }, /turf/open/floor/iron, /area/engine/engine_room) +"ekL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/bridge) +"ekM" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/bridge) "elo" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/geneticist, @@ -13633,8 +13527,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -13643,30 +13535,31 @@ icon_state = "1-4" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/bridge) "emb" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "emd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/security/checkpoint/customs) @@ -13686,6 +13579,16 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"emL" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/prison, +/area/security/prison) "emR" = ( /obj/effect/landmark/start/medical_doctor, /obj/structure/cable/yellow{ @@ -13694,12 +13597,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -13714,6 +13611,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"ena" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "enh" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -13726,42 +13629,22 @@ /turf/closed/wall, /area/maintenance/fore) "enq" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/advanced_airlock_controller/directional/east, /turf/open/floor/plating, /area/medical/virology) "enx" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/digital_clock/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "enz" = ( /obj/machinery/door/airlock/external{ name = "Transport Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/science/shuttle) -"enI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "enR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -13771,6 +13654,12 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/security/brig) "enS" = ( @@ -13825,6 +13714,12 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "epa" = ( @@ -13846,29 +13741,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "epz" = ( /obj/machinery/camera/directional/north, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"epD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "epK" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -13881,9 +13763,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -13899,7 +13778,7 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "eqd" = ( @@ -13907,12 +13786,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/maintenance/department/science) "eqp" = ( @@ -13930,7 +13803,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "eqM" = ( /obj/structure/disposalpipe/segment, @@ -13946,8 +13819,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "erD" = ( @@ -13957,6 +13830,9 @@ /area/maintenance/starboard/fore) "esk" = ( /obj/machinery/light, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "esl" = ( @@ -13964,9 +13840,6 @@ dir = 1; pixel_y = -5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -13999,17 +13872,14 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "etM" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/library) "etP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14023,15 +13893,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "euO" = ( @@ -14041,6 +13914,10 @@ /obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "euQ" = ( @@ -14048,22 +13925,11 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plating, /area/maintenance/port) -"euR" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/space/basic, -/area/space/nearstation) "euS" = ( /obj/machinery/door/airlock/command{ name = "Chief Engineer's Office"; @@ -14075,10 +13941,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -14088,17 +13954,20 @@ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/janitor) "evw" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/hallway/primary/fore) +/turf/open/floor/iron/white, +/area/crew_quarters/toilet) "evE" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -14123,29 +13992,14 @@ /turf/open/floor/plating, /area/hallway/primary/fore) "ewh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"ewi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron, +/area/quartermaster/exploration_prep) "ewj" = ( /turf/open/floor/wood, /area/library) @@ -14167,17 +14021,9 @@ pixel_x = 29; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) -"ewq" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/engine, -/area/engine/engine_room) "ewx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -14185,10 +14031,10 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -14219,13 +14065,13 @@ department = "Botany"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/effect/turf_decal/tile/green{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -14257,9 +14103,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -14283,10 +14126,10 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -14298,17 +14141,14 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/turf/open/floor/iron, -/area/engine/atmos) -"exV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron, +/area/engine/atmos) "exY" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -14327,12 +14167,6 @@ pixel_y = 7; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -14342,21 +14176,7 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"eyc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/primary/fore) "eyz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -14381,6 +14201,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/security/brig/dock) +"ezc" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/construction/mining/aux_base) "ezJ" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, @@ -14393,7 +14225,7 @@ /turf/open/space/basic, /area/space/nearstation) "eAf" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/door/poddoor/shutters/preopen{ id = "atmos"; name = "Atmospherics Lockdown" @@ -14419,21 +14251,14 @@ req_one_access_txt = "47" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) -"eAp" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/dark, -/area/bridge) "eAs" = ( /obj/machinery/computer/card/minor/ce{ dir = 1 @@ -14457,9 +14282,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/storage) "eAY" = ( @@ -14476,10 +14301,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "eBB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -14487,6 +14308,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "eBD" = ( @@ -14503,12 +14330,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -14525,12 +14346,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "Thermoelectric generator bypass" @@ -14541,11 +14356,12 @@ /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "eCC" = ( @@ -14554,9 +14370,6 @@ pixel_x = -1; pixel_y = -2 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, /area/medical/medbay/aft) @@ -14565,10 +14378,10 @@ icon_state = "4-8" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -14594,12 +14407,18 @@ /turf/open/floor/noslip/standard, /area/engine/atmos) "eCQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/firealarm{ pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "eDc" = ( @@ -14608,21 +14427,34 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/chemistry) +"eDF" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "eDG" = ( /obj/machinery/door/airlock{ id_tag = "Dorm4"; name = "Cabin 4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood/end, /turf/open/floor/wood, @@ -14668,9 +14500,6 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "eEw" = ( @@ -14706,21 +14535,14 @@ /turf/open/space/basic, /area/space/nearstation) "eGa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/science/lab) -"eGe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/chapel{ - dir = 10 - }, -/area/chapel/main/monastery) "eGg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14731,6 +14553,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "eGl" = ( @@ -14741,6 +14569,8 @@ pixel_x = -25 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "eGm" = ( @@ -14752,7 +14582,6 @@ /turf/open/floor/iron/freezer, /area/medical/genetics) "eGC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -14776,18 +14605,18 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "eHi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/science/shuttle) "eHu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, @@ -14800,30 +14629,28 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "eIv" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "eIz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "eJe" = ( @@ -14831,17 +14658,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/iron/dark, -/area/maintenance/disposal) -"eJf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) +/turf/open/floor/iron/dark, +/area/maintenance/disposal) "eJz" = ( /obj/effect/landmark/start/paramedic, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -14850,7 +14671,6 @@ /turf/open/floor/iron/white, /area/medical/storage) "eJH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -14874,12 +14694,6 @@ /area/maintenance/port) "eJW" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "eKj" = ( @@ -14907,20 +14721,18 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit) "eKM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/storage/tools) "eKW" = ( @@ -14962,12 +14774,26 @@ name = "Courtroom" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) +"eLS" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Access"; + req_access_txt = "24" + }, +/turf/open/floor/plating, +/area/hallway/primary/aft) "eMp" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, +/obj/machinery/air_sensor/toxins_burn_chamber, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "eMt" = ( @@ -14993,13 +14819,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"eMU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "eMX" = ( /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) @@ -15027,6 +14846,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "eNF" = ( @@ -15040,16 +14862,6 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) -"eNH" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_x = -28; - pixel_y = 4 - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/recreation) "eNN" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -15057,18 +14869,18 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "eNQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/siding/white{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "eNX" = ( @@ -15082,9 +14894,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "eOo" = ( @@ -15101,18 +14913,27 @@ /area/crew_quarters/bar) "eOw" = ( /obj/machinery/disposal/bin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/robotics/lab) "eOW" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ePd" = ( @@ -15122,7 +14943,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "ePo" = ( @@ -15199,67 +15019,55 @@ }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) -"eQs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "eQt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /turf/open/floor/iron, /area/science/shuttle) "eQF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "eQM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/central) +/turf/open/floor/carpet/green, +/area/library) "eQR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "eRe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "eRo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -15284,12 +15092,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"eSF" = ( -/obj/effect/turf_decal/tile/red/diagonal_edge, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/security/main) "eSM" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -15300,6 +15102,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "eSN" = ( @@ -15316,9 +15124,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "eTb" = ( @@ -15326,9 +15131,10 @@ /turf/open/floor/plating, /area/quartermaster/exploration_prep) "eTf" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 24; - dir = 1 + dir = 1; + locked = "0" }, /obj/structure/chair/office{ dir = 4 @@ -15336,9 +15142,6 @@ /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "eTp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -15346,11 +15149,17 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "eTu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "eTL" = ( /obj/structure/closet/firecloset/full, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -15397,18 +15206,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, -/area/security/brig) -"eVc" = ( -/obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron, +/area/security/brig) "eVI" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/button/door{ @@ -15423,12 +15228,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) -"eVL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "eVM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15464,6 +15263,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "eXc" = ( @@ -15477,6 +15282,12 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) "eXQ" = ( @@ -15510,14 +15321,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "eYn" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -15535,12 +15345,13 @@ /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/bar) "eYL" = ( @@ -15573,16 +15384,16 @@ /turf/open/floor/plating, /area/maintenance/port/central) "eYQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/hallway/secondary/exit) "eYT" = ( @@ -15608,10 +15419,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/space/basic, @@ -15637,6 +15448,16 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/white, /area/medical/chemistry) +"faa" = ( +/obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ + hide = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/hallway/primary/aft) "faj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15651,23 +15472,36 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "fam" = ( /obj/structure/chair/fancy/bench/pew/left{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/chapel{ dir = 4 }, /area/chapel/main/monastery) +"fas" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "faD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) "faL" = ( @@ -15692,9 +15526,6 @@ /obj/effect/turf_decal/plaque{ icon_state = "L7" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/fore) "fbg" = ( @@ -15721,15 +15552,14 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/plating, /area/maintenance/fore) "fbt" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/techstorage/engineering, /obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/science/shuttle) @@ -15784,6 +15614,12 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "fbQ" = ( @@ -15794,13 +15630,13 @@ dir = 9 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/hallway/primary/starboard) "fbW" = ( @@ -15808,10 +15644,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -15831,9 +15667,6 @@ /turf/open/floor/plating, /area/science/xenobiology) "fcp" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Turbine Waste to Thermoelectric Generator" - }, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "fcN" = ( @@ -15850,35 +15683,30 @@ "fcU" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/storage) "fcW" = ( -/obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/plating, /area/hallway/primary/fore) "fda" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/engine/atmos) "fdh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15891,15 +15719,28 @@ }, /turf/open/floor/iron/dark, /area/engine/storage) +"fdi" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "fdl" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "fdn" = ( @@ -15910,12 +15751,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/newscaster{ pixel_y = -30 }, @@ -15925,9 +15760,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -15958,14 +15791,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/genetics/cloning) -"fdJ" = ( -/obj/structure/chair/fancy/comfy{ - color = "#666666"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/library) "fdU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -15988,7 +15813,7 @@ /area/engine/atmospherics_engine) "feh" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/caution/stand_clear{ dir = 1 }, @@ -16013,9 +15838,7 @@ dir = 8 }, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "feF" = ( @@ -16027,6 +15850,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "feP" = ( @@ -16060,6 +15889,16 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"feU" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "feZ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -16068,8 +15907,7 @@ /turf/open/space/basic, /area/space/nearstation) "ffd" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, /turf/open/floor/engine, /area/engine/engine_room) "ffe" = ( @@ -16078,12 +15916,16 @@ }, /obj/item/beacon, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/bridge) "ffl" = ( @@ -16117,6 +15959,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/security/main) "ffz" = ( @@ -16157,11 +16002,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "ffX" = ( @@ -16174,23 +16020,28 @@ /turf/open/floor/engine, /area/science/xenobiology) "ffZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/sign/poster/random{ pixel_x = 32 }, /turf/open/floor/iron, /area/hallway/primary/aft) "fgi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hydroponics) "fgm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "fgq" = ( @@ -16234,10 +16085,10 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -16278,29 +16129,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, /obj/structure/disposalpipe/junction/flip, -/turf/open/floor/iron, -/area/quartermaster/storage) -"fjj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/quartermaster/storage) "fjx" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16317,9 +16163,9 @@ req_one_access_txt = "1;40" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "fjM" = ( @@ -16327,9 +16173,6 @@ dir = 8 }, /obj/effect/landmark/start/lawyer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -16351,6 +16194,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/brig) "fkI" = ( @@ -16360,10 +16207,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -16377,7 +16224,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "fkM" = ( @@ -16416,43 +16263,38 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "fld" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "flk" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "flm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/turf/open/floor/iron, +/area/engine/atmos) "flN" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; @@ -16467,9 +16309,6 @@ /obj/machinery/door/airlock/external{ name = "Transport Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "fmb" = ( @@ -16477,17 +16316,25 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron, /area/security/checkpoint/customs) +"fmw" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "fmx" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -16524,13 +16371,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) "fmE" = ( @@ -16539,9 +16387,6 @@ location = "hall5" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron, /area/hallway/primary/fore) "fmG" = ( @@ -16555,18 +16400,13 @@ /turf/open/floor/glass/reinforced, /area/hallway/secondary/exit) "fng" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "fnu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -16592,9 +16432,6 @@ dir = 1 }, /obj/structure/curtain/bounty, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/wood, /area/security/prison) "fod" = ( @@ -16609,6 +16446,9 @@ pixel_x = 32 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) "foz" = ( @@ -16618,6 +16458,8 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "foH" = ( @@ -16628,15 +16470,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron/dark, /area/maintenance/starboard/secondary) -"foS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "fpc" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -16665,10 +16498,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -16687,13 +16520,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) "fpB" = ( @@ -16710,7 +16543,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) "fpF" = ( @@ -16720,10 +16553,16 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/crew_quarters/cryopods) "fpM" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -16732,10 +16571,10 @@ /turf/open/floor/iron/dark, /area/security/execution/education) "fpQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/oxygen_tank, +/obj/machinery/computer/atmos_control/oxygen_tank, /turf/open/floor/iron/dark, /area/engine/atmos) "fqj" = ( @@ -16745,12 +16584,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron, /area/hallway/primary/starboard) "fqp" = ( @@ -16762,11 +16595,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) @@ -16791,6 +16624,9 @@ "frc" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "frf" = ( @@ -16831,12 +16667,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) -"fsa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ - dir = 8 - }, -/turf/closed/wall, -/area/engine/atmospherics_engine) "fsb" = ( /obj/structure/bed/dogbed/ian, /mob/living/simple_animal/hostile/carp/lia, @@ -16893,15 +16723,14 @@ /turf/open/floor/iron, /area/science/storage) "fsR" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/camera/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/camera/directional/south, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "fsT" = ( /obj/machinery/light/small{ @@ -16910,23 +16739,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, /area/medical/virology) "ftb" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/virology) "ftk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/table/wood, /obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 @@ -16949,6 +16774,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ftE" = ( @@ -16971,9 +16802,6 @@ /turf/closed/wall, /area/hallway/secondary/service) "fuG" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -17014,16 +16842,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "fvP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/stairs/left{ dir = 8 }, @@ -17041,9 +16866,9 @@ name = "Security Post - Engineering"; req_one_access_txt = "1;56" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/checkpoint/engineering) "fwl" = ( @@ -17063,15 +16888,12 @@ /area/crew_quarters/kitchen/coldroom) "fwB" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "fwO" = ( @@ -17082,32 +16904,34 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "fwP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/siding/white/corner, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "fwU" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine, -/area/engine/engine_room) +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "fwX" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -17116,6 +16940,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "fwY" = ( @@ -17125,14 +16955,6 @@ /obj/structure/marker_beacon, /turf/open/floor/plating/airless, /area/space/nearstation) -"fwZ" = ( -/obj/effect/turf_decal/tile/red/diagonal_edge, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/dark, -/area/security/main) "fxg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17140,10 +16962,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -17159,16 +16981,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/lab) "fxm" = ( @@ -17182,23 +17004,8 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/quartermaster/storage) -"fxJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "fxT" = ( /obj/machinery/modular_computer/console/preset/research, /turf/open/floor/carpet/purple, @@ -17214,16 +17021,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/maintenance/department/science) "fyd" = ( @@ -17263,14 +17070,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"fyu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "fyx" = ( /obj/structure/transit_tube/curved{ dir = 4 @@ -17284,10 +17083,15 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/central) -"fyI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +"fyL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "fyZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17313,8 +17117,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass, /area/hydroponics/garden) "fzC" = ( @@ -17367,6 +17171,14 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white, /area/medical/surgery) +"fAa" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/security/brig) "fAg" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -17383,17 +17195,6 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/iron, /area/security/warden) -"fAh" = ( -/obj/structure/chair, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/security/courtroom) "fAr" = ( /obj/structure/closet/secure_closet/chemical, /obj/machinery/light_switch{ @@ -17418,13 +17219,36 @@ }, /turf/open/floor/iron, /area/teleporter) -"fAL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +"fAG" = ( +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/central) +"fAK" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medbay_lockdown"; + name = "lockdown Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/medbay/lobby) +"fAL" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "fAN" = ( @@ -17442,8 +17266,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "fAZ" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "fBc" = ( @@ -17456,9 +17282,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17473,11 +17296,14 @@ /turf/open/floor/iron, /area/crew_quarters/cryopods) "fBk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /obj/structure/chair/fancy/sofa/old, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -17488,18 +17314,16 @@ }, /obj/machinery/plumbing/output, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/chemistry) "fBK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "fBO" = ( @@ -17533,15 +17357,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/genetics) "fCz" = ( @@ -17549,25 +17373,37 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/space/basic, /area/space/nearstation) "fCH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "fCJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/engine/atmos) "fCY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17575,44 +17411,22 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/ai_monitored/storage/eva) -"fDo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "fEf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/holopad{ pixel_y = -16 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/storage) "fEl" = ( -/obj/machinery/shower{ - pixel_y = 16 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/noslip/standard, +/obj/machinery/air_sensor/mix_tank, +/turf/open/floor/engine/vacuum, /area/engine/atmos) -"fEv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar) "fEM" = ( /obj/machinery/teleport/station, /obj/effect/turf_decal/tile/purple{ @@ -17627,27 +17441,30 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/security/courtroom) "fEX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/security/brig) +/area/science/shuttle) "fFf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17659,22 +17476,47 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "fFq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/department/science) +"fFv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "fFx" = ( /obj/machinery/computer/message_monitor, /obj/effect/turf_decal/stripes/line{ @@ -17695,11 +17537,12 @@ /turf/open/floor/iron/white, /area/medical/virology) "fFS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, -/area/engine/atmos) +/area/science/shuttle) "fFV" = ( /obj/machinery/door/poddoor/shutters{ id = "teleportershutters"; @@ -17737,20 +17580,24 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/wood, /area/hallway/primary/starboard) "fGq" = ( /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "fGr" = ( @@ -17770,14 +17617,14 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/security/checkpoint/science) "fHa" = ( @@ -17789,14 +17636,20 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/surgery) "fHb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/iron/white, /area/science/mixing) @@ -17812,9 +17665,6 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "fHv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17827,10 +17677,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -17853,19 +17699,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) -"fId" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/command) "fIm" = ( /obj/machinery/door/airlock/medical{ id_tag = "QuarantineB"; @@ -17889,15 +17730,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/aft) -"fID" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown/fourcorners/contrasted, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/quartermaster/storage) "fJc" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -17912,6 +17744,10 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/main) "fJw" = ( @@ -17958,10 +17794,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -17970,12 +17806,6 @@ /turf/open/floor/plating, /area/maintenance/port/central) "fKG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17994,9 +17824,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -18004,9 +17831,6 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "fKO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = 24 }, @@ -18032,6 +17856,16 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/hydroponics) +"fLB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "fLK" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/condiment/sugar, @@ -18056,22 +17890,19 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"fMI" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"fMg" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/primary/fore) -"fMM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"fMM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -18092,28 +17923,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/storage) -"fMQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "fNi" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/lawoffice) "fNm" = ( @@ -18138,24 +17959,28 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/tcommsat/computer) "fNF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron, /area/engine/atmos) "fNG" = ( @@ -18177,8 +18002,8 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "fNR" = ( @@ -18205,6 +18030,8 @@ /area/engine/engine_room) "fOd" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "fOv" = ( @@ -18220,10 +18047,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -18246,11 +18073,11 @@ /turf/open/floor/plating, /area/maintenance/port/central) "fPc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "fPh" = ( @@ -18270,15 +18097,24 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) -"fPn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ +"fPr" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/security/courtroom) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/central) "fPs" = ( /obj/machinery/libraryscanner, /turf/open/floor/carpet/green, @@ -18290,6 +18126,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/engine/engine_room) "fPz" = ( @@ -18304,9 +18142,6 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) "fQa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old/right{ dir = 8 }, @@ -18333,7 +18168,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -18352,6 +18186,19 @@ }, /turf/open/floor/wood, /area/maintenance/port) +"fQH" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/wood, +/area/hallway/primary/starboard) "fRb" = ( /obj/structure/transit_tube/curved{ dir = 8 @@ -18363,6 +18210,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/space/basic, /area/space/nearstation) "fRi" = ( @@ -18398,7 +18248,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "4-8" }, @@ -18412,7 +18261,7 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "fRM" = ( @@ -18443,6 +18292,18 @@ /obj/effect/turf_decal/tile/red/diagonal_edge, /turf/open/floor/iron/dark, /area/security/main) +"fSn" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "fSA" = ( /obj/structure/marker_beacon, /turf/open/floor/plating{ @@ -18453,11 +18314,17 @@ /turf/closed/wall, /area/maintenance/solars/starboard/aft) "fSN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/tile/green{ + dir = 4 }, -/turf/open/floor/carpet/black, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "fTd" = ( /obj/item/storage/secure/safe{ pixel_x = 37 @@ -18487,12 +18354,6 @@ /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/closet/secure_closet/hop, /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -18510,9 +18371,6 @@ pixel_x = 1; pixel_y = -25 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, @@ -18531,10 +18389,6 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "fVh" = ( @@ -18548,20 +18402,11 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"fVn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/quartermaster/storage) "fVq" = ( /obj/structure/sign/poster/random{ pixel_y = 32 @@ -18586,12 +18431,15 @@ /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "fWg" = ( @@ -18601,24 +18449,11 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/office) -"fWp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/dark, -/area/chapel/main/monastery) "fWq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -18631,11 +18466,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -18650,6 +18485,20 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"fXu" = ( +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "fXv" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; @@ -18659,13 +18508,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/robotics) "fXK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -18673,6 +18519,8 @@ /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/science) "fXM" = ( @@ -18681,6 +18529,11 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/aft) +"fXP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/quartermaster/storage) "fXR" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -18697,7 +18550,6 @@ name = "Courtroom" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18705,6 +18557,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "fXY" = ( @@ -18717,7 +18571,6 @@ /obj/effect/turf_decal/plaque{ icon_state = "L14" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -18764,8 +18617,9 @@ icon_state = "2-4" }, /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "fYD" = ( @@ -18817,16 +18671,18 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) -"fZt" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 +"fZF" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/primary/central) "fZK" = ( /obj/effect/spawner/room/threexfive, /obj/structure/disposalpipe/segment{ @@ -18841,34 +18697,46 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "fZV" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "fZW" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/science/xenobiology) +"fZZ" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "gav" = ( /obj/structure/table/glass, /obj/item/stack/sheet/mineral/plasma, @@ -18879,8 +18747,6 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "gaJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -18888,6 +18754,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/office) "gaO" = ( @@ -18895,12 +18763,6 @@ /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "gaY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/engine/atmos) @@ -18919,7 +18781,7 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "gbC" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /turf/open/floor/iron, @@ -18942,14 +18804,11 @@ /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "gcn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -19027,16 +18886,6 @@ }, /turf/open/floor/plating, /area/hallway/primary/fore) -"gdJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/diagonal_edge, -/turf/open/floor/iron/dark, -/area/security/main) "gdK" = ( /obj/structure/table/reinforced, /obj/item/pipe_dispenser, @@ -19044,15 +18893,18 @@ /turf/open/floor/iron, /area/engine/atmos) "gdX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "gee" = ( @@ -19062,13 +18914,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "gef" = ( @@ -19078,17 +18933,16 @@ /turf/open/floor/iron/white, /area/medical/virology) "geh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "geF" = ( /obj/structure/cable/yellow{ @@ -19126,6 +18980,16 @@ }, /turf/open/floor/iron, /area/medical/chemistry) +"gfk" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/security/brig) "gfo" = ( /obj/machinery/nanite_program_hub, /turf/open/floor/circuit, @@ -19138,15 +19002,12 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "gfJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/security/prison) "gfM" = ( @@ -19167,23 +19028,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "gfV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Evidence Storage"; @@ -19207,17 +19062,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "ggj" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/prison) +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ggk" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks, @@ -19225,7 +19074,6 @@ /area/maintenance/port) "ggr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/requests_console{ department = "Aft Primary Hallway"; pixel_x = 32 @@ -19238,6 +19086,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "ggN" = ( @@ -19250,15 +19104,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"ggR" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "ggT" = ( /mob/living/simple_animal/pet/cat/breadcat, /turf/open/floor/plating, @@ -19274,14 +19119,27 @@ /obj/structure/table/reinforced, /obj/item/storage/backpack/duffelbag/mining_conscript, /obj/item/pickaxe, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) +"ghF" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/spawner/lootdrop/glowstick/lit, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "ghP" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -19298,17 +19156,13 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "ghR" = ( /turf/open/floor/iron/white, /area/medical/virology) -"gif" = ( -/obj/structure/table/wood, -/obj/item/candle, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/grass, -/area/hallway/primary/fore) "gik" = ( /obj/structure/window/reinforced/spawner{ dir = 4 @@ -19320,10 +19174,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -19336,16 +19186,13 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "giD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/science/shuttle) "gje" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, @@ -19358,8 +19205,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -19370,13 +19215,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "gjh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "gji" = ( @@ -19429,7 +19276,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/quartermaster/sorting) "gkz" = ( @@ -19437,10 +19284,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -19451,9 +19298,6 @@ /turf/open/space/basic, /area/space/nearstation) "gkI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Gas Control"; req_access_txt = "10" @@ -19468,14 +19312,20 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "gkQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/science) "gla" = ( @@ -19542,20 +19392,19 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "glJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) "gmj" = ( @@ -19586,25 +19435,11 @@ /turf/open/floor/plating, /area/security/prison) "gmD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) -"gmQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "gmX" = ( /obj/docking_port/stationary{ dir = 2; @@ -19620,13 +19455,26 @@ "gnj" = ( /turf/closed/wall, /area/hallway/primary/starboard) -"gnD" = ( +"gnz" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/secondary/command) +"gnD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -19639,6 +19487,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) "gnG" = ( @@ -19646,24 +19501,23 @@ dir = 4; name = "Port Bypass" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/atmos) "gnH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/engineering{ name = "Port Quarter Solar Maintenance"; req_access_txt = "10" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "gnQ" = ( @@ -19684,19 +19538,25 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/ai_monitored/security/armory) +"goc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "goj" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/customs) "gol" = ( @@ -19715,9 +19575,6 @@ /area/maintenance/starboard/aft) "goM" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 4 - }, /turf/open/floor/plating, /area/science/server) "goO" = ( @@ -19725,21 +19582,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/wood, /area/security/detectives_office) "goT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -19795,12 +19646,18 @@ /turf/open/floor/iron/dark, /area/security/main) "gpF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4; + hide = 0 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "gpM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19808,13 +19665,15 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "gpP" = ( /obj/effect/turf_decal/stripes/corner{ @@ -19823,21 +19682,15 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "gpR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, @@ -19852,7 +19705,7 @@ /area/medical/genetics) "gpV" = ( /obj/machinery/holopad, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "gpY" = ( /obj/structure/disposalpipe/segment{ @@ -19864,30 +19717,22 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/engine, /area/engine/engine_room) "gqi" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/white, /area/science/explab) "gqA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/chair/stool/directional/south{ dir = 1 }, @@ -19900,7 +19745,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -19913,22 +19758,20 @@ /turf/open/floor/iron/white, /area/medical/genetics) "grd" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/components/binary/valve/digital/layer4{ - dir = 4; - name = "Waste to Scrubbers" +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 }, +/turf/open/floor/circuit, +/area/science/server) +"grD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/engine, -/area/engine/engine_room) -"grD" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, -/area/maintenance/port/fore) +/area/maintenance/department/science/central) "grT" = ( /obj/machinery/power/solar_control{ dir = 8 @@ -19943,6 +19786,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig/dock) "gsc" = ( @@ -19959,12 +19804,6 @@ name = "Shuttle Construction Yard"; req_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/science/shuttle) "gss" = ( @@ -19987,9 +19826,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, @@ -20000,19 +19836,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/space/basic, /area/space/nearstation) -"gth" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/crew_quarters/fitness/recreation) "gtK" = ( /obj/machinery/conveyor{ dir = 8; @@ -20029,17 +19860,16 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "gtW" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/science/shuttle) "gub" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -20058,29 +19888,35 @@ }, /turf/open/floor/iron, /area/science/shuttle) +"gui" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "guH" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/science/xenobiology) -"guQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "gva" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/bridge) "gvv" = ( @@ -20088,7 +19924,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sign/departments/security{ pixel_x = 32 }, @@ -20100,9 +19935,11 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "gvT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, -/area/security/brig/dock) +/area/quartermaster/exploration_prep) "gwg" = ( /obj/structure/table/wood, /obj/machinery/computer/records/medical/laptop{ @@ -20123,6 +19960,12 @@ pixel_x = -28; pixel_y = -2 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) "gwm" = ( @@ -20134,21 +19977,7 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"gwp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "gwq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -20163,7 +19992,7 @@ dir = 9 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -20183,14 +20012,14 @@ /area/science/explab) "gwC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "gwG" = ( @@ -20198,9 +20027,6 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "gxn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/closet/firecloset/full, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -20208,13 +20034,14 @@ /turf/open/floor/iron, /area/hallway/primary/central) "gxr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) "gxs" = ( @@ -20232,9 +20059,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "gxt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -20246,17 +20070,18 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "gxx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/iron/white, /area/science/mixing) @@ -20266,8 +20091,18 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"gyc" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "gyf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -20280,7 +20115,7 @@ /area/crew_quarters/bar) "gyt" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/space/basic, @@ -20313,10 +20148,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -20326,8 +20161,6 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gyV" = ( @@ -20350,13 +20183,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"gzj" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "gzs" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -20385,12 +20211,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -20433,19 +20253,7 @@ /obj/item/pen, /turf/open/floor/iron, /area/medical/cryo) -"gAV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) "gBc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -20453,6 +20261,12 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/lab) "gBe" = ( @@ -20469,14 +20283,13 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "gBm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/bar) "gBw" = ( @@ -20487,12 +20300,6 @@ /turf/open/floor/plating, /area/security/warden) "gBI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -20513,13 +20320,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "gBU" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/door/airlock/external{ req_access_txt = "24" }, @@ -20532,16 +20336,9 @@ /area/science/shuttle) "gBZ" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/space/basic, /area/space/nearstation) -"gCj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/noslip/dark, -/area/engine/engineering) "gCn" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -20558,18 +20355,15 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "gCq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = -24 }, @@ -20579,10 +20373,16 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "gCB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -20597,22 +20397,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "gDn" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "gDH" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 9 - }, /obj/machinery/light/small{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/server) "gDL" = ( @@ -20638,15 +20438,6 @@ /obj/machinery/suit_storage_unit/security, /turf/open/floor/iron/dark, /area/security/main) -"gEl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "gEw" = ( /obj/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; @@ -20660,12 +20451,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -20675,7 +20460,6 @@ "gEK" = ( /obj/machinery/door/airlock/research{ autoclose = 0; - frequency = 1449; id_tag = "xeno_airlock_interior"; name = "Xenobiology Lab Internal Airlock"; req_access_txt = "55" @@ -20687,20 +20471,31 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "gER" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/hallway/primary/aft) "gET" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "gEV" = ( @@ -20716,10 +20511,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/science/robotics/lab) "gFp" = ( @@ -20746,10 +20537,6 @@ /turf/open/floor/iron, /area/science/misc_lab/range) "gFJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, @@ -20762,17 +20549,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood, /area/security/prison) -"gFZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "gGa" = ( /obj/structure/window/reinforced{ pixel_y = 2 @@ -20781,12 +20560,17 @@ /turf/open/space/basic, /area/space/nearstation) "gGc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron, -/area/engine/engineering) +/area/crew_quarters/fitness/recreation) "gGf" = ( /obj/machinery/camera/directional/east, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -20794,11 +20578,6 @@ }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/relay) -"gGu" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) "gGL" = ( /obj/machinery/light/small{ dir = 8 @@ -20832,7 +20611,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "gHg" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 5 }, /turf/open/floor/plating/asteroid, @@ -20844,12 +20623,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, @@ -20864,6 +20637,7 @@ dir = 6 }, /obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "gHL" = ( @@ -20874,21 +20648,11 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "gHR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 4; - name = "Thermoelectric generator loop" - }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/iron/dark, /area/engine/engine_room) -"gHY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/chapel{ - dir = 8 - }, -/area/chapel/main/monastery) "gIp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -20954,15 +20718,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/storage) "gJG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -20986,28 +20750,7 @@ }, /turf/open/space/basic, /area/space/nearstation) -"gKa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/fitness/recreation) "gKh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -21030,9 +20773,6 @@ /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -21052,14 +20792,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron, /area/engine/atmos) @@ -21079,14 +20819,17 @@ dir = 4 }, /obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/engine/engine_room) -"gLl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, -/area/medical/surgery) +/area/engine/engine_room) "gLw" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/iron, @@ -21141,8 +20884,6 @@ "gMq" = ( /obj/structure/window/reinforced, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) "gMs" = ( @@ -21152,13 +20893,15 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "gMB" = ( /obj/effect/turf_decal/stripes/line{ @@ -21188,20 +20931,20 @@ /turf/open/floor/grass, /area/hallway/primary/fore) "gMV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/primary/aft) "gMW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/mixing) "gNc" = ( @@ -21211,23 +20954,7 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"gNf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "gNl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -21245,11 +20972,6 @@ }, /turf/open/floor/noslip/standard, /area/engine/atmos) -"gNr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "gNF" = ( /obj/machinery/light_switch{ pixel_x = -25; @@ -21270,17 +20992,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, /obj/effect/turf_decal/tile/green/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "gNN" = ( @@ -21380,7 +21102,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "gOA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -21392,14 +21114,11 @@ /obj/structure/sink{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "gOI" = ( /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/fore) "gOU" = ( @@ -21413,26 +21132,31 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "gPG" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "gPH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue{ @@ -21444,7 +21168,6 @@ /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -21458,6 +21181,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "gQn" = ( @@ -21467,7 +21196,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -21504,12 +21232,12 @@ /turf/open/floor/plating, /area/science/xenobiology) "gQI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engine_room) "gQJ" = ( @@ -21519,22 +21247,29 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/service) "gRj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/engine/atmos) +"gRn" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/landmark/start/assistant, -/obj/structure/chair/stool/bar/directional/south{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "gRp" = ( /obj/structure/closet/secure_closet/courtroom, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -21542,13 +21277,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"gRr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "gRw" = ( /obj/effect/landmark/start/botanist, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -21562,13 +21290,17 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "gRE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/lawoffice) "gRG" = ( @@ -21576,6 +21308,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "gRX" = ( @@ -21583,7 +21321,8 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "gSk" = ( @@ -21604,6 +21343,11 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/research) +"gSX" = ( +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/security/main) "gTc" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -21620,34 +21364,32 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) "gTH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "gTN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "gTV" = ( /obj/effect/turf_decal/caution/red{ pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/freezer, @@ -21699,20 +21441,20 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "gVn" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/nanite) "gVu" = ( @@ -21736,18 +21478,25 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "gVx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/engine/atmos) +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "gVA" = ( /obj/structure/rack, /obj/item/clothing/suit/armor/laserproof, @@ -21768,15 +21517,18 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "gVU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -21789,9 +21541,6 @@ /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "gWk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -21814,7 +21563,6 @@ /turf/open/floor/wood, /area/library) "gWG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -21828,7 +21576,7 @@ /area/medical/chemistry) "gWV" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, @@ -21842,33 +21590,35 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "gXl" = ( /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/crew_quarters/dorms) -"gXA" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ +"gXs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) +"gXA" = ( /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "gXD" = ( @@ -21876,7 +21626,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, @@ -21895,24 +21644,21 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "gYQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input, /turf/open/floor/engine/vacuum, /area/engine/atmos) "gYR" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/machinery/atmospherics/components/tank/air, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/white, /area/science/xenobiology) -"gZa" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +"gYU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/hallway/primary/aft) +/area/quartermaster/storage) "gZc" = ( /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) @@ -21933,10 +21679,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "gZU" = ( @@ -21949,9 +21696,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21959,12 +21703,6 @@ /turf/open/floor/iron/dark, /area/hallway/primary/aft) "hai" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -21974,6 +21712,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "hal" = ( @@ -22003,6 +21743,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) +"haN" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "hba" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/barman_recipes, @@ -22023,26 +21771,20 @@ /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "hbn" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) -"hbt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron, -/area/quartermaster/storage) "hbD" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -22088,15 +21830,14 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/wood, /area/security/prison) -"hcf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "hcF" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -22125,20 +21866,24 @@ }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) -"hdm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/security/brig/dock) "hdp" = ( /obj/machinery/nanite_programmer, /turf/open/floor/circuit, /area/science/nanite) +"hdq" = ( +/obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "hds" = ( /turf/open/floor/holofloor/plating, /area/holodeck/prison) "hdu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/medbay/central) @@ -22172,34 +21917,21 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/aft) -"hdF" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/prison, -/area/security/prison) "hdR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/science/storage) "hdW" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/security/brig/medbay) @@ -22224,11 +21956,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "heC" = ( @@ -22236,9 +21970,7 @@ dir = 4; name = "Mix to Ports" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "heQ" = ( @@ -22255,9 +21987,8 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "heV" = ( @@ -22279,10 +22010,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "hfe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -22322,20 +22049,27 @@ /area/engine/atmospherics_engine) "hfs" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating, /area/engine/atmos) +"hgl" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "hgm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "hgo" = ( @@ -22351,20 +22085,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "hgq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -22372,48 +22103,50 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "hgC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/quartermaster/qm) "hgF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/chair/fancy/comfy{ + color = "#666666" }, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "hgL" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "hgP" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) -"hgT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/bridge) "hgY" = ( /obj/machinery/light/small{ dir = 4 @@ -22421,9 +22154,6 @@ /obj/structure/toilet{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/security/prison) "hhn" = ( @@ -22473,8 +22203,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -22508,6 +22238,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/carpet, /area/hallway/primary/fore) "hjh" = ( @@ -22515,9 +22248,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "hjo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -22530,24 +22260,21 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "hjy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) "hjC" = ( -/obj/effect/landmark/start/janitor, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron, -/area/janitor) +/area/crew_quarters/fitness/recreation) "hjG" = ( /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) @@ -22558,23 +22285,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/security/prison) -"hjK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "hjN" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -22610,9 +22324,6 @@ /area/medical/medbay/aft) "hki" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -22622,18 +22333,9 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /turf/open/floor/iron/freezer, /area/security/prison) "hkP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -22701,10 +22403,13 @@ pixel_x = -28; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "hlR" = ( @@ -22716,9 +22421,20 @@ /turf/open/floor/iron, /area/janitor) "hlV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) +"hlX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/prison, +/area/security/prison) "hmb" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -22731,20 +22447,11 @@ }, /turf/open/floor/iron, /area/hallway/secondary/command) -"hmn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/hallway/primary/fore) "hmr" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "hmA" = ( @@ -22766,37 +22473,26 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "hmG" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, /area/maintenance/port) -"hmL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/primary/fore) "hmZ" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/lab) "hnh" = ( @@ -22805,15 +22501,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"hnl" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/primary/fore) "hnq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -22827,32 +22514,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) -"hns" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"hnv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "hnE" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ @@ -22904,19 +22571,23 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "hox" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/science/shuttle) +/area/engine/atmos) "hoD" = ( /obj/machinery/door/poddoor{ id = "deathdoor" @@ -22930,6 +22601,12 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/fore) "hoV" = ( @@ -22969,10 +22646,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"hpQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +"hpf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"hpQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 @@ -22991,6 +22671,12 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/bridge) "hqk" = ( @@ -23010,8 +22696,6 @@ /area/janitor) "hqx" = ( /obj/effect/turf_decal/tile/brown, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -23021,15 +22705,26 @@ /obj/machinery/newscaster{ pixel_x = 30 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/carpet/green, /area/library) "hqK" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "hqU" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -23038,12 +22733,15 @@ /turf/open/floor/plating, /area/maintenance/disposal) "hrc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "hro" = ( @@ -23056,6 +22754,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/engine/atmos) "hrA" = ( @@ -23068,7 +22772,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "hrK" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -23078,32 +22782,16 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/tcommsat/server) -"hsd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"hsn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/bar) +/area/tcommsat/server) "hsq" = ( /obj/structure/table, /obj/item/analyzer, @@ -23128,11 +22816,17 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/storage/tools) "hsK" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 + dir = 1 }, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -23141,6 +22835,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "htb" = ( @@ -23148,7 +22846,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, @@ -23181,14 +22878,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engine_room) @@ -23198,9 +22895,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/science/robotics/lab) "htT" = ( @@ -23210,10 +22910,11 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/central) "htW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) @@ -23239,22 +22940,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"hvp" = ( -/obj/machinery/door/airlock/external{ - name = "Shuttle Construction Yard"; - req_access_txt = "32" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/science/shuttle) "hvt" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -23310,11 +22997,11 @@ /turf/open/floor/plating, /area/security/detectives_office) "hvO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/atmos) "hvQ" = ( @@ -23339,7 +23026,9 @@ dir = 6 }, /obj/effect/turf_decal/tile/green, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "hwy" = ( @@ -23349,7 +23038,6 @@ /turf/open/floor/plating, /area/maintenance/port) "hwG" = ( -/obj/machinery/advanced_airlock_controller/directional/north, /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, /area/maintenance/solars/port/fore) @@ -23372,7 +23060,7 @@ /turf/open/floor/iron, /area/hydroponics) "hwW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output, /turf/open/floor/engine/vacuum, /area/engine/atmos) "hxh" = ( @@ -23392,30 +23080,27 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "hxM" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/start/roboticist, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/science/robotics/lab) -"hxV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "hyl" = ( /obj/machinery/door/airlock{ name = "Service Hall"; req_one_access_txt = "22;25;26;28;35;37;38;46" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/hallway/secondary/service) "hyr" = ( @@ -23450,9 +23135,6 @@ icon_state = "4-8" }, /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/disposalpipe/sorting/mail/destination/virology/flip{ dir = 8 @@ -23464,6 +23146,12 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/surgery) "hyS" = ( @@ -23502,27 +23190,34 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) "hzv" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "hzw" = ( /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "hzF" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -23533,16 +23228,18 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 + dir = 4 }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "hzI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/security/checkpoint/customs) "hzO" = ( @@ -23555,12 +23252,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23569,10 +23260,15 @@ name = "Delivery Office"; req_access_txt = "50" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "hzP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -23580,6 +23276,8 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "hzU" = ( @@ -23603,18 +23301,22 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) +"hAt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/medical/surgery) "hAD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"hAH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/science/research) +"hAH" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -23625,9 +23327,9 @@ /area/security/brig) "hAN" = ( /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "hAT" = ( @@ -23647,7 +23349,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -23691,12 +23392,6 @@ /turf/open/floor/iron, /area/engine/atmos) "hBT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -23709,9 +23404,6 @@ /obj/structure/table/wood, /obj/item/folder/blue, /obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "hBZ" = ( @@ -23721,12 +23413,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_smes) "hCj" = ( @@ -23738,28 +23430,10 @@ }, /turf/open/floor/iron/white, /area/medical/sleeper) -"hCn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "hCH" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/bridge) "hCR" = ( @@ -23778,15 +23452,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "hDu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/genetics) +"hDE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/maintenance/starboard/aft) "hDL" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, @@ -23809,13 +23491,14 @@ /turf/open/floor/plating, /area/science/xenobiology) "hEw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, +/obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/engine/atmos) "hEH" = ( @@ -23823,6 +23506,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/nanite) "hEQ" = ( @@ -23846,6 +23532,13 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/security/main) +"hEX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "hFs" = ( /obj/machinery/button/door{ id = "cp_west_inner"; @@ -23889,9 +23582,9 @@ name = "Port Quarter Solar Maintenance"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "hFG" = ( @@ -23937,10 +23630,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -23954,20 +23647,10 @@ }, /turf/open/floor/iron, /area/hydroponics) -"hGX" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plating, -/area/quartermaster/miningdock) "hHj" = ( /turf/closed/wall, /area/security/main) "hHE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -23977,24 +23660,37 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "hHS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) +"hHT" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "hHW" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, @@ -24020,44 +23716,53 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "hIj" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "hIE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "hIJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/poster/random{ pixel_x = 32 }, /turf/open/floor/iron, /area/hallway/primary/fore) -"hIQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "hIX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24069,18 +23774,14 @@ dir = 4 }, /obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/medical/medbay/central) -"hJa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/medical/medbay/central) "hJj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24102,12 +23803,6 @@ /area/security/courtroom) "hJo" = ( /obj/effect/decal/cleanable/shreds, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -24128,12 +23823,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "hJx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -24179,23 +23868,26 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "hKp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/iron, -/area/science/shuttle) +/area/hallway/primary/fore) "hKr" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 1 +/obj/effect/turf_decal/tile/green{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "hKx" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/stripes/line{ @@ -24211,9 +23903,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "hKR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/closet/crate{ name = "conveyor belt crate" }, @@ -24271,7 +23960,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "hLT" = ( @@ -24281,14 +23969,17 @@ }, /area/holodeck/rec_center) "hMA" = ( -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/security/execution/education) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/explab) "hMG" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 @@ -24308,18 +23999,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "hMM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall9"; location = "hall8" @@ -24336,10 +24027,23 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"hMW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) "hNe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -24350,9 +24054,6 @@ }, /area/chapel/main/monastery) "hNz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -24372,23 +24073,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "hNW" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "hOe" = ( /turf/closed/wall/r_wall, @@ -24405,10 +24103,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/science/nanite) "hOq" = ( @@ -24418,28 +24116,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/tcommsat/computer) -"hOu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/dark, -/area/security/brig) "hOQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/prison/dark, /area/security/prison) "hPd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste, +/obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/effect/turf_decal/delivery, /turf/open/floor/plating/airless, /area/engine/engine_room) @@ -24453,13 +24140,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "hPn" = ( @@ -24474,13 +24164,15 @@ /turf/open/floor/iron, /area/security/warden) "hPD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/science/shuttle) "hPI" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -24495,6 +24187,8 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "hPP" = ( @@ -24519,9 +24213,11 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/landmark/prisonspawn, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/prison, /area/security/prison) "hQj" = ( @@ -24531,12 +24227,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/security/brig/dock) "hQq" = ( @@ -24601,16 +24291,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "hRG" = ( @@ -24626,42 +24316,22 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/checkpoint/supply) -"hRJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron, -/area/bridge) "hRK" = ( /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "hSb" = ( /turf/closed/wall, /area/crew_quarters/heads/hor) -"hSe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "hSh" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24689,9 +24359,6 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/medical/medbay/central) "hSC" = ( @@ -24703,10 +24370,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/office) "hSS" = ( @@ -24729,9 +24396,6 @@ /turf/open/floor/plating, /area/security/brig/medbay) "hTf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -24786,32 +24450,24 @@ /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "hUp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "hUy" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, /turf/open/floor/iron, /area/engine/atmos) "hUK" = ( @@ -24830,16 +24486,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"hUT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/janitor) "hVd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24849,8 +24495,12 @@ }, /turf/open/floor/iron/dark, /area/science/robotics/lab) +"hVe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/quartermaster/storage) "hVj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -24860,23 +24510,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, -/area/hallway/primary/fore) -"hVn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/fore) "hVC" = ( @@ -24890,7 +24529,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/command) "hVH" = ( @@ -24901,16 +24539,12 @@ /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/robot_debris, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"hWl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/surgery) "hWq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 4 }, /turf/open/floor/engine/n2o, @@ -24926,9 +24560,6 @@ "hWu" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/item/storage/box/matches, /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron/dark, @@ -24942,6 +24573,11 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) +"hWW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/quartermaster/storage) "hXj" = ( /turf/open/floor/iron/white, /area/medical/storage) @@ -24994,22 +24630,25 @@ }, /obj/effect/landmark/start/station_engineer, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "hYe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "hYg" = ( @@ -25035,12 +24674,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -25049,9 +24682,6 @@ /area/engine/engineering) "hYp" = ( /obj/structure/dresser, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -25063,37 +24693,46 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "hYr" = ( /turf/closed/wall, /area/ai_monitored/security/armory) "hYs" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"hYu" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "hYy" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/rnd/production/circuit_imprinter, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/engine/storage_shared) "hYz" = ( /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/white{ icon_state = "1-8" }, /obj/effect/spawner/lootdrop/glowstick/lit, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "hYB" = ( @@ -25112,18 +24751,18 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "hYG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/side{ dir = 8 }, @@ -25159,6 +24798,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/janitor) "hZf" = ( @@ -25215,6 +24860,12 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "hZU" = ( @@ -25242,9 +24893,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/radio/intercom{ frequency = 1423; name = "Interrogation Intercom"; @@ -25258,9 +24906,6 @@ /area/space/nearstation) "iaK" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, /area/science/storage) @@ -25284,58 +24929,46 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "iaT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/item/radio/intercom{ dir = 1; pixel_x = -32; pixel_y = -2 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "iaV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "ibb" = ( /obj/machinery/porta_turret/ai{ dir = 4 }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"ibt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "ibU" = ( /obj/machinery/airalarm/directional/north, -/turf/open/floor/carpet/grimy, -/area/chapel/office) -"ibW" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/plating, -/area/maintenance/port/fore) -"icb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/turf/open/floor/carpet/grimy, +/area/chapel/office) +"icb" = ( /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -25346,6 +24979,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "ict" = ( @@ -25368,7 +25007,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engine_room) "icD" = ( @@ -25441,17 +25081,24 @@ }, /turf/open/floor/plating, /area/medical/virology) +"idC" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "idE" = ( /obj/machinery/nanite_programmer, /obj/machinery/camera/directional/east, /turf/open/floor/circuit, /area/science/nanite) "ieb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, @@ -25460,7 +25107,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -25511,15 +25157,23 @@ /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "iff" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/engine_room) "ifj" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -25543,13 +25197,18 @@ /turf/open/floor/iron, /area/quartermaster/sorting) "ifF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "ifM" = ( @@ -25563,13 +25222,13 @@ pixel_x = 30; pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -25579,6 +25238,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "igj" = ( @@ -25588,33 +25249,32 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"igp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "igv" = ( /obj/structure/flora/ausbushes/pointybush, /turf/open/floor/grass, /area/hallway/primary/starboard) "igx" = ( /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/security/brig) "igE" = ( @@ -25622,9 +25282,6 @@ dir = 10 }, /obj/effect/landmark/start/roboticist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/science/robotics/lab) "igV" = ( @@ -25634,8 +25291,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ihf" = ( @@ -25644,6 +25299,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/crew_quarters/bar) "ihk" = ( @@ -25653,21 +25312,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) -"iht" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron/dark, -/area/maintenance/starboard/secondary) "ihu" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -25692,6 +25342,8 @@ req_access_txt = "22" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "ihR" = ( @@ -25705,7 +25357,7 @@ pixel_y = 28; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -25721,6 +25373,19 @@ /obj/item/reagent_containers/cup/bottle/nutrient/ez, /turf/open/floor/grass, /area/hydroponics/garden) +"iij" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "iiO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25728,12 +25393,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "iiR" = ( @@ -25743,6 +25411,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/crew_quarters/dorms) "ijb" = ( @@ -25761,21 +25430,11 @@ }, /turf/open/floor/iron, /area/medical/chemistry) -"ijk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "ijm" = ( /obj/effect/turf_decal/caution, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/central) "ijB" = ( @@ -25788,12 +25447,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -25806,15 +25459,9 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "ijS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/comfy{ buildstackamount = 0; color = "#742925"; @@ -25823,20 +25470,18 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/carpet/red, /area/security/detectives_office) -"ijU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/security/brig/medbay) "ike" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -25846,24 +25491,9 @@ /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/atmos) -"ikC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "ikF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25882,9 +25512,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/office) "ilc" = ( @@ -25905,6 +25532,12 @@ icon_state = "1-8" }, /obj/effect/spawner/lootdrop/glowstick/lit, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port) "ilA" = ( @@ -25914,13 +25547,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -25952,9 +25585,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -25965,12 +25595,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -25980,8 +25604,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -26056,9 +25680,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -26098,18 +25719,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/central) -"iot" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/quartermaster/exploration_prep) "iox" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ @@ -26137,15 +25746,15 @@ /area/medical/chemistry) "ioZ" = ( /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "ipn" = ( @@ -26191,9 +25800,6 @@ /turf/open/floor/engine, /area/science/xenobiology) "ipG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26216,11 +25822,9 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "ipQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -26235,9 +25839,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -26248,13 +25849,13 @@ /turf/open/floor/iron/dark, /area/security/brig) "ipY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) "ipZ" = ( @@ -26268,9 +25869,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "iqe" = ( @@ -26278,29 +25879,33 @@ /obj/item/paper_bin, /obj/item/pen, /obj/item/stamp/law, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, /turf/open/floor/iron/dark, /area/lawoffice) "iqz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/engine, -/area/engine/engine_room) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/crew_quarters/bar) "iqT" = ( /obj/machinery/camera/directional/south, /obj/machinery/chem_master, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "iqV" = ( @@ -26413,25 +26018,35 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "iss" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) +"isv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/security/brig) "isC" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -26439,26 +26054,27 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/camera/directional/south, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) -"isR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +"isO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "isT" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26471,10 +26087,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -26496,7 +26112,6 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "itv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/engine/engineering) @@ -26515,12 +26130,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -26543,27 +26152,28 @@ }, /turf/open/floor/iron/dark/telecomms, /area/science/xenobiology) -"iut" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/space/basic, -/area/space/nearstation) "iuM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/construction/mining/aux_base) +"iuT" = ( +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/security/main) "iuU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -26647,9 +26257,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "iwy" = ( @@ -26707,16 +26317,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "ixD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -26738,8 +26342,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) "ixJ" = ( @@ -26749,9 +26353,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/wood, /area/security/detectives_office) "iyd" = ( @@ -26760,9 +26361,6 @@ }, /obj/structure/desk_bell, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -26783,20 +26381,23 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/carpet/red, /area/security/detectives_office) "iyj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/light, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -26805,7 +26406,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -26820,12 +26424,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/aft) -"iyv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "iyD" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -26851,13 +26449,13 @@ /turf/open/floor/iron, /area/maintenance/starboard/secondary) "iyX" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "izb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output, /turf/open/floor/engine/air, /area/engine/atmos) "izd" = ( @@ -26866,7 +26464,6 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "izP" = ( @@ -26887,15 +26484,14 @@ /obj/structure/sign/departments/engineering{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/engineering) "izZ" = ( /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/closet/secure_closet/hydroponics, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, @@ -26922,18 +26518,18 @@ /turf/open/floor/iron, /area/hydroponics) "iAG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, /obj/item/radio/intercom{ pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hydroponics) "iAK" = ( @@ -26947,29 +26543,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/ce_office/flip{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/engineering) "iAW" = ( /turf/open/floor/plating, /area/maintenance/disposal) -"iBg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) "iBi" = ( /obj/machinery/computer/records/security, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -26982,16 +26570,10 @@ /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, /obj/item/flashlight/glowstick/cyan, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/plating, /area/maintenance/department/science) "iBz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -27000,7 +26582,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -27013,18 +26595,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "iCv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -27039,7 +26612,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27053,7 +26625,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -27072,51 +26644,51 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) "iDH" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "iDL" = ( /turf/closed/wall, /area/medical/medbay/lobby) -"iDM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/security/brig) "iDR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/port) +"iDW" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron, -/area/crew_quarters/dorms) -"iDW" = ( -/obj/effect/spawner/structure/window, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/recreation) +/area/hallway/secondary/exit/departure_lounge) "iEf" = ( /obj/structure/barricade/sandbags, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"iEj" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "iEk" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -27140,11 +26712,11 @@ /turf/open/floor/iron/dark, /area/security/main) "iEu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "iEz" = ( @@ -27166,17 +26738,17 @@ /turf/open/floor/iron, /area/hydroponics) "iEM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "iER" = ( @@ -27190,18 +26762,22 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "iEX" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "iFk" = ( @@ -27214,6 +26790,12 @@ /obj/structure/disposalpipe/sorting/mail/destination/disposals/flip{ dir = 2 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "iFt" = ( @@ -27229,10 +26811,15 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "iFz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -27257,14 +26844,23 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"iGg" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +"iFL" = ( +/obj/structure/flora/ausbushes/palebush, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/grass/no_border, +/area/hallway/secondary/command) +"iFV" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, +/turf/open/floor/iron, +/area/hallway/primary/central) +"iGg" = ( +/obj/machinery/holopad, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "iGp" = ( @@ -27305,7 +26901,7 @@ /turf/open/floor/iron, /area/teleporter) "iGU" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron, @@ -27331,11 +26927,12 @@ /turf/open/floor/grass, /area/hydroponics/garden) "iHs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/area/science/xenobiology) "iHv" = ( /obj/machinery/computer/station_alert{ dir = 1 @@ -27352,16 +26949,13 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "iHV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/aft) "iIe" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -27385,22 +26979,16 @@ }, /turf/open/floor/iron, /area/science/mixing) -"iIh" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "iIv" = ( /obj/structure/chair/office/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "iIy" = ( @@ -27424,7 +27012,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -27439,9 +27030,8 @@ /obj/structure/sign/poster/contraband/missing_gloves{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "iJB" = ( @@ -27470,14 +27060,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) @@ -27492,17 +27082,13 @@ /area/crew_quarters/bar) "iKg" = ( /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/chapel{ dir = 6 }, /area/chapel/main/monastery) -"iKh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "iKk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -27527,7 +27113,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ pixel_x = -26 @@ -27535,6 +27120,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "iKT" = ( @@ -27562,14 +27151,12 @@ /turf/open/floor/plating, /area/science/robotics) "iMa" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/iron, +/area/science/shuttle) "iMw" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/shorts/red, @@ -27581,7 +27168,7 @@ /turf/open/floor/iron/white, /area/crew_quarters/toilet) "iMR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -27596,34 +27183,37 @@ /turf/open/floor/grass, /area/hallway/primary/fore) "iNP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/quartermaster/storage) "iNV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/genetics{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "iOb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron, -/area/quartermaster/storage) +/turf/open/floor/iron/dark, +/area/engine/atmos) "iOh" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -27639,6 +27229,12 @@ dir = 4 }, /obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "iOs" = ( @@ -27675,12 +27271,6 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "iOR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/tile/green{ dir = 8 @@ -27706,6 +27296,9 @@ /obj/structure/table/reinforced, /obj/item/tank/internals/plasma/full, /obj/item/analyzer, +/obj/structure/disposalpipe/sorting/mail/destination/toxins/flip{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "iQt" = ( @@ -27765,24 +27358,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) -"iQP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "iQQ" = ( /obj/structure/rack{ pixel_x = -2 @@ -27801,11 +27387,11 @@ /turf/open/floor/wood, /area/library) "iQY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/landmark/start/botanist, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hydroponics) "iRh" = ( @@ -27848,10 +27434,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) "iRP" = ( @@ -27863,16 +27447,14 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library) "iRX" = ( /obj/effect/turf_decal/plaque{ icon_state = "L9" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "iSa" = ( @@ -27891,12 +27473,6 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "iSp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/item/radio/intercom{ pixel_y = -28 }, @@ -27906,6 +27482,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/science) "iSD" = ( @@ -27944,6 +27524,8 @@ dir = 1 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "iTp" = ( @@ -27978,35 +27560,40 @@ /area/ai_monitored/turret_protected/AIsatextAP) "iTP" = ( /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "iTT" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/engine/atmos) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "iUk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 4 }, /turf/open/floor/engine/plasma, /area/engine/atmos) "iUr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/item/radio/intercom{ pixel_x = -26 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "iUv" = ( /obj/item/kirbyplants/random, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -28025,16 +27612,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "iVy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -28056,22 +27639,21 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "iVZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/machinery/door/airlock/research/glass{ name = "Xenobiology Kill Room"; req_access_txt = "47" }, -/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/science/xenobiology) "iWh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sink{ dir = 4; pixel_x = 12 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "iWj" = ( @@ -28089,14 +27671,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "iWm" = ( /obj/effect/turf_decal/tile/purple, /obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) "iWM" = ( @@ -28142,15 +27730,16 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/item/radio/intercom{ pixel_x = -26 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "iXk" = ( @@ -28165,10 +27754,10 @@ /area/crew_quarters/bar) "iXo" = ( /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -28180,10 +27769,6 @@ }, /turf/open/floor/plating, /area/security/checkpoint/science) -"iXN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/engine/atmos) "iXO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -28206,28 +27791,31 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/science/robotics) "iYp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron, /area/quartermaster/storage) "iYq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -28244,18 +27832,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -28263,6 +27845,12 @@ name = "Security Medical"; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/brig/medbay) "iYJ" = ( @@ -28272,13 +27860,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) +"iYQ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "iZh" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -28289,7 +27882,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "iZm" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -28326,22 +27919,19 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/dark/telecomms, +/turf/open/floor/iron/dark/textured, /area/tcommsat/computer) "iZO" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, /area/engine/atmos) "iZU" = ( @@ -28352,17 +27942,16 @@ /turf/open/floor/iron/dark, /area/medical/morgue) "iZW" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input, /turf/open/floor/engine/air, /area/engine/atmos) "iZX" = ( /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/chair/fancy/sofa/old/right{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "jab" = ( @@ -28390,12 +27979,15 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "jan" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -28413,22 +28005,20 @@ /obj/machinery/light_switch{ pixel_x = 26 }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/medical/medbay/aft) "jaw" = ( /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "jay" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -28436,7 +28026,7 @@ /area/crew_quarters/bar) "jaH" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -28528,10 +28118,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron, /area/medical/cryo) @@ -28553,10 +28142,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "jbZ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/engine/engine_room) "jcg" = ( @@ -28570,9 +28159,12 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/holopad, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/cryo) "jcB" = ( @@ -28603,7 +28195,7 @@ /turf/open/floor/grass, /area/hallway/primary/fore) "jdc" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/firealarm{ @@ -28626,14 +28218,11 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) -"jdB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "jdN" = ( /turf/closed/wall, /area/maintenance/starboard/fore) @@ -28642,12 +28231,6 @@ /turf/open/floor/plating, /area/medical/sleeper) "jdT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -28657,21 +28240,38 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"jef" = ( +"jee" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/brig) +"jeh" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/office) +"jem" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "jeo" = ( /obj/structure/table, /obj/item/book/manual/wiki/engineering_guide, @@ -28681,11 +28281,14 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/science/shuttle) -"jex" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +"jes" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/security/prison) +"jex" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -28702,15 +28305,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/library) -"jeI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/brig) "jeM" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/structure/extinguisher_cabinet/directional/east, @@ -28726,9 +28320,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Pet Storage" }, @@ -28738,25 +28329,19 @@ "jfh" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/railing{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) "jfp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/security/brig/medbay) "jfr" = ( @@ -28802,9 +28387,6 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron/white, /area/science/explab) "jfW" = ( @@ -28822,8 +28404,8 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "jge" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engine_smes) "jgj" = ( @@ -28833,21 +28415,13 @@ name = "conveyor belt crate" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "jgo" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engine_room) "jgB" = ( @@ -28862,7 +28436,7 @@ /turf/open/floor/iron/dark, /area/engine/storage) "jhh" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -28876,21 +28450,23 @@ /turf/open/floor/plating, /area/security/brig) "jhq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron, /area/teleporter) "jhu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron, /area/hallway/primary/fore) +"jhv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/prison, +/area/security/prison) "jhw" = ( /obj/structure/transit_tube/curved{ dir = 1 @@ -28909,44 +28485,41 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/iron/dark, /area/security/main) "jhD" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "jhK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/virology) -"jhT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/medbay/aft) "jiR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "jiV" = ( @@ -28970,13 +28543,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/security/nuke_storage) "jja" = ( @@ -28989,7 +28562,10 @@ /area/maintenance/starboard/aft) "jjp" = ( /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -29043,9 +28619,6 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "jkB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -29057,22 +28630,10 @@ }, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) -"jkV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "jlk" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -29088,7 +28649,7 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "jlF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "jlO" = ( @@ -29102,7 +28663,7 @@ /turf/open/floor/iron/dark, /area/security/main) "jlV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -29110,31 +28671,31 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) -"jmP" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +"jmy" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron, +/area/quartermaster/storage) "jmS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/engine_room) +/turf/open/floor/iron, +/area/engine/atmos) "jnk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -29146,13 +28707,13 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -29173,6 +28734,12 @@ pixel_x = -3; pixel_y = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/wood, /area/library) "jop" = ( @@ -29187,16 +28754,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/space/basic, /area/space/nearstation) "joJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/machinery/light, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "joR" = ( @@ -29204,13 +28774,12 @@ /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) "jpa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/engine/engine_room) "jpd" = ( @@ -29226,12 +28795,20 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/engine_room) "jpk" = ( /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) +"jpv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/primary/fore) "jpA" = ( /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -29277,33 +28854,32 @@ /turf/open/floor/engine, /area/engine/engine_room) "jqx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "jqz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/turf/open/floor/carpet/orange, +/area/crew_quarters/heads/chief) "jqT" = ( /obj/structure/table/glass, /obj/machinery/light, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -29332,22 +28908,22 @@ /area/space/nearstation) "jrA" = ( /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/engine, /area/engine/engine_room) "jsj" = ( /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old/right, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "jsw" = ( @@ -29361,9 +28937,6 @@ /obj/effect/turf_decal/plaque{ icon_state = "L1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -29402,15 +28975,15 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "jsW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -29442,8 +29015,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -29486,17 +29059,10 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "juK" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Panel Airlock"; - req_access_txt = "10" - }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -29530,14 +29096,13 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "jvn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "jvu" = ( /obj/effect/spawner/structure/window/reinforced, @@ -29551,14 +29116,9 @@ /turf/open/floor/plating, /area/science/lab) "jvD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "jvN" = ( /obj/item/radio/intercom{ pixel_x = -28; @@ -29576,17 +29136,17 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "jvW" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -29595,14 +29155,16 @@ /turf/open/space/basic, /area/space/nearstation) "jwq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "jwC" = ( @@ -29615,6 +29177,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "jwL" = ( @@ -29626,20 +29190,7 @@ }, /turf/open/floor/iron/white, /area/science/explab) -"jwW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/office) "jxc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old{ dir = 1 }, @@ -29662,6 +29213,12 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/fore) "jxj" = ( @@ -29678,6 +29235,12 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, /area/maintenance/starboard/central) +"jxy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/crew_quarters/heads/hos) "jxO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -29695,12 +29258,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -29709,18 +29266,29 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) +"jyR" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "jza" = ( /obj/structure/marker_beacon, /turf/open/floor/plating, /area/hallway/secondary/entry) "jzs" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "jzt" = ( @@ -29742,10 +29310,11 @@ /obj/machinery/door/window/brigdoor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/iron/dark, /area/science/server) "jzC" = ( @@ -29769,19 +29338,21 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "jzW" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/hyper, /obj/item/beacon, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "jzY" = ( @@ -29791,7 +29362,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Library" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -29804,27 +29374,25 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) -"jAr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +"jAz" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/black/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/engine/storage) +/area/security/main) "jAB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/hallway/secondary/exit/departure_lounge) "jAH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/dark, /area/engine/engine_room) "jAO" = ( @@ -29841,6 +29409,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jAY" = ( @@ -29866,11 +29440,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/science/robotics/lab) "jBJ" = ( @@ -29912,9 +29489,6 @@ /area/maintenance/department/science/central) "jCe" = ( /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -29934,25 +29508,32 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "jCz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/green/half/contrasted{ +/obj/structure/chair{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/science/shuttle) "jCD" = ( /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "jCO" = ( @@ -29999,6 +29580,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) "jDv" = ( @@ -30030,7 +29612,7 @@ /area/security/prison) "jEd" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron, @@ -30039,7 +29621,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/science/central) "jEq" = ( @@ -30053,10 +29636,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "jEF" = ( @@ -30089,14 +29672,15 @@ /turf/open/floor/iron/dark, /area/hallway/primary/fore) "jFe" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "jFp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/directional/east, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, @@ -30109,12 +29693,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "jFu" = ( @@ -30129,6 +29711,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "jFA" = ( @@ -30152,20 +29737,35 @@ }, /turf/open/floor/iron, /area/ai_monitored/security/armory) -"jGm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +"jGb" = ( +/obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/warden) +"jGm" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "jGs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -30228,7 +29828,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command/glass{ name = "Command Hall Access"; req_one_access_txt = "19;53" @@ -30244,8 +29843,6 @@ /turf/open/floor/plating, /area/hallway/secondary/command) "jHI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -30253,18 +29850,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) -"jHY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron/dark, -/area/security/main) "jId" = ( /turf/open/floor/wood, /area/security/detectives_office) @@ -30290,12 +29879,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -30303,6 +29886,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/misc_lab/range) "jIR" = ( @@ -30317,12 +29906,6 @@ /turf/open/floor/iron, /area/science/shuttle) "jIV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/quartermaster/exploration_prep) @@ -30363,14 +29946,23 @@ /turf/open/floor/plating, /area/maintenance/port/central) "jJM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/medical/chemistry) +/area/science/research) "jJT" = ( /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "jJY" = ( @@ -30385,10 +29977,10 @@ dir = 9 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -30400,25 +29992,28 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/chair/stool/directional/south{ dir = 1 }, /turf/open/floor/prison, /area/security/prison) "jKi" = ( -/obj/structure/closet/toolcloset, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, -/area/science/shuttle) +/area/hallway/primary/fore) "jKk" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/dress/skirt/purple, @@ -30426,6 +30021,16 @@ /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"jKy" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "jKO" = ( /obj/structure/window/reinforced{ dir = 8 @@ -30443,9 +30048,6 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "jKQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/poster/random{ pixel_y = -32 }, @@ -30453,6 +30055,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "jLw" = ( @@ -30467,7 +30075,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -30476,15 +30083,6 @@ /obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/maintenance/starboard/secondary) -"jLD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/shuttle) "jLS" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -30502,6 +30100,12 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "jMf" = ( @@ -30509,10 +30113,10 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -30550,19 +30154,22 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, /area/security/warden) "jNb" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/chemistry) "jNe" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -30575,9 +30182,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "jNl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -30585,7 +30189,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "jNq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -30602,7 +30205,6 @@ "jNI" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, @@ -30619,6 +30221,12 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "jOn" = ( @@ -30655,6 +30263,12 @@ dir = 4 }, /obj/item/flashlight/glowstick/yellow, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "jPp" = ( @@ -30664,7 +30278,7 @@ /turf/open/floor/iron/white, /area/medical/virology) "jPu" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -30672,12 +30286,16 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"jPv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "jPK" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig/dock) "jPL" = ( @@ -30699,25 +30317,11 @@ /area/security/detectives_office) "jPP" = ( /obj/effect/turf_decal/tile/red/diagonal_edge, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/chair/office{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/main) -"jPQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/port) "jPR" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron, @@ -30733,17 +30337,20 @@ /turf/open/floor/plating, /area/tcommsat/computer) "jQm" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/item/radio/intercom{ + pixel_x = 29; + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/iron/freezer, -/area/security/prison) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/science/shuttle) "jQA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/engine_room) @@ -30758,9 +30365,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/storage/tools) "jQN" = ( @@ -30768,8 +30376,8 @@ req_access_txt = "24" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/atmos) "jRh" = ( @@ -30782,9 +30390,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, @@ -30838,40 +30443,28 @@ id = "medbay_lockdown"; name = "lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "jSk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "jSt" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "jSK" = ( @@ -30883,6 +30476,16 @@ dir = 5 }, /area/science/breakroom) +"jSW" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/starboard) "jSX" = ( /obj/machinery/computer/crew{ dir = 4 @@ -30906,12 +30509,6 @@ /turf/open/floor/iron, /area/science/shuttle) "jTw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -30927,10 +30524,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "jTU" = ( @@ -31030,22 +30628,8 @@ dir = 8 }, /obj/machinery/suit_storage_unit/atmos, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/iron/dark, /area/engine/atmos) -"jUV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) -"jVq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/storage/tools) "jVA" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -31064,10 +30648,8 @@ /area/science/research) "jVV" = ( /obj/structure/window/reinforced/spawner/west, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 4; - external_pressure_bound = 120; - name = "server vent" +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 }, /turf/open/floor/circuit, /area/science/server) @@ -31080,14 +30662,11 @@ /turf/closed/wall, /area/bridge) "jWp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "jWy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/chair/fancy/sofa/old/left{ dir = 8 }, @@ -31118,6 +30697,16 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/secondary) +"jWV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/medical/sleeper) "jWY" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -31127,19 +30716,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"jXm" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) "jXr" = ( /obj/machinery/door/airlock/engineering{ name = "Auxillary Base Construction"; @@ -31152,9 +30728,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/construction/mining/aux_base) "jXu" = ( @@ -31182,10 +30758,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/security/checkpoint/engineering) "jXL" = ( @@ -31215,14 +30790,20 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"jYp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "jYC" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -31250,13 +30831,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "jZr" = ( @@ -31277,9 +30861,6 @@ /area/quartermaster/office) "jZG" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/vendor/mining, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -31293,13 +30874,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/engine/storage) -"jZQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "jZR" = ( /obj/machinery/light/small{ dir = 8 @@ -31312,23 +30886,14 @@ req_access_txt = "5" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "kah" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plating, +/area/maintenance/port/fore) "kan" = ( /obj/machinery/processor, /obj/effect/turf_decal/tile/red, @@ -31338,22 +30903,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Teleporter Maintenance"; req_access_txt = "17"; security_level = 6 }, -/turf/open/floor/plating, -/area/maintenance/department/science/central) -"kbd" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, -/area/maintenance/port/fore) +/area/maintenance/department/science/central) "kbi" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/neutral{ @@ -31373,18 +30935,18 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, -/area/engine/engine_room) -"kbJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/engine/engine_room) "kbN" = ( /obj/machinery/airalarm/directional/north, /obj/structure/closet/secure_closet/miner, @@ -31394,11 +30956,11 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "kbW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/surgery) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "kbY" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -31440,7 +31002,7 @@ }, /area/chapel/main/monastery) "kcp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating/asteroid, @@ -31451,8 +31013,6 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "kcN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -31470,13 +31030,10 @@ /turf/open/floor/iron/white, /area/medical/virology) "kcZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -31486,19 +31043,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"kdj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"kdz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) "kdK" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -31525,33 +31069,9 @@ }, /turf/open/floor/iron/dark/telecomms, /area/science/xenobiology) -"keg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "kev" = ( /turf/open/floor/plating/asteroid, /area/maintenance/port) -"key" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) "keC" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -31565,7 +31085,7 @@ /turf/open/floor/iron, /area/engine/engineering) "keH" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -31581,23 +31101,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "kfp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/atmospherics_engine) "kfu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red{ @@ -31615,23 +31134,27 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage) "kgh" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"kgl" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "kgo" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -31644,13 +31167,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "kgz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -31663,7 +31192,6 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/command) "kgJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/button/door{ id = "medbay_lockdown"; name = "emergency lockdown"; @@ -31671,6 +31199,10 @@ req_access_txt = "5" }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "kgX" = ( @@ -31683,6 +31215,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "khh" = ( @@ -31697,6 +31235,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/red, /area/security/detectives_office) "khz" = ( @@ -31710,12 +31251,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -31728,30 +31263,24 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "kih" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Panel Airlock"; - req_access_txt = "10" - }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "kij" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "kim" = ( @@ -31762,8 +31291,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ name = "Chapel Office"; @@ -31771,24 +31298,16 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/office) -"kiz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "kiD" = ( /turf/open/floor/engine/co2, /area/engine/atmos) "kiH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 5 - }, /obj/machinery/camera/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/engine, /area/engine/engine_room) "kiW" = ( @@ -31820,14 +31339,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"kjy" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plating/asteroid, -/area/maintenance/port) "kjC" = ( /obj/machinery/door/window{ dir = 8; @@ -31856,12 +31367,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/engine, /area/engine/engine_room) "kjG" = ( @@ -31876,15 +31381,14 @@ /turf/open/floor/circuit/green, /area/security/nuke_storage) "kjZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "kkd" = ( @@ -31903,14 +31407,6 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"kkf" = ( -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/black/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/main) "kkg" = ( /obj/machinery/vending/boozeomat/captain, /turf/open/floor/wood, @@ -31934,14 +31430,14 @@ dir = 1 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/security/main) +"kkN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "kkP" = ( /obj/structure/chair/office{ dir = 1 @@ -31954,6 +31450,13 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"kkV" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron, +/area/crew_quarters/bar) "klq" = ( /obj/machinery/light_switch{ pixel_x = -25 @@ -31962,15 +31465,15 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "klr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "klB" = ( @@ -31998,10 +31501,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -32014,6 +31517,8 @@ pixel_x = 28 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/bar) "klP" = ( @@ -32026,12 +31531,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "klU" = ( @@ -32049,6 +31552,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "kmb" = ( @@ -32064,7 +31573,6 @@ name = "Solitary confinement timer"; pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light{ dir = 1 }, @@ -32081,27 +31589,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/security/prison) -"kmv" = ( -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/security/brig) "kmA" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -32111,16 +31598,10 @@ location = "hall19" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) -"kmY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "kni" = ( /obj/structure/table/wood, /obj/item/storage/secure/briefcase, @@ -32149,8 +31630,8 @@ req_access = null; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -32161,9 +31642,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/bridge) "knz" = ( @@ -32179,17 +31657,12 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "koc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "kod" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32212,13 +31685,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -32255,18 +31728,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "kpe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -32274,6 +31748,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engineering) "kpg" = ( @@ -32284,9 +31764,6 @@ /turf/open/floor/grass, /area/hallway/primary/starboard) "kpi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -32302,7 +31779,6 @@ /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/recharge_station, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -32310,15 +31786,12 @@ /turf/open/floor/circuit/green, /area/science/robotics) "kpn" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, @@ -32331,7 +31804,6 @@ req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32340,7 +31812,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "kpI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/light{ @@ -32353,18 +31825,18 @@ pixel_x = 29; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "kpV" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, -/area/security/brig) +/area/crew_quarters/fitness/recreation) "kpY" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/light{ @@ -32373,9 +31845,6 @@ /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "kqf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/science/explab) "kqo" = ( @@ -32386,7 +31855,7 @@ /turf/open/floor/iron, /area/engine/atmos) "kqr" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 6 }, /obj/structure/lattice/catwalk, @@ -32403,6 +31872,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "kqH" = ( @@ -32440,16 +31915,9 @@ /area/ai_monitored/turret_protected/aisat/foyer) "krC" = ( /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall/r_wall, /area/engine/atmos) -"krF" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/space/basic, -/area/space/nearstation) "krU" = ( /turf/closed/wall, /area/maintenance/starboard/secondary) @@ -32474,6 +31942,13 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"ksq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "ksC" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, @@ -32497,6 +31972,8 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/digital_clock/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "ksO" = ( @@ -32516,15 +31993,21 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "ksW" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/fitness/recreation) "ktc" = ( /turf/closed/wall/r_wall, /area/maintenance/department/bridge) @@ -32540,18 +32023,22 @@ /turf/open/floor/plating, /area/maintenance/disposal) "ktH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "ktL" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "kub" = ( @@ -32561,30 +32048,22 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "kuf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "kug" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron/dark, -/area/security/main) +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron, +/area/engine/atmos) "kuk" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 @@ -32594,16 +32073,22 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"kup" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "kuy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -32647,19 +32132,21 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "kvG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, @@ -32702,26 +32189,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) -"kwv" = ( -/obj/effect/landmark/start/bartender, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "kwF" = ( /obj/structure/window/reinforced{ dir = 4 @@ -32739,16 +32220,12 @@ "kwG" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "kwI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/siding/wood{ @@ -32775,13 +32252,16 @@ location = "hall9" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "kxj" = ( /obj/effect/landmark/start/cyborg, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/machinery/recharge_station, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -32789,22 +32269,12 @@ /turf/open/floor/circuit/green, /area/science/robotics) "kxy" = ( -/obj/machinery/advanced_airlock_controller/directional/south, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/science/shuttle) "kxz" = ( /obj/structure/sign/departments/minsky/research/research{ pixel_x = -32 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, @@ -32813,8 +32283,8 @@ }, /area/science/research) "kxB" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/plasma_tank{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32832,12 +32302,6 @@ /turf/closed/wall/r_wall, /area/engine/storage) "kxK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/camera/directional/south, /obj/structure/sign/map/right{ pixel_x = 16; @@ -32847,6 +32311,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "kxM" = ( @@ -32857,12 +32327,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/toilet) -"kxW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "kyg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32893,7 +32357,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -32901,7 +32364,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "kyy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/item/radio/intercom{ pixel_x = 27 }, @@ -32941,9 +32404,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -32956,15 +32416,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "kAm" = ( @@ -32977,25 +32437,39 @@ dir = 4 }, /obj/machinery/camera/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/science/robotics/lab) "kAN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, -/area/engine/atmos) +/area/science/shuttle) "kAU" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/primary/fore) "kBi" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -33006,18 +32480,18 @@ }, /obj/machinery/portable_atmospherics/canister, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "kBt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -33027,12 +32501,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -33040,14 +32508,6 @@ /obj/structure/transit_tube/diagonal/topleft, /turf/open/space/basic, /area/space) -"kBL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "kBX" = ( /obj/machinery/camera/directional/west, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -33072,14 +32532,23 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/wood, /area/hallway/primary/fore) "kCo" = ( /obj/structure/chair/office, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/security/main) "kCx" = ( @@ -33131,17 +32600,17 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "kDC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) +/turf/open/floor/iron/white, +/area/science/research) "kDK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33151,12 +32620,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"kEd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "kEu" = ( /obj/machinery/door/airlock/medical/glass{ name = "Chemical Manufactoring"; @@ -33167,6 +32630,8 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "kEH" = ( @@ -33194,11 +32659,16 @@ dir = 9 }, /obj/structure/tank_dispenser/oxygen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /turf/open/floor/iron/dark, /area/engine/atmos) +"kFd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/turf/open/floor/plating, +/area/maintenance/fore) "kFB" = ( /obj/machinery/camera/directional/west, /obj/machinery/light{ @@ -33216,9 +32686,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/qm) "kFS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -33228,7 +32695,7 @@ /obj/structure/sign/warning/vacuum{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/secondary) @@ -33250,8 +32717,11 @@ dir = 1 }, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "kGs" = ( @@ -33268,13 +32738,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/medical/sleeper) "kHa" = ( @@ -33287,7 +32757,6 @@ /turf/open/floor/wood, /area/security/prison) "kHo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 @@ -33295,12 +32764,11 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "kHq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall24"; location = "hall23" @@ -33312,32 +32780,32 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = 1; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "kHY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/dark/telecomms, +/turf/open/floor/iron/dark, /area/tcommsat/relay) "kIy" = ( /obj/structure/cable/yellow{ @@ -33360,14 +32828,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -33384,19 +32852,13 @@ pixel_x = -6; pixel_y = 27 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/iron/dark, /area/security/execution/education) "kIX" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -33407,17 +32869,18 @@ }, /turf/open/floor/iron, /area/bridge) -"kJm" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 +"kJc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, +/turf/open/floor/iron, +/area/hallway/primary/central) +"kJm" = ( +/obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "kJn" = ( @@ -33433,7 +32896,7 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "kJE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/plating/asteroid, @@ -33450,6 +32913,9 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "kJI" = ( @@ -33460,24 +32926,12 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ name = "Distro to Waste" }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) -"kJL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "kJP" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -33520,22 +32974,20 @@ /turf/open/floor/iron, /area/hydroponics) "kKB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "kKM" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "kLm" = ( @@ -33553,28 +33005,30 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) -"kMc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"kMh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/brown, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/quartermaster/storage) +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "kMj" = ( /obj/effect/turf_decal/delivery, /obj/machinery/vending/cigarette, @@ -33587,14 +33041,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/keycard_auth{ + pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/keycard_auth{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) @@ -33634,16 +33088,10 @@ /turf/open/space/basic, /area/solar/port/fore) "kMF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) "kML" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/closet/secure_closet/exile, /obj/machinery/light/small{ dir = 4 @@ -33665,14 +33113,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "kMU" = ( /obj/structure/window/reinforced/spawner{ @@ -33687,6 +33135,16 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"kNj" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/security/main) "kNy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33701,13 +33159,24 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "kNz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "kNC" = ( @@ -33731,10 +33200,10 @@ /turf/open/floor/iron, /area/ai_monitored/storage/eva) "kOj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/iron, /area/engine/atmos) "kON" = ( @@ -33744,12 +33213,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "kOS" = ( @@ -33791,14 +33254,11 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "kRl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "kRs" = ( @@ -33807,11 +33267,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "kRv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -33828,38 +33285,37 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "kRQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "kRY" = ( /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/bar{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "kSa" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -33869,42 +33325,31 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron, /area/hallway/secondary/exit) "kSl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/science/mixing) "kSo" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) -"kSy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron, -/area/medical/chemistry) "kSS" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "kSU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -33918,12 +33363,6 @@ /obj/item/rcl/pre_loaded, /turf/open/floor/iron, /area/engine/engineering) -"kTk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "kTr" = ( /obj/item/reagent_containers/cup/glass/mug/cocoa{ pixel_x = 10 @@ -33935,13 +33374,16 @@ /obj/effect/turf_decal/tile/red/diagonal_edge, /turf/open/floor/iron/dark, /area/security/main) -"kTz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"kTv" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/prison, +/area/security/prison) +"kTz" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/disposalpipe/sorting/mail/destination/kitchen/flip{ dir = 2 @@ -34012,15 +33454,6 @@ /obj/machinery/washing_machine, /turf/open/floor/iron/freezer, /area/security/prison) -"kUI" = ( -/obj/structure/table/reinforced, -/obj/item/storage/bag/tray, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "kUJ" = ( /obj/structure/chair/office/light{ dir = 4 @@ -34033,9 +33466,6 @@ /area/quartermaster/miningdock) "kUL" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/science/explab) "kUQ" = ( @@ -34058,12 +33488,6 @@ /turf/closed/wall, /area/hallway/primary/fore) "kVo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -34084,20 +33508,24 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "kVV" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/hallway/primary/fore) +/turf/open/floor/carpet/grimy, +/area/chapel/office) "kVX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "kWb" = ( @@ -34112,9 +33540,10 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/public/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "kWj" = ( @@ -34132,15 +33561,24 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "kWs" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "kWB" = ( @@ -34155,6 +33593,9 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/maintenance/disposal) "kWM" = ( @@ -34179,24 +33620,12 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "kXj" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -34221,7 +33650,6 @@ /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "kXw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/west, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green{ @@ -34230,6 +33658,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "kXF" = ( @@ -34240,7 +33670,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/science/nanite) "kXP" = ( @@ -34248,11 +33677,14 @@ dir = 9 }, /obj/structure/closet/l3closet/scientist, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/science/xenobiology) +"kYg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "kYm" = ( /obj/machinery/disposal/deliveryChute{ dir = 8 @@ -34275,9 +33707,6 @@ /turf/open/floor/iron, /area/hydroponics) "kYQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -34285,6 +33714,12 @@ /obj/structure/disposalpipe/sorting/mail/destination/library/flip{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "kYS" = ( @@ -34347,6 +33782,9 @@ /obj/effect/turf_decal/tile/bar{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "lao" = ( @@ -34364,14 +33802,14 @@ name = "Security Post - Cargo"; req_one_access_txt = "1;30" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/checkpoint/science) "lbE" = ( @@ -34388,10 +33826,7 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "lbF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -34427,9 +33862,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/bridge) "lbR" = ( @@ -34437,6 +33872,9 @@ dir = 4; pixel_y = -5 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "lbV" = ( @@ -34444,6 +33882,12 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "lbX" = ( @@ -34466,13 +33910,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "lct" = ( @@ -34510,9 +33954,14 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "lcM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/iron, -/area/teleporter) +/area/engine/atmos) "lcN" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/bottle/epinephrine, @@ -34520,6 +33969,19 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/sleeper) +"lcU" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "lda" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate{ @@ -34529,6 +33991,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "ldf" = ( @@ -34547,16 +34010,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "ldw" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/landmark/start/depsec/supply, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -34564,13 +34024,13 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/supply) +"ldR" = ( +/obj/structure/window/reinforced/spawner, +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/space/basic, +/area/space/nearstation) "lee" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old/left{ dir = 8 }, @@ -34646,8 +34106,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/iron/cafeteria{ dir = 5 @@ -34666,17 +34126,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"lfN" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"lfy" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/turf/open/floor/engine, +/area/engine/engine_room) +"lfN" = ( +/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -34686,11 +34152,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) @@ -34722,12 +34188,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "lhd" = ( @@ -34760,9 +34227,9 @@ /obj/machinery/door/airlock{ name = "Unisex Washroom" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/toilet) "lhL" = ( @@ -34772,6 +34239,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "lhX" = ( @@ -34787,9 +34260,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/aft) "lin" = ( @@ -34798,7 +34271,7 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) @@ -34809,15 +34282,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"liw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron, -/area/security/courtroom) "lix" = ( /obj/structure/chair/fancy/sofa/old/left{ dir = 4 @@ -34842,11 +34306,9 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -34896,13 +34358,13 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "lkI" = ( @@ -34929,6 +34391,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "lkS" = ( @@ -34936,7 +34404,6 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "lla" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34951,11 +34418,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "llm" = ( @@ -34977,6 +34445,8 @@ /obj/structure/sign/painting/library{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/library) "llY" = ( @@ -35006,29 +34476,25 @@ /turf/open/floor/iron, /area/hydroponics) "lmn" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "lmq" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/genetics/flip{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "lmv" = ( @@ -35048,6 +34514,13 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 8; + target_pressure = 500 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "lnb" = ( @@ -35055,12 +34528,6 @@ name = "Head of Personnel's Office"; req_access_txt = "57" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -35068,25 +34535,14 @@ /obj/effect/turf_decal/siding/wood/end{ dir = 8 }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) -"lnn" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/medical/chemistry) -"lns" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/prison/dark, -/area/security/prison) +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "lnz" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -35115,7 +34571,7 @@ /turf/open/floor/iron, /area/engine/engine_smes) "lnX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -35136,7 +34592,6 @@ req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, @@ -35146,7 +34601,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "loK" = ( /obj/machinery/camera/directional/south, @@ -35160,16 +34615,19 @@ /turf/open/floor/grass, /area/hydroponics/garden) "loW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs/right{ dir = 1 }, /area/hallway/secondary/service) "lpb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/science/research) "lpj" = ( @@ -35179,9 +34637,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -35189,6 +34644,12 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "lpo" = ( @@ -35198,21 +34659,18 @@ /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "lpt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/starboard/secondary) "lpw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -35233,12 +34691,6 @@ /turf/open/floor/iron/dark, /area/security/warden) "lpO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -35248,13 +34700,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) -"lpT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/central) "lpU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -35266,28 +34711,22 @@ name = "Mining Dock Airlock"; req_access_txt = "48" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "lqo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/engine/engineering) "lqt" = ( @@ -35301,24 +34740,37 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "lqw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "lqJ" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "lqS" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input, /turf/open/floor/engine/n2, /area/engine/atmos) +"lqY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/construction/mining/aux_base) "lrf" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, @@ -35337,10 +34789,10 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -35366,13 +34818,14 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "lrY" = ( /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/machinery/button/door{ desc = "A remote control switch."; id = "QMLoaddoor2"; @@ -35403,20 +34856,12 @@ /turf/open/floor/plating, /area/science/misc_lab/range) "lsi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"lsm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "lsM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, @@ -35425,6 +34870,10 @@ "lsT" = ( /obj/effect/landmark/start/chemist, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "ltl" = ( @@ -35452,10 +34901,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -35488,21 +34937,15 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "luS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/engine/atmos) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/science/mixing) "lvb" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/freezer, @@ -35528,6 +34971,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/maintenance/starboard/aft) "lvw" = ( @@ -35536,6 +34985,8 @@ "lvy" = ( /obj/structure/disposalpipe/segment, /obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "lvM" = ( @@ -35545,6 +34996,12 @@ amount = 5 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "lvN" = ( @@ -35566,28 +35023,31 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/iron, -/area/hallway/primary/aft) -"lwu" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/iron, -/area/quartermaster/storage) +/area/hallway/primary/aft) "lwx" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/effect/spawner/room/threexfive, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port) "lwz" = ( @@ -35600,21 +35060,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/science/nanite) "lwH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "lxe" = ( @@ -35640,12 +35103,6 @@ /turf/open/floor/noslip/white, /area/security/prison) "lxg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) @@ -35657,7 +35114,7 @@ /turf/open/floor/iron, /area/janitor) "lxt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -35666,11 +35123,11 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "lxu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -35683,29 +35140,31 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/storage/tools) +"lxE" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) "lxJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"lxO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) "lya" = ( /obj/machinery/light, /obj/machinery/firealarm/directional/west, @@ -35768,12 +35227,17 @@ /area/engine/atmos) "lyC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "lyI" = ( @@ -35807,20 +35271,17 @@ /turf/open/floor/iron/dark, /area/security/main) "lyP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron, -/area/security/brig/dock) +/area/hallway/secondary/exit/departure_lounge) "lyZ" = ( /obj/machinery/firealarm{ dir = 4; @@ -35831,13 +35292,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"lzw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/dark, -/area/chapel/main/monastery) "lzJ" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -35874,7 +35328,7 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "lAu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 9 }, /turf/open/floor/plating, @@ -35888,6 +35342,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/space/basic, /area/space/nearstation) "lAK" = ( @@ -35911,12 +35368,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "lBg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, @@ -35929,9 +35380,6 @@ }, /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/stack/medical/gauze, /turf/open/floor/iron/white, /area/medical/chemistry) @@ -35943,16 +35391,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/iron, /area/quartermaster/storage) -"lBD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "lBL" = ( /obj/machinery/light{ dir = 4 @@ -35964,13 +35402,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/hallway/primary/starboard) "lBT" = ( @@ -35991,7 +35429,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -36046,12 +35484,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "lDt" = ( @@ -36063,9 +35502,6 @@ /turf/open/floor/iron, /area/quartermaster/storage) "lDv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -36076,6 +35512,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/engine/atmos) "lDP" = ( @@ -36110,12 +35547,6 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "lEI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -36131,8 +35562,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "lEW" = ( @@ -36148,7 +35581,9 @@ dir = 8; name = "Thermoelectric Generator Output" }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "lFv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36160,9 +35595,6 @@ /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "lFz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/requests_console{ pixel_y = 32 }, @@ -36200,13 +35632,11 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "lGg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron/chapel{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/area/chapel/main/monastery) +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "lGi" = ( /obj/machinery/computer/crew{ dir = 8 @@ -36232,6 +35662,9 @@ pixel_y = -25 }, /obj/item/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "lGy" = ( @@ -36245,12 +35678,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "lGD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, @@ -36274,28 +35710,11 @@ }, /turf/open/floor/engine/cult, /area/library) -"lHy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) -"lHI" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/security/prison) "lHM" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -36314,18 +35733,25 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "lIe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/hallway/primary/fore) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "lIB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -36336,12 +35762,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -36353,15 +35773,18 @@ name = "Secure Tech Storage"; req_access_txt = "19;23" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/storage) -"lIG" = ( +"lIO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/wood, -/area/security/detectives_office) -"lIO" = ( /turf/open/floor/iron/white, /area/science/mixing) "lJc" = ( @@ -36378,27 +35801,19 @@ /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, /area/maintenance/starboard/central) -"lJn" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "lJq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/misc_lab/range) "lJx" = ( @@ -36430,12 +35845,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/science/server) "lKi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -36481,30 +35896,39 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/medical/medbay/central) "lKZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/security/brig) -"lLa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) +"lLa" = ( /obj/item/beacon, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/office) "lLj" = ( @@ -36529,19 +35953,11 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "lLu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 + dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) @@ -36552,26 +35968,38 @@ /turf/open/floor/iron, /area/science/mixing) "lLT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/crew_quarters/toilet) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/engine_room) "lLZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/chapel/office) -"lMt" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "lMC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -36580,7 +36008,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -36600,13 +36028,19 @@ /turf/open/floor/iron/dark, /area/security/warden) "lMI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/engine_room) "lMX" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "lNg" = ( @@ -36642,6 +36076,9 @@ "lNJ" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "lNO" = ( @@ -36666,36 +36103,46 @@ icon_state = "1-8" }, /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = -28 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "lOg" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "lOh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/fore) +"lOp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "lOs" = ( /obj/structure/table/reinforced, /obj/item/nanite_scanner, @@ -36731,19 +36178,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) -"lPt" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "lPz" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -36755,19 +36196,21 @@ /area/ai_monitored/turret_protected/AIsatextAP) "lPA" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hydroponics) "lPF" = ( /obj/structure/table/wood, /obj/item/candle, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/grass, /area/hallway/primary/fore) "lPJ" = ( @@ -36792,6 +36235,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/heads/chief) "lQc" = ( @@ -36812,17 +36261,17 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "lQs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Thermoelectric Generator Input" }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "lQt" = ( /obj/machinery/door/airlock{ @@ -36845,12 +36294,12 @@ /turf/open/floor/engine, /area/science/xenobiology) "lQA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "lQC" = ( @@ -36892,11 +36341,18 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) +"lRn" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/hallway/primary/central) "lRG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36911,11 +36367,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "lRU" = ( @@ -36928,6 +36384,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/central) "lSt" = ( @@ -36964,17 +36422,18 @@ /turf/open/floor/iron, /area/maintenance/starboard/secondary) "lSJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/sign/poster/random{ pixel_x = -32 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "lSK" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -36990,13 +36449,14 @@ /turf/open/floor/iron, /area/medical/morgue) "lSX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/sign/poster/random{ pixel_x = -32 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "lSZ" = ( @@ -37006,46 +36466,34 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "lTh" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/atmos) -"lTv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "lTO" = ( /obj/effect/landmark/observer_start, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/central) "lUa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/shuttle) "lUd" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "lUi" = ( @@ -37057,6 +36505,13 @@ }, /turf/open/floor/wood, /area/maintenance/port) +"lUj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "lUq" = ( /obj/machinery/requests_console{ pixel_x = 32 @@ -37082,19 +36537,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "lUF" = ( /obj/structure/sign/poster/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) "lUJ" = ( @@ -37115,36 +36572,40 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge) "lVf" = ( /obj/structure/table/reinforced, /obj/item/food/dough, /obj/item/kitchen/rollingpin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"lVr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"lVo" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"lVr" = ( /obj/effect/turf_decal/tile/black/fourcorners, /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/prison, /area/security/prison) "lVF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -37166,17 +36627,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/chair/fancy/comfy{ buildstackamount = 0; color = "#742925"; dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/carpet/red, /area/security/detectives_office) "lVQ" = ( @@ -37184,18 +36642,20 @@ /turf/open/floor/iron, /area/medical/chemistry) "lVU" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, -/area/hallway/primary/central) +/area/science/shuttle) "lWc" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, @@ -37244,21 +36704,30 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "lWB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"lWQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "lWV" = ( /obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; @@ -37270,36 +36739,34 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) "lWW" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood, /area/crew_quarters/dorms) "lXu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/science/shuttle) "lXw" = ( @@ -37320,15 +36787,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"lXD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/carpet/grimy, -/area/chapel/office) "lXO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -37341,12 +36799,6 @@ /turf/open/floor/iron, /area/science/mixing) "lXT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/sink{ pixel_y = 28 }, @@ -37355,19 +36807,32 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"lXY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "lYk" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hydroponics) "lYv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/anesthetic_machine, /obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/surgery) "lYE" = ( @@ -37390,9 +36855,6 @@ /turf/open/floor/iron, /area/science/lab) "lYG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -37416,10 +36878,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/recharge_station, @@ -37457,11 +36919,15 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "lZI" = ( @@ -37469,37 +36935,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/port) "lZJ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/bar) -"lZP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/security/execution/education) "lZS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -37510,13 +36952,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"mae" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "maf" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/greenglow, @@ -37557,8 +36992,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -37570,17 +37005,17 @@ /turf/open/floor/iron/dark, /area/engine/storage_shared) "max" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/checkpoint/supply) "maO" = ( @@ -37608,7 +37043,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -37620,23 +37055,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/chemistry) -"mbj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "mbJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -37645,15 +37071,16 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "mca" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -37661,34 +37088,22 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/iron/white, -/area/science/xenobiology) -"mco" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/quartermaster/warehouse) +/turf/open/floor/iron/white, +/area/science/xenobiology) "mcq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -37701,12 +37116,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"mcN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "mdl" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -37736,18 +37145,23 @@ /turf/open/floor/grass, /area/hydroponics/garden) "mdS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/iron, /area/engine/atmos) "mea" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/command) "mef" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "mev" = ( @@ -37758,7 +37172,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "meA" = ( @@ -37781,22 +37196,21 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "meD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/directional/east, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "meI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/checkpoint/customs) "meJ" = ( @@ -37805,32 +37219,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/science/robotics/lab) "meS" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/dark/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) -"meY" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/brig/dock) "meZ" = ( /obj/machinery/light/small/broken{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "mfc" = ( @@ -37854,14 +37261,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "mfo" = ( @@ -37870,13 +37279,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) -"mfy" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/fore) "mfz" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/black/opposingcorners, @@ -37939,29 +37341,17 @@ /turf/open/floor/iron/chapel, /area/chapel/main/monastery) "mgr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/griddle, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) -"mgw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/engine/engine_room) -"mgC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, -/area/science/xenobiology) +/area/science/research) "mgE" = ( /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -37969,7 +37359,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "mgZ" = ( @@ -37999,12 +37394,15 @@ /area/quartermaster/miningdock) "mhm" = ( /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "mhn" = ( @@ -38017,10 +37415,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -38033,6 +37431,8 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "mhy" = ( @@ -38043,14 +37443,14 @@ "mif" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "miq" = ( @@ -38070,9 +37470,6 @@ /obj/machinery/requests_console{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -38082,8 +37479,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "miO" = ( @@ -38098,7 +37500,6 @@ dir = 1 }, /obj/effect/landmark/start/depsec/engineering, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, @@ -38116,20 +37517,22 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "miV" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -38151,10 +37554,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "mjr" = ( @@ -38169,50 +37572,50 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"mjs" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mjA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "mjG" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "mjK" = ( /obj/machinery/requests_console{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/checkpoint/science) "mjV" = ( @@ -38222,20 +37625,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "mjY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, @@ -38252,19 +37646,24 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "mkw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "mkz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, -/area/hallway/primary/aft) +/area/engine/atmos) "mkF" = ( /turf/closed/wall, /area/chapel/main/monastery) @@ -38277,22 +37676,21 @@ /area/hallway/primary/fore) "mkL" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "mkT" = ( /obj/structure/chair/stool, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) -"mkY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/security/detectives_office) "mla" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -38301,6 +37699,12 @@ /area/security/brig) "mlh" = ( /obj/structure/closet/secure_closet/engineering_chief, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "mlk" = ( @@ -38311,28 +37715,12 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/customs) -"mlp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "mlv" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"mlM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "mlQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -38355,15 +37743,6 @@ }, /turf/open/floor/grass, /area/hallway/primary/fore) -"mlY" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/engine/gravity_generator) "mma" = ( /turf/closed/wall, /area/maintenance/fore) @@ -38393,9 +37772,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) @@ -38406,15 +37782,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "mmv" = ( @@ -38446,29 +37825,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/engine/storage) -"mng" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/grass, -/area/hydroponics/garden) -"mnh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "mnA" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "mnO" = ( @@ -38486,9 +37847,6 @@ /obj/structure/closet/crate, /obj/item/stack/ore/plasma, /obj/item/stack/ore/plasma, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -38498,9 +37856,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -38528,19 +37883,29 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "moI" = ( /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) -"mpn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"mpf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/security/brig/dock) +"mpn" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -38567,7 +37932,6 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "mpX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -38584,21 +37948,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"mqn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/starboard/aft) "mqs" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/stripes/line{ @@ -38614,57 +37971,45 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 8 }, /obj/machinery/meter, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "mqE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "mqF" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate{ - name = "conveyor belt crate" - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/quartermaster/warehouse) -"mqG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/wood, +/area/crew_quarters/fitness/recreation) "mqJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) @@ -38683,19 +38028,6 @@ "mqY" = ( /turf/closed/wall, /area/security/checkpoint/science) -"mrm" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Escape Pod Alpha" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "mrr" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -38706,15 +38038,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "mrH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass, /area/hydroponics/garden) "mrI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -38726,15 +38054,18 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "msv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/security/courtroom) -"msC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, +/turf/open/floor/iron, +/area/science/shuttle) +"msC" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -38751,7 +38082,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -38764,6 +38098,8 @@ icon_state = "4-8" }, /obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "msV" = ( @@ -38837,9 +38173,12 @@ /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) "mtx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/exit) +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/noslip/dark, +/area/engine/engineering) "mtE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38856,13 +38195,19 @@ dir = 8 }, /obj/machinery/camera/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "mtW" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "mua" = ( @@ -38894,10 +38239,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) -"mup" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "mus" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38906,9 +38247,6 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "mux" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -38916,13 +38254,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "muy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/engine/atmos) "muz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38969,9 +38304,17 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "mvn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "mvC" = ( @@ -38985,18 +38328,18 @@ /turf/open/floor/carpet/green, /area/crew_quarters/bar) "mvT" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/light_switch{ pixel_x = 26 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "mvU" = ( /obj/effect/spawner/structure/window/reinforced, @@ -39012,6 +38355,10 @@ /obj/machinery/computer/nanite_cloud_controller, /turf/open/floor/iron/dark, /area/science/nanite) +"mvZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/security/brig/dock) "mwa" = ( /obj/structure/table_frame, /turf/open/floor/plating, @@ -39039,26 +38386,25 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "mwy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/green{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "mwV" = ( @@ -39070,7 +38416,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/command/glass{ name = "Command Hall Access"; req_one_access_txt = "19;53" @@ -39079,15 +38424,16 @@ /turf/open/floor/iron, /area/hallway/secondary/command) "mxa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "mxf" = ( @@ -39103,12 +38449,6 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mxu" = ( @@ -39118,15 +38458,18 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "mxw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -39134,6 +38477,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "mxx" = ( @@ -39159,8 +38506,6 @@ /turf/open/floor/wood, /area/maintenance/port) "mxK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -39171,12 +38516,15 @@ /turf/open/floor/plating, /area/security/main) "mxN" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/prison, -/area/security/prison) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "mxX" = ( /turf/closed/wall, /area/science/xenobiology) @@ -39186,13 +38534,14 @@ /turf/open/floor/plating, /area/maintenance/fore) "myn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/item/radio/intercom{ pixel_x = -26 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "myH" = ( @@ -39204,8 +38553,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -39220,6 +38569,12 @@ /obj/effect/turf_decal/tile/bar{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "mzk" = ( @@ -39240,10 +38595,10 @@ /obj/machinery/door/poddoor/shutters/preopen{ id = "commissaryshuttersdoor" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -39275,12 +38630,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) -"mAf" = ( -/obj/machinery/atmospherics/pipe/simple/dark{ - dir = 9 - }, -/turf/open/floor/plating, -/area/maintenance/port/fore) "mAg" = ( /obj/machinery/portable_atmospherics/canister/water_vapor, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -39311,11 +38660,20 @@ /turf/open/floor/wood, /area/security/prison) "mAy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/space/nearstation) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "mAF" = ( /obj/machinery/camera/directional/east{ c_tag = "Medbay Break Room" @@ -39324,12 +38682,15 @@ /turf/open/floor/iron/white, /area/medical/virology) "mAJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "mAK" = ( @@ -39354,9 +38715,6 @@ /turf/open/floor/wood, /area/security/prison) "mAP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -39380,17 +38738,21 @@ /turf/open/floor/plating, /area/maintenance/fore) "mBx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/science/shuttle) "mBF" = ( /obj/structure/sign/poster/contraband/grey_tide{ pixel_y = 32 @@ -39415,15 +38777,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) -"mBU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/closed/wall, -/area/engine/atmospherics_engine) "mBV" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/requests_console{ pixel_x = -32 }, @@ -39438,11 +38793,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/storage) "mCm" = ( @@ -39453,8 +38808,11 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "mCp" = ( @@ -39477,7 +38835,6 @@ pixel_y = 38; req_access_txt = "5" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "mCz" = ( @@ -39492,16 +38849,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/virology) "mCA" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -39512,6 +38869,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "mCV" = ( @@ -39550,11 +38913,24 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark, /area/security/main) +"mDw" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/brig) "mDG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -39569,13 +38945,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/medical/surgery) "mEi" = ( @@ -39583,8 +38959,6 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "mEq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -39633,22 +39007,28 @@ /turf/open/floor/iron/dark, /area/security/warden) "mEI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/engine/engine_room) "mEJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -39667,20 +39047,20 @@ pixel_x = -28; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "mEY" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -39699,6 +39079,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "mFb" = ( @@ -39712,15 +39096,18 @@ }, /turf/open/floor/engine, /area/engine/supermatter) -"mFq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +"mFw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, -/area/quartermaster/miningdock) +/area/security/brig) "mFx" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -39730,29 +39117,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/security/brig/medbay) -"mFB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/hallway/primary/starboard) -"mFO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine, -/area/engine/engine_room) "mFP" = ( /obj/structure/railing{ dir = 4 @@ -39811,36 +39175,18 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "mHK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/hallway/secondary/service) -"mIA" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/maintenance/starboard/secondary) -"mIU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) +/area/engine/atmos) "mJa" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, @@ -39849,20 +39195,11 @@ /obj/item/stack/sheet/mineral/copper{ amount = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/engine/storage_shared) "mJo" = ( /turf/closed/wall, /area/maintenance/department/bridge) -"mJs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "mJB" = ( /obj/structure/window/reinforced{ dir = 4; @@ -39876,12 +39213,6 @@ /obj/machinery/shower{ pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/medical/genetics/cloning) @@ -39893,13 +39224,16 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "mJL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "mJP" = ( @@ -39935,7 +39269,6 @@ /turf/open/floor/iron, /area/engine/atmos) "mKo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sign/poster/random{ pixel_x = 32 }, @@ -39944,10 +39277,10 @@ /area/hallway/primary/central) "mKw" = ( /obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/holopad, /turf/open/floor/iron/dark, /area/quartermaster/qm) "mKY" = ( @@ -39990,7 +39323,7 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "mLx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "mLz" = ( @@ -39998,8 +39331,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -40010,8 +39341,8 @@ "mLL" = ( /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -40024,17 +39355,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "mMl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/library) "mMt" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -40046,21 +39379,20 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/fore) "mMA" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "mMB" = ( @@ -40096,13 +39428,16 @@ /turf/open/floor/wood, /area/security/prison) "mMI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/hallway/primary/central) "mMQ" = ( @@ -40125,9 +39460,6 @@ pixel_x = -5; pixel_y = -25 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/spawner/lootdrop/glowstick/lit, /obj/structure/rack, /obj/item/paper/pamphlet/gateway, @@ -40151,27 +39483,28 @@ pixel_x = 32 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "mNg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/science/research) "mNh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -40204,14 +39537,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "mNo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -40263,10 +39600,10 @@ pixel_y = -5 }, /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/camera/directional/west, @@ -40276,9 +39613,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "mOr" = ( @@ -40308,10 +39642,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "mOO" = ( @@ -40330,7 +39660,6 @@ /turf/open/floor/engine, /area/engine/engine_room) "mPb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -40342,9 +39671,6 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "mPd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = -28 }, @@ -40355,13 +39681,21 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "mPm" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "mPy" = ( @@ -40382,14 +39716,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"mPJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron/chapel{ - dir = 8 - }, -/area/chapel/main/monastery) "mPQ" = ( /mob/living/simple_animal/bot/medbot/filled{ desc = "A little medical robot, officially part of the Nanotrasen medical inspectorate. He looks somewhat underwhelmed."; @@ -40415,9 +39741,6 @@ color = "#666666"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/wood, /area/library) "mQv" = ( @@ -40435,15 +39758,9 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "mQD" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/department/science) "mQF" = ( @@ -40454,7 +39771,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -40484,6 +39801,9 @@ "mRP" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/science/shuttle) "mRQ" = ( @@ -40513,41 +39833,29 @@ /turf/open/floor/plating, /area/ai_monitored/security/armory) "mSL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/bridge) -"mSO" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/security/brig) "mSV" = ( /obj/structure/closet/crate/goldcrate, /obj/machinery/light, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "mSW" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/item/pen, /obj/machinery/light/small{ dir = 8 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/mapping_helpers/atmos_auto_connect, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/server) "mTa" = ( @@ -40561,25 +39869,20 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "mTf" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "mTg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light{ dir = 8 }, /turf/open/floor/iron/dark, /area/engine/atmos) "mTv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -40596,7 +39899,7 @@ /area/hallway/primary/central) "mTz" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "mTY" = ( @@ -40609,14 +39912,16 @@ /turf/open/floor/plating, /area/maintenance/port) "mUl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) "mUo" = ( @@ -40639,10 +39944,12 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "mUw" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -40663,8 +39970,8 @@ name = "MiniSat AI Access"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -40687,12 +39994,24 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mUW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "mVc" = ( @@ -40705,13 +40024,14 @@ /area/medical/surgery) "mVj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "mVL" = ( @@ -40721,8 +40041,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -40754,7 +40074,6 @@ /turf/open/space/basic, /area/space/nearstation) "mWw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -40762,10 +40081,7 @@ /area/hallway/primary/fore) "mWA" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -40787,6 +40103,16 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) +"mWQ" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/brig) "mWY" = ( /obj/structure/table/wood, /obj/machinery/computer/records/security/laptop{ @@ -40818,13 +40144,16 @@ /turf/open/floor/iron/dark, /area/security/warden) "mXH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "mXJ" = ( @@ -40836,18 +40165,8 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) -"mYg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "mYq" = ( /obj/structure/curtain, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/item/lighter{ pixel_x = -8; pixel_y = -12 @@ -40867,9 +40186,6 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "mYU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/machinery/firealarm{ pixel_y = -24 }, @@ -40897,6 +40213,12 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/port) +"nal" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "nam" = ( /obj/structure/closet/secure_closet/RD, /obj/structure/cable/yellow{ @@ -40915,6 +40237,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "naL" = ( @@ -40956,39 +40284,18 @@ color = "#742925"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/wood, /area/hallway/primary/fore) "nbo" = ( /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) -"nbt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/hallway/secondary/exit) -"nbx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) "nbF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sign/departments/minsky/supply/hydroponics{ pixel_x = 32 }, @@ -41005,6 +40312,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port) "ncj" = ( @@ -41030,26 +40343,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 8 - }, /turf/open/floor/engine, /area/engine/atmospherics_engine) -"ndj" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ndm" = ( /turf/open/floor/engine/air, /area/engine/atmos) @@ -41084,7 +40379,7 @@ /turf/closed/wall, /area/medical/storage) "ndw" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/execution/education) @@ -41106,10 +40401,10 @@ /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -41121,6 +40416,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "nek" = ( @@ -41136,35 +40437,19 @@ /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"nev" = ( -/obj/structure/transit_tube/diagonal, -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "ney" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hydroponics) -"neR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "neZ" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/light{ dir = 8 }, @@ -41178,7 +40463,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "nfg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -41191,6 +40475,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "nfs" = ( @@ -41253,10 +40543,11 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "nfV" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/primary/central) +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/quartermaster/storage) "nfX" = ( /obj/structure/closet/emcloset/anchored, /obj/machinery/light{ @@ -41301,18 +40592,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) -"ngq" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "ngv" = ( /turf/closed/wall/r_wall, /area/science/nanite) @@ -41331,18 +40610,26 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "nhd" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) +"nhe" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "nhk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -41358,7 +40645,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -41386,7 +40672,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) @@ -41403,9 +40688,6 @@ /obj/item/radio/intercom{ pixel_y = 28 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -41413,7 +40695,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "niH" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 5 }, /obj/item/radio/intercom{ @@ -41423,7 +40705,7 @@ /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) "njl" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /obj/structure/cable{ icon_state = "1-2" }, @@ -41431,7 +40713,6 @@ /area/engine/engine_room) "njs" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -41441,13 +40722,18 @@ /turf/open/floor/iron, /area/security/warden) "njD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "njH" = ( @@ -41457,6 +40743,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "njP" = ( @@ -41467,8 +40756,24 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) +"njU" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "nki" = ( /obj/structure/chair/office/light{ dir = 1 @@ -41479,18 +40784,6 @@ }, /turf/open/floor/iron/white, /area/medical/genetics) -"nkt" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "nkH" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -41503,23 +40796,33 @@ /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) "nkY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "nlB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/landmark/event_spawn, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) +"nlI" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "nlP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41565,60 +40868,52 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"nne" = ( -/obj/machinery/door/airlock/external{ - name = "Exploration Shuttle Bay" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "nns" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/crew_quarters/dorms) "nnt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) "nof" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "noq" = ( /obj/item/storage/toolbox/electrical, -/obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/white{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "noy" = ( @@ -41631,8 +40926,8 @@ id = "quarantineshutters"; name = "Isolation Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -41655,6 +40950,12 @@ dir = 9 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/chemistry) "npg" = ( @@ -41696,6 +40997,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/medical/medbay/aft) "npV" = ( @@ -41704,13 +41008,10 @@ }, /obj/machinery/suit_storage_unit/atmos, /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/engine/atmos) "nqb" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" @@ -41723,8 +41024,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -41737,34 +41038,11 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) -"nqn" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/razor{ - pixel_x = -9; - pixel_y = 4 - }, -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "nqu" = ( /obj/structure/chair/office{ dir = 8 @@ -41804,10 +41082,14 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/disposal) "nqP" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -41816,7 +41098,7 @@ /turf/open/floor/iron, /area/science/xenobiology) "nqT" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 1 }, /turf/open/floor/engine, @@ -41833,7 +41115,7 @@ /area/security/brig/medbay) "nra" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/open/floor/plating, @@ -41866,9 +41148,9 @@ name = "Atmospherics Break Room"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "nrI" = ( @@ -41883,11 +41165,16 @@ /area/medical/medbay/central) "nrK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "nss" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "nsu" = ( @@ -41913,9 +41200,6 @@ /area/maintenance/port) "nsK" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -41923,17 +41207,12 @@ /turf/open/floor/iron/dark, /area/bridge) "nsZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/landmark/event_spawn, /mob/living/simple_animal/kalo, /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/janitor) "ntl" = ( @@ -41954,6 +41233,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "ntM" = ( @@ -41968,12 +41253,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/hydroponics/constructable, /turf/open/floor/iron, /area/hydroponics) @@ -41991,9 +41270,6 @@ /area/space) "ntZ" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old/left{ dir = 1 }, @@ -42003,17 +41279,20 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "nud" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/sorting/mail/destination/atmospherics/flip{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/destination/atmospherics/flip{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) +"nuj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/bridge) "nuQ" = ( /obj/machinery/light/small{ dir = 4 @@ -42027,7 +41306,6 @@ /turf/open/floor/prison, /area/security/prison) "nuW" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ name = "Security External Airlock"; @@ -42060,12 +41338,6 @@ }, /turf/open/floor/iron/dark, /area/medical/surgery) -"nvP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/maintenance/port) "nwj" = ( /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, @@ -42074,26 +41346,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/engine/atmos) "nwJ" = ( /turf/open/floor/iron/white, /area/crew_quarters/bar) "nwP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/science/research) "nwT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -42147,6 +41410,22 @@ }, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) +"nyj" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "nym" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -42174,6 +41453,18 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) +"nyF" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/security/prison) "nyS" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -42182,31 +41473,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/quartermaster/sorting) -"nzf" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/iron, -/area/security/brig) +/area/quartermaster/sorting) "nzh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42214,8 +41491,11 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -42230,7 +41510,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/security/courtroom) @@ -42241,9 +41520,6 @@ /obj/machinery/computer/rdconsole/core{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/science/lab) @@ -42251,7 +41527,7 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "nzp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/item/radio/intercom{ pixel_x = 29; pixel_y = -2 @@ -42270,15 +41546,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/medical/medbay/aft) -"nzt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "nzM" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -42290,9 +41557,6 @@ pixel_x = -4; pixel_y = -26 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, @@ -42323,6 +41587,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/wood, /area/crew_quarters/dorms) "nAl" = ( @@ -42330,37 +41595,33 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) "nAo" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/white, /area/science/lab) "nAu" = ( /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage_shared) "nAB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/closet/crate{ name = "conveyor belt crate" }, @@ -42379,6 +41640,7 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "nAR" = ( @@ -42413,6 +41675,9 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/noslip/white, /area/science/research) "nAY" = ( @@ -42422,18 +41687,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "nBe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, -/turf/open/floor/iron, -/area/teleporter) +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "nBl" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -42451,6 +41722,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "nBH" = ( @@ -42480,7 +41757,7 @@ c_tag = "Medbay Break Room"; dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/freezer, @@ -42499,10 +41776,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/machinery/door/airlock/public/glass{ name = "Visitors Centre" }, @@ -42542,6 +41815,10 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron/dark, /area/chapel/office) +"nCV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/turf/open/floor/engine, +/area/engine/engine_room) "nCX" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -42580,13 +41857,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) -"nEm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/science/shuttle) "nEX" = ( /obj/structure/table/reinforced, /obj/item/storage/box/matches{ @@ -42604,13 +41874,11 @@ /turf/open/floor/carpet, /area/maintenance/port) "nFc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/exit) "nFh" = ( @@ -42634,20 +41902,28 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/dorms) "nFz" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "nFF" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/space/basic, -/area/space/nearstation) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "nFQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42666,10 +41942,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/security/prison) "nGh" = ( @@ -42679,19 +41951,16 @@ /turf/open/floor/iron/dark, /area/lawoffice) "nGr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) "nGs" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -42701,21 +41970,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) -"nHd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) "nHf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42723,13 +41985,13 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -42742,13 +42004,13 @@ /turf/open/floor/wood, /area/security/detectives_office) "nHz" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -42760,6 +42022,9 @@ /obj/structure/disposalpipe/sorting/mail/destination/bar/flip{ dir = 2 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "nHM" = ( @@ -42785,16 +42050,9 @@ /turf/open/floor/plating, /area/maintenance/port/central) "nIl" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/grass, +/area/hydroponics/garden) "nIH" = ( /turf/closed/wall/r_wall, /area/hallway/primary/fore) @@ -42808,10 +42066,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "nIV" = ( @@ -42821,6 +42075,12 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/neutral, /obj/machinery/camera/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "nIZ" = ( @@ -42842,12 +42102,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42855,6 +42109,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/security/warden) "nJn" = ( @@ -42887,18 +42147,11 @@ /turf/open/floor/engine, /area/science/xenobiology) "nJJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/engine/atmos) "nJO" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/eastleft{ @@ -42913,7 +42166,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "nKn" = ( @@ -42935,7 +42187,7 @@ /turf/open/floor/iron, /area/science/shuttle) "nKB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -42947,10 +42199,12 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "nKV" = ( @@ -43003,11 +42257,11 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron/white, /area/science/research) @@ -43022,12 +42276,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -43038,7 +42286,7 @@ /obj/structure/window/reinforced/spawner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "nLU" = ( @@ -43071,9 +42319,6 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "nMz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 @@ -43091,45 +42336,39 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "nMB" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "nMC" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/server) "nMK" = ( @@ -43143,22 +42382,19 @@ name = "Exploration Dock Airlock"; req_access_txt = "47;49;7" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/quartermaster/exploration_prep) "nNi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -43189,6 +42425,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "nNr" = ( @@ -43196,9 +42436,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engine_room) "nNs" = ( @@ -43207,21 +42446,26 @@ /turf/open/floor/iron, /area/science/storage) "nNC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "nNL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "nNT" = ( @@ -43232,13 +42476,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal) -"nOl" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "nOz" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -43267,15 +42504,18 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/medical/medbay/aft) "nOG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hydroponics) "nOO" = ( @@ -43303,7 +42543,7 @@ /turf/open/floor/iron, /area/engine/atmos) "nOZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/radio/intercom{ @@ -43323,12 +42563,6 @@ name = "MiniSat External Access"; req_one_access_txt = "65;61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "nPw" = ( @@ -43336,11 +42570,13 @@ pixel_x = -28; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "nPz" = ( @@ -43350,17 +42586,21 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/sorting/mail/destination/detective_office{ dir = 2 }, /turf/open/floor/iron, /area/security/brig) +"nPB" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "nPM" = ( /obj/structure/closet/secure_closet/medical2, /obj/effect/turf_decal/stripes/line, @@ -43381,6 +42621,19 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/iron/white, /area/medical/virology) +"nQi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "nQk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43431,19 +42684,16 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/iron/dark, /area/security/brig) "nRF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/shuttle) "nRJ" = ( @@ -43464,7 +42714,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "nRU" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "nSi" = ( @@ -43477,24 +42727,21 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "nSA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/security/prison) "nSD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43505,7 +42752,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -43514,8 +42761,8 @@ /turf/open/floor/iron, /area/engine/atmos) "nST" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "nTm" = ( @@ -43551,18 +42798,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"nTV" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "nTZ" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -43588,18 +42823,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/fore) "nVd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -43608,6 +42834,8 @@ dir = 1 }, /obj/machinery/camera/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "nVh" = ( @@ -43623,7 +42851,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -43641,7 +42872,7 @@ dir = 1 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -43651,16 +42882,13 @@ /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "nVR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "nVX" = ( /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/table, /obj/item/clothing/gloves/color/latex, /turf/open/floor/iron/white, @@ -43670,10 +42898,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -43690,47 +42918,32 @@ pixel_x = 1; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"nWw" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Escape Airlock" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "nWG" = ( /obj/machinery/door/airlock/external{ name = "MiniSat External Access"; req_one_access_txt = "65;61" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "nWL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -43750,12 +42963,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -43776,7 +42983,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Library" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -43787,9 +42993,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -43866,12 +43071,15 @@ /turf/open/floor/iron, /area/science/shuttle) "nZu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "nZB" = ( @@ -43894,25 +43102,25 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "oaw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -43938,6 +43146,15 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, /area/janitor) +"oaH" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/aft) "oaK" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/siding/purple/corner{ @@ -43952,9 +43169,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/camera/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43966,6 +43180,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "oaU" = ( @@ -43973,15 +43193,11 @@ /turf/open/floor/plating, /area/quartermaster/exploration_prep) "oaY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "oba" = ( @@ -43996,12 +43212,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Medbay" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "obn" = ( @@ -44013,7 +43230,6 @@ /turf/open/floor/grass, /area/hallway/primary/fore) "obs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -44054,12 +43270,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -44078,9 +43288,6 @@ /obj/machinery/computer/operating{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/surgery) @@ -44133,12 +43340,10 @@ /turf/open/floor/iron, /area/bridge) "ocB" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "odl" = ( @@ -44163,12 +43368,17 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "odK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/security/prison) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "odP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44182,13 +43392,15 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "oek" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -44199,9 +43411,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -44211,17 +43420,11 @@ /turf/open/floor/iron, /area/teleporter) "oer" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/light, /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/evidence{ name = "Secure Evidence Closet 2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/railing{ dir = 4 }, @@ -44247,12 +43450,6 @@ /turf/open/floor/prison, /area/security/prison) "oeF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -44272,21 +43469,21 @@ dir = 1 }, /obj/machinery/plumbing/output, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/chemistry) "oeQ" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Waste to Filter" }, /turf/open/floor/iron, -/area/security/brig) +/area/engine/atmos) "ofn" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -44302,12 +43499,15 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "ofo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -44317,7 +43517,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -44332,9 +43535,6 @@ /turf/open/floor/iron, /area/medical/chemistry) "ofC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "ofE" = ( @@ -44381,6 +43581,12 @@ req_access_txt = "23" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "ohm" = ( @@ -44420,9 +43626,6 @@ pixel_x = 1; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44437,14 +43640,13 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"oin" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/medical/surgery) "oiM" = ( /turf/open/floor/iron, /area/hallway/primary/aft) -"oiZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/quartermaster/storage) "ojd" = ( /obj/structure/cable/yellow, /obj/effect/turf_decal/stripes/line{ @@ -44456,15 +43658,6 @@ }, /turf/open/floor/plating, /area/engine/gravity_generator) -"ojz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "ojA" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -44517,6 +43710,9 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/disposal) "old" = ( @@ -44590,9 +43786,6 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/hallway/secondary/exit) "olZ" = ( @@ -44605,15 +43798,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"ome" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel/monastery) "omo" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -44630,9 +43814,6 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/security/brig) "omW" = ( @@ -44663,12 +43844,6 @@ /turf/open/floor/iron/white, /area/science/research) "onl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -44676,6 +43851,9 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/checkpoint/supply) "onn" = ( @@ -44693,22 +43871,21 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/port) -"onp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "onr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, /area/engine/engine_room) "onF" = ( /obj/structure/table/glass, @@ -44740,10 +43917,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/green/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -44818,18 +43995,6 @@ /obj/structure/sign/directions/evac, /turf/closed/wall, /area/crew_quarters/fitness/recreation) -"opB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "opK" = ( /obj/machinery/vending/medical, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -44849,7 +44014,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/bridge) "oqj" = ( @@ -44873,7 +44043,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44882,29 +44051,26 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "orb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, -/area/science/robotics/lab) -"org" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) +/turf/open/floor/iron, +/area/science/robotics/lab) "orw" = ( /obj/machinery/requests_console{ pixel_y = -32 @@ -44928,6 +44094,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "orW" = ( @@ -44947,16 +44119,9 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "osb" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall/r_wall, /area/engine/atmos) -"osA" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) "osX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44964,12 +44129,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "otg" = ( @@ -44984,12 +44143,14 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "otm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron, -/area/medical/chemistry) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engine/engine_room) "otA" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate{ @@ -44997,9 +44158,6 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) @@ -45010,22 +44168,12 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "otM" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/port) -"otQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "otY" = ( /obj/machinery/requests_console{ department = "Medical Lobby"; @@ -45071,6 +44219,8 @@ req_one_access_txt = "1;4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "ouI" = ( @@ -45086,7 +44236,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "ouN" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 1 }, /turf/open/floor/iron, @@ -45096,10 +44246,10 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "ouW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/mix_tank, +/obj/machinery/computer/atmos_control/mix_tank, /turf/open/floor/iron, /area/engine/atmos) "ovt" = ( @@ -45110,11 +44260,13 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "ovu" = ( /obj/effect/turf_decal/stripes/line{ @@ -45126,14 +44278,26 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) +"ovv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/aft) "ovw" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -45161,26 +44325,28 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/security/detectives_office) "owJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "owO" = ( @@ -45193,10 +44359,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/flasher{ @@ -45211,7 +44377,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "owR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, @@ -45220,15 +44385,6 @@ "oxd" = ( /turf/closed/wall, /area/chapel/office) -"oxg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) "oxs" = ( /obj/machinery/door/poddoor{ id = "QMLoaddoor"; @@ -45242,12 +44398,6 @@ /turf/open/floor/iron, /area/quartermaster/storage) "oxw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_one_access_txt = "31;48" @@ -45262,36 +44412,46 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "oxD" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "oxG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/radio/intercom{ + pixel_x = -29; + pixel_y = -2 }, -/turf/open/floor/iron, -/area/quartermaster/storage) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "oxI" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "oxJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/iron/white, +/area/science/explab) "oxN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/security/courtroom) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "oxP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -45299,8 +44459,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) @@ -45352,29 +44515,37 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "oyx" = ( -/obj/effect/turf_decal/sand/plating, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 9 + }, +/area/chapel/main/monastery) "oyz" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/engine/atmos) "oyL" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -45394,9 +44565,6 @@ "ozb" = ( /obj/machinery/vending/engivend, /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/science/shuttle) @@ -45420,16 +44588,20 @@ /obj/item/book/manual/wiki/sopcommand, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"ozr" = ( -/obj/machinery/advanced_airlock_controller/directional/north, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ +"ozm" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/griddle, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) +"ozr" = ( /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/solars/port/aft) "ozs" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -45454,9 +44626,6 @@ /area/crew_quarters/fitness/recreation) "oAp" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -45487,13 +44656,12 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "oBc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, @@ -45505,9 +44673,6 @@ id = "medbay_lockdown"; name = "lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/medical/medbay/lobby) "oBk" = ( @@ -45517,6 +44682,12 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "oBp" = ( @@ -45532,12 +44703,15 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "oBG" = ( @@ -45547,11 +44721,25 @@ }, /turf/open/floor/carpet/grimy, /area/chapel/office) +"oBH" = ( +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "oBJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -45559,14 +44747,31 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"oBV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/quartermaster/storage) "oBX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) +"oCd" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "oCl" = ( /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ @@ -45576,13 +44781,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) -"oCo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "oCy" = ( /obj/structure/barricade/sandbags, /obj/structure/cable/yellow{ @@ -45602,12 +44800,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/qm) "oCK" = ( @@ -45627,6 +44825,12 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/security/brig) "oCW" = ( @@ -45643,21 +44847,24 @@ dir = 8 }, /obj/machinery/rnd/destructive_analyzer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/science/lab) "oDn" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/science/research) "oDo" = ( /obj/structure/table/reinforced, /obj/item/stock_parts/subspace/filter, @@ -45678,15 +44885,6 @@ /obj/item/stock_parts/subspace/treatment, /turf/open/floor/iron/dark, /area/engine/storage) -"oDr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/science/shuttle) "oDu" = ( /obj/machinery/light{ dir = 8 @@ -45694,8 +44892,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "oDB" = ( @@ -45715,12 +44914,12 @@ /turf/open/floor/iron, /area/janitor) "oDE" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "oDN" = ( @@ -45742,23 +44941,20 @@ /obj/effect/turf_decal/plaque{ icon_state = "L3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) "oEh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engine_room) @@ -45806,9 +45002,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "oFn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 @@ -45828,10 +45021,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "oFF" = ( @@ -45854,14 +45050,14 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "oGb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/holopad, /obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/prison, /area/security/prison) "oGf" = ( @@ -45871,9 +45067,6 @@ pixel_y = 3 }, /obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/wood, /area/library) "oGi" = ( @@ -45893,11 +45086,27 @@ /obj/effect/mapping_helpers/atmos_auto_connect, /turf/open/floor/iron/dark, /area/tcommsat/computer) +"oGn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Access"; + req_access_txt = "24" + }, +/turf/open/floor/plating, +/area/hallway/primary/aft) "oGx" = ( -/obj/structure/flora/ausbushes/palebush, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/grass/no_border, -/area/hallway/secondary/command) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "oGH" = ( /obj/structure/flora/ausbushes/stalkybush, /obj/machinery/camera/directional/east, @@ -45920,8 +45129,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/space/basic, @@ -45956,29 +45167,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, /turf/open/floor/iron/white, /area/science/xenobiology) -"oId" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "oIe" = ( /obj/machinery/telecomms/server/presets/service, /turf/open/floor/circuit/telecomms/server, /area/tcommsat/server) "oID" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/medical/morgue) "oIN" = ( @@ -46001,21 +45202,14 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "oIZ" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/engine_room) "oJi" = ( @@ -46032,9 +45226,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/service) "oJn" = ( @@ -46056,13 +45247,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "oJV" = ( @@ -46077,25 +45268,25 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/green, /area/crew_quarters/bar) +"oKm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "oKu" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/sleeper) -"oKN" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/central) "oLv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "oLF" = ( @@ -46105,8 +45296,33 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/port) +"oLK" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "oLV" = ( /turf/closed/wall/mineral/plastitanium, /area/maintenance/starboard/secondary) @@ -46115,14 +45331,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/engineering) "oMs" = ( @@ -46143,40 +45359,23 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"oNk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) -"oNB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "oNE" = ( /obj/item/toy/crayon/spraycan, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/maintenance/starboard/aft) "oNG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46184,6 +45383,12 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "oNL" = ( @@ -46206,6 +45411,12 @@ /obj/machinery/requests_console{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/robotics/lab) "oOl" = ( @@ -46260,18 +45471,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "oOA" = ( @@ -46301,41 +45510,21 @@ /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "oPq" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/machinery/camera/directional/east, /obj/structure/tank_dispenser, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "oPJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white, /turf/open/space/basic, /area/solar/port/aft) -"oQg" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/maintenance/port) -"oQi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) "oQo" = ( /obj/machinery/light, /obj/item/radio/intercom{ @@ -46352,13 +45541,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -46371,30 +45560,22 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + dir = 1 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "oQO" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/aft) -"oQR" = ( -/obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/iron, +/area/hydroponics) "oRr" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -46405,9 +45586,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/wood, /area/crew_quarters/bar) "oRA" = ( @@ -46426,20 +45604,20 @@ dir = 10 }, /obj/structure/closet/emcloset, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /turf/open/floor/iron/white, /area/science/xenobiology) "oSJ" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/closet/emcloset, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "oSK" = ( @@ -46466,6 +45644,18 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"oTy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "oTD" = ( /obj/structure/sink{ dir = 4; @@ -46477,37 +45667,36 @@ /turf/open/floor/iron/white, /area/crew_quarters/toilet) "oTE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/item/radio/intercom{ pixel_x = -28; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "oTI" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/engine/engine_room) "oTU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/sign/departments/minsky/research/robotics{ pixel_y = -32 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "oUl" = ( @@ -46525,9 +45714,6 @@ /turf/open/floor/iron, /area/quartermaster/exploration_prep) "oUu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46535,10 +45721,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "oUF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/item/beacon, /obj/structure/disposalpipe/segment{ dir = 4 @@ -46571,14 +45760,43 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"oVh" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/engine/engine_room) +"oVr" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "oVF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "oVG" = ( @@ -46620,11 +45838,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/engine/engine_room) "oWJ" = ( @@ -46647,15 +45867,10 @@ /turf/open/floor/circuit/telecomms/server, /area/tcommsat/server) "oWO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "oWU" = ( @@ -46698,12 +45913,17 @@ /turf/open/space/basic, /area/space) "oXu" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, -/area/maintenance/starboard/fore) +/area/maintenance/starboard/aft) "oXI" = ( /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) @@ -46715,15 +45935,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "oYp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall, /area/engine/atmospherics_engine) "oYs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/griddle, /turf/open/floor/iron/white, @@ -46742,9 +45957,14 @@ pixel_x = 29; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) +"oYD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/prison, +/area/security/prison) "oYJ" = ( /obj/structure/chair{ dir = 4 @@ -46752,9 +45972,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/machinery/camera/directional/north, /obj/structure/window/reinforced{ dir = 4 @@ -46773,8 +45990,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "oZf" = ( @@ -46794,29 +46009,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "oZl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Cell Bathroom" }, /turf/open/floor/prison/dark, /area/security/prison) -"oZt" = ( -/obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron, -/area/science/shuttle) "oZJ" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -46865,6 +46062,8 @@ pixel_y = -5 }, /obj/item/bedsheet/random, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison/dark, /area/security/prison) "paW" = ( @@ -46884,9 +46083,6 @@ /turf/open/floor/iron, /area/engine/engine_room) "pbk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -46902,15 +46098,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) "pbA" = ( @@ -46930,13 +46121,17 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) +"pck" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/quartermaster/storage) "pcl" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -46954,29 +46149,20 @@ }, /turf/open/space/basic, /area/solar/port/aft) -"pcZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/door/airlock/external{ - req_access_txt = "24" - }, -/turf/open/floor/iron, -/area/engine/engine_room) "pda" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/wood, +/area/library) "pdg" = ( /obj/machinery/door/airlock/research{ name = "Break Room"; @@ -46991,13 +46177,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -47015,23 +46201,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "pdE" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "pea" = ( @@ -47044,14 +46225,6 @@ "pep" = ( /turf/closed/wall, /area/maintenance/solars/port/aft) -"peC" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/theatre) "peG" = ( /obj/machinery/light{ dir = 4 @@ -47065,10 +46238,16 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "pfc" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) @@ -47093,29 +46272,33 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "pfS" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "pfY" = ( /obj/structure/chair/office/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "pga" = ( @@ -47129,6 +46312,12 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "pgy" = ( @@ -47142,9 +46331,6 @@ /obj/structure/table/reinforced, /obj/item/food/mint, /obj/item/kitchen/rollingpin, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -47165,33 +46351,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/security/brig) "phJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall21"; location = "hall20" }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) -"phT" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "phW" = ( /obj/structure/disposalpipe/junction/flip{ dir = 2 @@ -47207,22 +46375,10 @@ }, /obj/structure/chair/office, /obj/effect/landmark/start/depsec/medical, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) -"pih" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "pii" = ( /obj/machinery/door/airlock/engineering{ name = "Engine Room"; @@ -47237,16 +46393,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) "pio" = ( @@ -47262,17 +46418,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"piA" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/door/airlock/external/glass, -/turf/open/floor/plating, -/area/quartermaster/exploration_prep) "piM" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -47313,23 +46462,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"pjH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/engine_room) +/turf/open/floor/iron, +/area/hallway/secondary/exit) "pjN" = ( /obj/structure/sink{ pixel_y = 28 @@ -47347,9 +46481,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "pku" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall17"; location = "hall16" @@ -47363,9 +46494,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/science/robotics/lab) "plw" = ( @@ -47378,12 +46506,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/open/floor/carpet/grimy, /area/chapel/office) @@ -47403,17 +46525,17 @@ /turf/open/floor/wood, /area/maintenance/port) "plK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, -/area/hallway/secondary/service) +/area/crew_quarters/fitness/recreation) "plW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "pme" = ( @@ -47455,7 +46577,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "pmV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) @@ -47496,7 +46618,9 @@ /area/security/brig/dock) "poB" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/manifold/supply/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 9 + }, /turf/open/space/basic, /area/space/nearstation) "poY" = ( @@ -47523,6 +46647,8 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/aft) "ppt" = ( @@ -47551,12 +46677,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/chapel{ dir = 5 }, @@ -47566,7 +46695,7 @@ /obj/structure/window/reinforced/spawner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -47582,9 +46711,6 @@ /area/quartermaster/exploration_prep) "pqi" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -47600,7 +46726,7 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "pqp" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" @@ -47616,12 +46742,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "pqO" = ( @@ -47652,6 +46787,16 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/crew_quarters/bar) +"prn" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "prx" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/table, @@ -47664,27 +46809,27 @@ /area/security/main) "prA" = ( /obj/structure/table/optable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/white, /area/medical/surgery) "prQ" = ( /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "prT" = ( @@ -47695,7 +46840,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "psB" = ( -/obj/machinery/portable_atmospherics/canister/proto, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -47707,6 +46851,12 @@ "psN" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/department/science/central) "psS" = ( @@ -47721,24 +46871,7 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"psT" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) "psX" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ name = "Security External Airlock"; @@ -47748,17 +46881,17 @@ /area/security/main) "psY" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/airlock/security/glass{ name = "Security E.V.A. Storage"; req_access_txt = null; req_one_access_txt = "1" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "ptf" = ( @@ -47771,9 +46904,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/junction{ - dir = 2 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -47794,9 +46924,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /turf/open/floor/wood, /area/hallway/primary/fore) "ptC" = ( @@ -47825,20 +46952,27 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/medical/cryo) -"ptZ" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/space/basic, -/area/space/nearstation) +"ptQ" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "puc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "puk" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -47872,11 +47006,20 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/science/robotics/lab) +"pun" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "puw" = ( /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -47884,8 +47027,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "puA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47897,7 +47038,8 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "puM" = ( @@ -47936,7 +47078,6 @@ /turf/open/floor/engine/cult, /area/library) "pvm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sign/poster/random{ pixel_x = 32 }, @@ -47956,28 +47097,19 @@ /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/siding/white{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) -"pvZ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "pwq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47991,7 +47123,7 @@ /area/ai_monitored/turret_protected/aisat/foyer) "pwz" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -48001,9 +47133,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "pwC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -48021,7 +47150,7 @@ /turf/open/space/basic, /area/space/nearstation) "pwQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron, @@ -48050,10 +47179,10 @@ }, /area/chapel/main/monastery) "pxq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "pxs" = ( @@ -48072,9 +47201,6 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "pxv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -48101,16 +47227,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, /turf/open/floor/iron/white, /area/science/mixing) "pyu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -48128,16 +47250,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/fore) "pyD" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/security/main) "pyU" = ( @@ -48149,12 +47265,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/button/door{ id = "kitchenside"; name = "Kitchen Side Shutters"; @@ -48163,21 +47273,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"pyZ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "pzm" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -48197,7 +47292,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "pzx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -48258,12 +47353,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/science/robotics/lab) "pAn" = ( @@ -48279,23 +47368,14 @@ }, /turf/open/floor/wood, /area/hallway/primary/starboard) -"pAw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/port) "pAD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "pAF" = ( @@ -48306,9 +47386,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "pAN" = ( @@ -48320,6 +47400,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) +"pBi" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/maintenance/starboard/aft) "pBt" = ( /obj/structure/transit_tube{ dir = 1 @@ -48328,10 +47415,6 @@ /turf/open/space/basic, /area/space/nearstation) "pCa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/sleeper) "pCr" = ( @@ -48352,6 +47435,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/bar) "pCB" = ( @@ -48385,9 +47474,6 @@ /turf/open/floor/iron, /area/security/courtroom) "pCK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -48397,20 +47483,18 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"pDg" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) +"pDl" = ( +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/security/main) "pDB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "pDP" = ( @@ -48420,6 +47504,14 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"pDQ" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/quartermaster/miningdock) "pEe" = ( /obj/item/kirbyplants/random, /obj/machinery/light{ @@ -48440,23 +47532,12 @@ /area/maintenance/starboard/aft) "pEi" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/closet/secure_closet/hydroponics, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/hydroponics) -"pEl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "pEC" = ( /turf/open/floor/iron/dark, /area/engine/atmos) @@ -48489,7 +47570,7 @@ req_access_txt = "65" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -48498,12 +47579,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/lab) "pFr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -48526,16 +47607,10 @@ /turf/open/floor/grass, /area/hallway/primary/starboard) "pFB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) "pFF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -48546,15 +47621,18 @@ /turf/open/floor/plating, /area/maintenance/port) "pFS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/execution/education) "pFZ" = ( @@ -48583,22 +47661,37 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/iron, /area/science/mixing) +"pGL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "pGN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/security/brig) "pHc" = ( @@ -48631,10 +47724,10 @@ req_access_txt = "16" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -48643,8 +47736,14 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/virology) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "pHN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -48677,6 +47776,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "pIu" = ( @@ -48703,9 +47805,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -48714,14 +47813,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -48735,6 +47834,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "pJf" = ( @@ -48746,7 +47848,7 @@ /turf/open/floor/iron/white, /area/medical/virology) "pJo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -48763,42 +47865,38 @@ /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/science/robotics/lab) "pJB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "pJD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/storage/eva) -"pJQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/iron/dark, +/area/ai_monitored/storage/eva) +"pJQ" = ( /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -48808,7 +47906,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -48827,22 +47925,16 @@ /area/crew_quarters/fitness/recreation) "pKE" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "pKW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/holopad, @@ -48850,11 +47942,10 @@ /area/medical/virology) "pLm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/engine/atmos) "pLz" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, @@ -48871,10 +47962,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/start/cyborg, @@ -48903,16 +47994,14 @@ /turf/open/floor/iron/dark, /area/chapel/office) "pLW" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "medbay_lockdown"; - name = "lockdown Shutters" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron, -/area/medical/medbay/lobby) +/area/science/mixing) "pMp" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "dorm2" @@ -48924,13 +48013,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/security/checkpoint/science) "pMZ" = ( @@ -48938,20 +48027,36 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/iron, /area/medical/morgue) "pNb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /obj/machinery/meter, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) +"pNc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution{ + dir = 8; + pixel_x = -3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/noslip/dark, +/area/hallway/secondary/service) "pNd" = ( /obj/structure/window/reinforced/spawner{ dir = 4 @@ -48983,11 +48088,12 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/foyer) "pNg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "pNo" = ( @@ -49036,9 +48142,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/science/shuttle) @@ -49049,26 +48152,27 @@ /turf/open/floor/grass, /area/hallway/primary/starboard) "pNW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/ai_monitored/security/armory) "pOd" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/atmos) +"pOj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/carpet/black, +/area/crew_quarters/heads/hos) "pOm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49095,7 +48199,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -49115,10 +48219,10 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -49145,24 +48249,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/maintenance/starboard/central) -"pPi" = ( -/obj/machinery/door/airlock/external{ - name = "Bridge External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, -/area/bridge) +/area/maintenance/starboard/central) "pPm" = ( /obj/structure/chair{ dir = 4 @@ -49174,26 +48268,27 @@ /turf/open/floor/iron/dark, /area/security/execution/education) "pPq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/central) -"pPC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +"pPG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, -/area/engine/storage) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "pPO" = ( /obj/machinery/camera/directional/west, /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -49214,7 +48309,7 @@ id = "xenobio"; name = "Blast Doors" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -49225,13 +48320,13 @@ icon_state = "1-2" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -49253,17 +48348,19 @@ "pRb" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "pRe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red, /obj/item/radio/intercom{ pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/security/brig) "pRx" = ( @@ -49272,30 +48369,41 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/central) "pRF" = ( /turf/open/floor/iron/recharge_floor, /area/science/robotics) "pRK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/camera/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "pSi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "pSB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -49348,19 +48456,17 @@ "pTo" = ( /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = -23; pixel_y = 1 }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/atmospherics_engine) "pTp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -49407,6 +48513,16 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/science/shuttle) +"pUH" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "pUR" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -49419,8 +48535,8 @@ name = "Research Director's Office"; req_access_txt = "30" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/science/server) @@ -49440,7 +48556,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -49461,24 +48577,22 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "pVT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics) -"pVW" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron, -/area/quartermaster/storage) +/turf/open/floor/iron/dark, +/area/crew_quarters/fitness/recreation) "pWb" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -49499,18 +48613,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/teleporter) "pWl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -49520,7 +48628,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -49529,9 +48636,6 @@ name = "Teleport Access"; req_access_txt = "17" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/teleporter) @@ -49550,37 +48654,42 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "pWX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/nitrogen_tank, +/obj/machinery/computer/atmos_control/nitrogen_tank, /turf/open/floor/iron/dark, /area/engine/atmos) "pXw" = ( -/obj/structure/chair/fancy/comfy{ - color = "#666666"; +/obj/item/kirbyplants/random, +/obj/machinery/light, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/iron, +/area/hallway/secondary/exit) "pXx" = ( /obj/structure/closet/crate/wooden/toy, /obj/item/radio/intercom{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "pXC" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -49606,6 +48715,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "pYd" = ( @@ -49642,22 +48754,36 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "pYD" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/machinery/light_switch{ + pixel_x = 26 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/science/shuttle) +"pYR" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "pYT" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/brown/opposingcorners, @@ -49666,24 +48792,21 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"pYY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"pZm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) -"pZm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "pZI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -49729,8 +48852,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/ai_monitored/storage/eva) @@ -49750,10 +48873,15 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "pZZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, @@ -49763,6 +48891,8 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "qay" = ( @@ -49770,10 +48900,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) "qaC" = ( @@ -49798,22 +48931,22 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "qbP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage_shared) "qbS" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -49839,6 +48972,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/security/courtroom) "qcB" = ( @@ -49851,35 +48990,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) -"qcS" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/public/glass{ - name = "Fore Primary Hallway" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore) -"qcV" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "qcX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/camera/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 @@ -49888,25 +49002,22 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "qcZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) -"qdm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) "qds" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = 24 }, @@ -49922,13 +49033,11 @@ /obj/effect/spawner/randomarcade{ dir = 4 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "qdG" = ( /obj/item/crowbar/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "qdI" = ( @@ -49936,14 +49045,20 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/atmos) "qdK" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -49963,14 +49078,16 @@ /area/ai_monitored/turret_protected/aisat_interior) "qdR" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "qeh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49978,12 +49095,13 @@ /turf/open/floor/plating, /area/maintenance/fore) "qei" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "qeq" = ( @@ -50012,9 +49130,6 @@ /turf/open/floor/iron/white, /area/medical/genetics) "qfc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall18"; location = "hall17" @@ -50038,6 +49153,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/cryopods) "qfA" = ( @@ -50045,28 +49167,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"qfD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/science/shuttle) -"qfM" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/hallway/primary/starboard) "qgj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -50092,7 +49198,6 @@ /turf/open/floor/plating, /area/engine/storage) "qgZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -50100,13 +49205,20 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"qhq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "qhx" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) "qhD" = ( @@ -50120,12 +49232,32 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) +"qhU" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/construction/mining/aux_base) "qhV" = ( /obj/machinery/conveyor{ dir = 1; @@ -50137,9 +49269,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -50149,17 +49278,17 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "qiq" = ( /obj/structure/table/reinforced, /obj/item/toy/crayon/spraycan, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qiD" = ( @@ -50172,6 +49301,12 @@ /obj/structure/disposalpipe/sorting/mail/destination/security{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/security/brig) "qiM" = ( @@ -50195,19 +49330,13 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/service) "qjA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -50226,16 +49355,10 @@ /obj/machinery/door/airlock/external{ name = "Escape Airlock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qjU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -50288,6 +49411,20 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) +"qkO" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "qkT" = ( /obj/machinery/light{ dir = 4 @@ -50306,7 +49443,7 @@ /turf/open/floor/iron/white, /area/medical/virology) "qkV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -50328,6 +49465,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/central) "qlt" = ( @@ -50346,21 +49489,6 @@ "qlH" = ( /turf/closed/wall, /area/science/robotics/lab) -"qlT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "qme" = ( /obj/machinery/light/small{ dir = 1 @@ -50376,15 +49504,18 @@ /turf/open/floor/iron/dark, /area/engine/storage) "qmJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/junction/flip{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "qmR" = ( @@ -50396,17 +49527,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/department/science) "qng" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -50423,8 +49553,11 @@ "qnl" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) @@ -50442,24 +49575,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/unsorted/flip{ dir = 2 }, -/turf/open/floor/iron, -/area/quartermaster/sorting) -"qnt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/quartermaster/sorting) "qnu" = ( /obj/structure/table/glass, /obj/item/wrench, @@ -50489,19 +49615,21 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "qop" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/shuttle) "qos" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "qoB" = ( @@ -50511,17 +49639,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/hallway/secondary/service) -"qoC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "qoF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -50539,15 +49656,14 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/turf/open/floor/iron, -/area/bridge) -"qoU" = ( -/obj/machinery/atmospherics/components/binary/pump{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/iron/dark, -/area/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/bridge) "qoV" = ( /obj/docking_port/stationary{ dir = 2; @@ -50574,21 +49690,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) "qpJ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "qpM" = ( @@ -50599,7 +49714,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/green, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "qpW" = ( @@ -50612,28 +49729,12 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "qpX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) -"qqc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/chapel/main/monastery) "qqf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -50642,14 +49743,12 @@ /turf/open/floor/iron, /area/science/mixing) "qqh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/maintenance/port) +/area/engine/atmos) "qqS" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -50674,9 +49773,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "qrp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "qrC" = ( @@ -50692,13 +49788,14 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "qrL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/shuttle) "qrT" = ( @@ -50779,18 +49876,12 @@ /turf/open/space/basic, /area/space/nearstation) "qsG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"qsJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/purple, -/area/crew_quarters/heads/hor) "qsK" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -50813,9 +49904,6 @@ "qsX" = ( /obj/structure/table/reinforced, /obj/item/food/mint, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/reagent_containers/condiment/flour, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/white, @@ -50841,9 +49929,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -50853,6 +49938,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "qtP" = ( @@ -50874,18 +49965,6 @@ }, /turf/open/floor/iron, /area/ai_monitored/storage/eva) -"qtS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "qtV" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -50897,13 +49976,8 @@ /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "quc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/engine/atmos) "quq" = ( @@ -50913,9 +49987,6 @@ /area/hallway/secondary/service) "quu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/wood, /area/crew_quarters/bar) "quw" = ( @@ -50923,28 +49994,8 @@ pixel_x = 29; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/toilet) -"qux" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/command/glass{ - name = "Command Hall Access"; - req_one_access_txt = "19;53" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/secondary/command) "quz" = ( /obj/effect/landmark/start/paramedic, /obj/machinery/light_switch{ @@ -51017,14 +50068,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage) "qvT" = ( @@ -51048,9 +50095,10 @@ dir = 8 }, /obj/item/bedsheet/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison/dark, /area/security/prison) "qwB" = ( @@ -51070,6 +50118,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "qxm" = ( @@ -51098,17 +50147,12 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "qyo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/light/small{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/item/radio/intercom{ - pixel_x = -29; - pixel_y = -2 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -51131,6 +50175,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "qyz" = ( @@ -51143,15 +50190,13 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "qyB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "qyH" = ( @@ -51177,6 +50222,21 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, /area/bridge) +"qzM" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "qzS" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/disposal/bin, @@ -51241,9 +50301,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, @@ -51253,15 +50310,15 @@ /obj/structure/disposalpipe/sorting/mail/destination/hop_office{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/hallway/secondary/command) -"qBi" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/iron/dark, +/area/hallway/secondary/command) +"qBi" = ( /turf/open/floor/iron, /area/engine/engine_room) "qBj" = ( @@ -51275,28 +50332,21 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"qBE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "qBH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/science/shuttle) "qBJ" = ( /obj/machinery/requests_console{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/blue{ @@ -51321,6 +50371,8 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear/red, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "qBW" = ( @@ -51332,6 +50384,8 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "qBZ" = ( @@ -51366,12 +50420,6 @@ /obj/structure/sign/departments/minsky/supply/cargo{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -51402,10 +50450,8 @@ pixel_x = 26; pixel_y = 28 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/portable_thermomachine, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/storage) "qCV" = ( @@ -51426,12 +50472,12 @@ /turf/open/floor/plating, /area/maintenance/port/central) "qDh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "qDx" = ( @@ -51465,12 +50511,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/engine/storage_shared) "qDN" = ( @@ -51513,10 +50553,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -51543,21 +50586,20 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/engine/engine_room) "qEP" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "qEQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input, /turf/open/floor/engine/o2, /area/engine/atmos) "qEV" = ( @@ -51570,6 +50612,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "qFb" = ( @@ -51581,6 +50625,8 @@ req_one_access_txt = "1;4" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "qFo" = ( @@ -51616,14 +50662,6 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) -"qGm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) "qGn" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/stairs/medium{ @@ -51644,8 +50682,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/highsecurity{ name = "AI Core"; req_access_txt = "65" @@ -51654,10 +50692,13 @@ /turf/open/floor/iron, /area/ai_monitored/turret_protected/ai) "qGC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -51681,7 +50722,7 @@ dir = 1 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -51693,10 +50734,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/hallway/primary/fore) "qHw" = ( @@ -51710,11 +50749,15 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "qHB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/iron/white, -/area/science/xenobiology) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/shuttle) "qHD" = ( /obj/structure/chair/fancy/comfy{ buildstackamount = 0; @@ -51733,18 +50776,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "qHQ" = ( /obj/structure/table/wood, /obj/item/soulstone/anybody/chaplain, /obj/item/organ/heart, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron/dark, /area/chapel/office) @@ -51769,7 +50809,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -51784,6 +50823,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/grimy, /area/chapel/office) "qIC" = ( @@ -51796,26 +50838,19 @@ }, /turf/open/floor/iron, /area/science/storage) -"qIS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/engine_room) "qIZ" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "qJg" = ( @@ -51828,8 +50863,8 @@ /turf/open/floor/iron/white, /area/science/lab) "qJp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 4 }, /turf/open/floor/iron/dark, @@ -51841,10 +50876,6 @@ /area/crew_quarters/heads/hop) "qJS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/explab) "qKk" = ( @@ -51852,12 +50883,15 @@ dir = 4 }, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "qKp" = ( @@ -51874,13 +50908,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "qKu" = ( @@ -51890,22 +50923,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/central) -"qKw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/brown/fourcorners/contrasted, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/quartermaster/storage) "qKB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "qLa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -51930,6 +50953,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qMf" = ( @@ -51943,7 +50968,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "qMt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light{ dir = 1 }, @@ -51960,9 +50984,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/engine/atmos) "qMC" = ( @@ -51986,12 +51007,12 @@ name = "Lawyer's Office"; req_access_txt = "38" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/lawoffice) "qMW" = ( @@ -52003,7 +51024,6 @@ "qNl" = ( /obj/machinery/door/airlock/research{ autoclose = 0; - frequency = 1449; id_tag = "xeno_airlock_exterior"; name = "Xenobiology Lab External Airlock"; req_access_txt = "55" @@ -52024,21 +51044,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) "qNr" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "qNs" = ( @@ -52071,10 +51091,13 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "qOc" = ( @@ -52096,13 +51119,6 @@ "qOk" = ( /turf/open/floor/engine/vacuum, /area/engine/atmos) -"qOx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "qOJ" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -52134,30 +51150,9 @@ pixel_x = 1; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/displaycase/captain, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) -"qPw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "qPy" = ( /obj/structure/closet/secure_closet/CMO, /obj/machinery/power/apc/auto_name/directional/south, @@ -52179,24 +51174,25 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) "qPO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, /obj/machinery/light_switch{ pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "qPY" = ( @@ -52214,10 +51210,13 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engine_room) "qQf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -52265,13 +51264,17 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hydroponics) "qRE" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "qRP" = ( @@ -52321,15 +51324,6 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"qSI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) "qSW" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, @@ -52344,14 +51338,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"qTC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "qTO" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -52369,11 +51355,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/quartermaster/storage) "qUk" = ( /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -52399,6 +51391,9 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "qUE" = ( @@ -52428,12 +51423,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/fore) -"qVg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "qVx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52447,6 +51436,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qVK" = ( @@ -52457,6 +51448,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "qWg" = ( @@ -52468,7 +51465,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -52482,6 +51479,18 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/central) +"qWJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "qWV" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -52493,9 +51502,6 @@ pixel_x = -4; pixel_y = -26 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, @@ -52522,16 +51528,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "qXq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -52546,9 +51549,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/light/small{ dir = 4 }, @@ -52556,12 +51556,12 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "qYd" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/white, /area/medical/virology) "qYg" = ( @@ -52581,13 +51581,6 @@ }, /turf/open/floor/iron, /area/security/brig/dock) -"qYv" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) "qYF" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -52599,13 +51592,6 @@ "qYI" = ( /turf/closed/wall, /area/hallway/primary/central) -"qYL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/central) "qYW" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -52632,12 +51618,6 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/item/stack/conveyor/thirty, /obj/item/wrench, /obj/structure/cable/yellow{ @@ -52653,18 +51633,38 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/storage) "qZG" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) +"rab" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "rad" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -52706,7 +51706,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -52727,10 +51726,6 @@ /obj/effect/turf_decal/trimline/dark_red/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/machinery/camera{ dir = 10 }, @@ -52740,31 +51735,32 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/tcommsat/computer) -"raQ" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +"raM" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/exit) +/area/hallway/primary/central) "raZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/west, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "rbi" = ( @@ -52780,24 +51776,26 @@ /turf/open/floor/plating, /area/maintenance/disposal) "rbF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/visible, /turf/open/space/basic, /area/space/nearstation) "rbR" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "rca" = ( /obj/structure/railing/corner{ @@ -52822,10 +51820,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -52845,9 +51843,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/engine/engine_room) "rcH" = ( @@ -52894,27 +51889,20 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/crew_quarters/bar) -"rdU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"ref" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/advanced_airlock_controller/directional/south, -/turf/open/floor/iron/dark, -/area/bridge) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/quartermaster/storage) "reo" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "reL" = ( /obj/structure/window/reinforced/spawner{ @@ -52926,16 +51914,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/iron/dark, -/area/maintenance/disposal) -"reO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hydroponics) +/turf/open/floor/iron/dark, +/area/maintenance/disposal) "reX" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 8 @@ -52950,7 +51933,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -52965,12 +51947,18 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "rfj" = ( /obj/structure/curtain/bounty, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -52984,28 +51972,27 @@ /turf/open/floor/iron/white, /area/science/lab) "rfC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "rfD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/storage) "rfG" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -53016,9 +52003,6 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "rfZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -53029,27 +52013,11 @@ /area/crew_quarters/bar) "rgc" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, /turf/open/floor/iron, /area/maintenance/department/science) -"rgd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/medical/sleeper) "rgg" = ( /obj/effect/turf_decal/caution/red{ dir = 8 @@ -53057,22 +52025,24 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, /area/medical/virology) "rgs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/aft) "rgA" = ( @@ -53099,9 +52069,13 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard/secondary) "rgM" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "rgV" = ( /obj/effect/spawner/structure/window/reinforced, @@ -53117,26 +52091,30 @@ /turf/open/floor/plating, /area/tcommsat/computer) "rhg" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/effect/landmark/start/atmospheric_technician, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 10 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) +"rhu" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/security/brig) "rhG" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "rhQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -53150,16 +52128,15 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "rhX" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8; - name = "Atmos to Loop" - }, /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "rie" = ( @@ -53176,9 +52153,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -53186,24 +52160,17 @@ dir = 6 }, /area/chapel/main/monastery) -"riE" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/surgery) "riG" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "riJ" = ( /obj/structure/cable/yellow{ @@ -53213,6 +52180,12 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rjb" = ( @@ -53227,27 +52200,28 @@ /turf/open/floor/iron/dark, /area/quartermaster/qm) "rjd" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/tank_dispenser, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/engine/engine_room) "rjf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/bridge) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "rjl" = ( /turf/open/floor/iron, /area/security/courtroom) @@ -53267,6 +52241,12 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) "rjL" = ( @@ -53314,8 +52294,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/explab) "rkq" = ( @@ -53345,6 +52325,12 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "rkP" = ( @@ -53379,13 +52365,17 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"rlM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"rlr" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/security/brig) +"rlM" = ( /obj/structure/disposalpipe/junction{ dir = 1 }, @@ -53395,7 +52385,6 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "rlR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -53415,22 +52404,18 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /turf/open/floor/iron, /area/tcommsat/computer) "rmn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -53463,15 +52448,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/hydroponics) -"rns" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rnt" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/yellow{ @@ -53480,8 +52456,6 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "rnv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, @@ -53489,6 +52463,12 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "rny" = ( @@ -53502,16 +52482,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "rnI" = ( @@ -53572,7 +52552,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -53620,24 +52600,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "rps" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -53654,7 +52628,7 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) "rpy" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/closed/wall, @@ -53671,11 +52645,11 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "rqa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "rqc" = ( @@ -53702,8 +52676,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment, @@ -53711,13 +52685,14 @@ /area/medical/virology) "rqF" = ( /obj/effect/landmark/start/janitor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/janitor) "rqI" = ( @@ -53735,9 +52710,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos, /turf/open/floor/engine, /area/engine/atmospherics_engine) "rrr" = ( @@ -53750,22 +52723,27 @@ /turf/open/floor/iron/dark, /area/security/brig) "rrx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) -"rrF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/turf/open/floor/iron, +/area/engine/engine_room) +"rrF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -53773,6 +52751,8 @@ name = "MiniSat External Access"; req_one_access_txt = "65;61" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "rrJ" = ( @@ -53820,6 +52800,7 @@ icon_state = "0-8" }, /obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/supply, /turf/open/floor/iron/white, /area/science/xenobiology) "rsV" = ( @@ -53830,16 +52811,18 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "rsZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/closet/radiation, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/noslip/dark, /area/engine/engineering) "rtF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/science/shuttle) "rtL" = ( @@ -53850,9 +52833,6 @@ /turf/open/floor/iron/white, /area/medical/virology) "ruc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -53922,6 +52902,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) "rvb" = ( @@ -53941,17 +52923,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rvp" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 1 - }, /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "rvz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -53980,6 +52965,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "rvT" = ( @@ -53989,12 +52980,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "rvY" = ( @@ -54014,6 +53001,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "rwI" = ( @@ -54023,13 +53016,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -54055,6 +53048,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "rxf" = ( @@ -54086,6 +53081,12 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron, /area/security/brig) "rxQ" = ( @@ -54096,13 +53097,13 @@ /turf/open/floor/wood, /area/maintenance/port) "rxV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/hallway/primary/aft) "ryd" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, @@ -54111,9 +53112,6 @@ /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -54128,7 +53126,7 @@ }, /area/hallway/secondary/entry) "ryt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -54160,10 +53158,6 @@ /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "rza" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall19"; location = "hall18" @@ -54191,15 +53185,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/port/fore) -"rzF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/engine, -/area/engine/engine_room) "rzI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54238,44 +53223,18 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"rAw" = ( -/obj/machinery/advanced_airlock_controller/directional/south, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rAJ" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/hallway/primary/starboard) -"rAK" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/hallway/primary/fore) -"rAR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron/dark, -/area/medical/surgery) +/area/hallway/primary/starboard) "rAZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -54301,12 +53260,19 @@ pixel_y = -28; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/dorms) +"rBY" = ( +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "rCa" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -54331,12 +53297,8 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "rCy" = ( @@ -54372,21 +53334,12 @@ /obj/item/stack/ore/copper, /obj/item/stack/ore/copper, /obj/item/stack/ore/copper, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "rDh" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -54407,19 +53360,6 @@ }, /turf/open/floor/noslip/dark, /area/engine/engineering) -"rDt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig/dock) "rDu" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/stasis, @@ -54435,6 +53375,9 @@ /obj/item/radio/intercom{ pixel_y = 24 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "rDF" = ( @@ -54487,24 +53430,23 @@ /turf/open/floor/iron/white, /area/medical/virology) "rEC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/white, -/area/science/xenobiology) -"rEM" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = 32; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, -/area/engine/atmos) +/area/crew_quarters/fitness/recreation) +"rEM" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/fore) "rEV" = ( /obj/structure/window/reinforced/spawner{ dir = 1 @@ -54522,13 +53464,13 @@ /obj/effect/turf_decal/caution/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/virology) "rFj" = ( @@ -54543,6 +53485,8 @@ dir = 5 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "rFH" = ( @@ -54551,40 +53495,46 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "rFL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/landmark/start/scientist, /obj/structure/disposalpipe/sorting/mail/destination/xenobiology/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "rFM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "rFR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/fitness/recreation) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/fore) "rFZ" = ( /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "rGa" = ( @@ -54610,12 +53560,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/engine, /area/engine/engine_room) "rGg" = ( @@ -54642,27 +53586,19 @@ /obj/structure/sign/departments/minsky/engineering/engineering{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/volume_pump{ + name = "Atmos to Loop" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) -"rGI" = ( -/obj/machinery/door/airlock/external{ - name = "Bridge External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/bridge) "rGO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54672,25 +53608,37 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"rGX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) +"rHr" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "rHC" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "rHF" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate{ @@ -54711,11 +53659,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "rHW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "rIq" = ( /obj/item/radio/intercom{ @@ -54761,8 +53709,8 @@ /area/science/explab) "rJB" = ( /obj/machinery/rnd/server, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, /turf/open/floor/circuit, /area/science/server) @@ -54778,16 +53726,10 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "rJG" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/machinery/suit_storage_unit, /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/maintenance/department/science) "rJJ" = ( @@ -54799,7 +53741,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "rJK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -54809,13 +53751,6 @@ /obj/effect/spawner/room/tenxten, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"rJX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "rKg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -54835,21 +53770,17 @@ icon_state = "1-4" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/security/detectives_office) -"rKj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plating, -/area/maintenance/fore) "rKn" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) @@ -54864,28 +53795,29 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, -/area/medical/medbay/aft) -"rKx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/surgery) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/medbay/aft) "rKT" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "rLh" = ( @@ -54893,7 +53825,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54901,6 +53832,8 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "rLi" = ( @@ -54912,6 +53845,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rLT" = ( @@ -54963,15 +53902,16 @@ /obj/item/radio/intercom{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "rMn" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) "rMr" = ( @@ -54990,15 +53930,18 @@ /turf/open/floor/iron, /area/engine/engineering) "rMx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/sign/departments/xenobio{ pixel_y = -32 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "rMN" = ( @@ -55012,8 +53955,17 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"rMW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "rNy" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/sparker/toxmix{ pixel_y = -24 }, @@ -55055,17 +54007,25 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"rNZ" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +"rNQ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) +"rNZ" = ( +/obj/machinery/light, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/binary/valve/digital/layer4{ + dir = 4; + name = "Waste to Scrubbers" + }, /turf/open/floor/engine, /area/engine/engine_room) "rOg" = ( @@ -55097,9 +54057,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/item/stack/cable_coil/random{ pixel_x = -1; pixel_y = 4 @@ -55112,6 +54069,12 @@ pixel_x = 2; pixel_y = -1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/robotics/lab) "rPt" = ( @@ -55124,19 +54087,13 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "rPT" = ( -/obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) +"rPW" = ( +/obj/effect/landmark/start/cargo_technician, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "rQb" = ( @@ -55197,6 +54154,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "rQX" = ( @@ -55207,9 +54168,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "rRd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -55224,14 +54182,14 @@ }, /obj/effect/landmark/start/station_engineer, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/iron, /area/engine/engineering) @@ -55249,18 +54207,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/medical/cryo) -"rRs" = ( -/obj/structure/chair/fancy/comfy{ - color = "#666666"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/landmark/start/scientist, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/white, -/area/science/xenobiology) "rRt" = ( /obj/structure/railing/corner, /turf/open/floor/iron/stairs/left{ @@ -55274,7 +54220,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "rSg" = ( @@ -55303,25 +54249,33 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "rSM" = ( /obj/machinery/door/airlock/external{ name = "Exploration Shuttle Bay" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/medical/virology) "rSO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/janitor) "rTm" = ( @@ -55336,17 +54290,20 @@ /obj/structure/fireaxecabinet{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/bridge) "rTH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/medical/medbay/aft) +/area/science/research) "rTO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55354,6 +54311,8 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "rTY" = ( @@ -55412,7 +54371,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -55441,9 +54400,6 @@ /turf/open/floor/iron/chapel, /area/chapel/main/monastery) "rVE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron, @@ -55454,6 +54410,12 @@ }, /obj/effect/turf_decal/siding/wood, /obj/machinery/digital_clock/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "rVS" = ( @@ -55464,15 +54426,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"rVU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/fore) "rWe" = ( /obj/machinery/camera/directional/north, /obj/machinery/hydroponics/constructable, @@ -55491,17 +54444,18 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "rWk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/iron, +/area/engine/storage_shared) "rWl" = ( /obj/item/toy/beach_ball/holoball, /turf/open/floor/wood, @@ -55517,18 +54471,13 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/engine, /area/engine/engine_room) "rXl" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/engine/engine_room) "rXn" = ( @@ -55541,28 +54490,19 @@ /area/science/xenobiology) "rXI" = ( /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron/white, /area/medical/virology) "rXJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "rXP" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron, /area/engine/atmos) "rYf" = ( @@ -55588,10 +54528,10 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -55619,13 +54559,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/central) -"rYz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/science/shuttle) "rYH" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -55664,11 +54597,13 @@ /turf/open/floor/plating, /area/security/brig/medbay) "rYP" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/sorting/mail/destination/toxins/flip{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/destination/toxins/flip{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -55710,7 +54645,10 @@ "rZU" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -55723,9 +54661,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/engine/atmos) "sac" = ( @@ -55749,30 +54684,14 @@ /turf/open/floor/iron, /area/bridge) "sag" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"saC" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/wood, +/area/library) "saG" = ( /obj/machinery/door/airlock{ name = "Toilet Unit" @@ -55786,21 +54705,31 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"sbh" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "sbi" = ( /mob/living/simple_animal/pet/cat/halal, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "sbD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "sbI" = ( @@ -55821,9 +54750,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -55855,7 +54781,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "scs" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -55877,44 +54803,19 @@ "scI" = ( /turf/closed/wall/r_wall, /area/maintenance/fore) -"scW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "sdc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/science/shuttle) "sdi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) -"sdz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "sdF" = ( /obj/machinery/light_switch{ pixel_x = 26 @@ -55979,12 +54880,6 @@ /obj/item/radio/intercom{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/crew_quarters/toilet) "seE" = ( @@ -56000,7 +54895,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -56016,38 +54910,13 @@ }, /turf/open/space/basic, /area/solar/starboard/aft) -"seY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ai_monitored/storage/eva) "seZ" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"sfj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "sfr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56055,10 +54924,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/chapel{ @@ -56066,31 +54938,37 @@ }, /area/chapel/main/monastery) "sfx" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/camera/directional/west, /turf/open/floor/iron/dark, /area/engine/engine_room) "sfF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/storage) +"sfI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "sfK" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ icon_state = "0-8" }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/port/fore) "sfN" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -56105,13 +54983,6 @@ }, /turf/open/floor/iron, /area/medical/chemistry) -"sgb" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/brig) "sgi" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -56126,10 +54997,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "sgJ" = ( @@ -56144,25 +55013,26 @@ /turf/open/floor/iron, /area/hydroponics) "sgK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "sgV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/destination/janitor_closet{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "shl" = ( @@ -56172,20 +55042,19 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "shn" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "sht" = ( @@ -56223,11 +55092,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "shY" = ( @@ -56235,17 +55104,15 @@ /turf/open/space/basic, /area/space) "sic" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/security/prison) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "sig" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -56283,20 +55150,17 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit) "sjb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, /turf/open/floor/iron, -/area/engine/atmos) +/area/hallway/primary/aft) "sjh" = ( /obj/structure/chair/fancy/comfy{ dir = 8 @@ -56319,6 +55183,12 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"sjr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "sjD" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -56329,20 +55199,14 @@ "sjI" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) "ska" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/chair/wood{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/cafeteria{ + dir = 5 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/area/science/breakroom) "skb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -56377,7 +55241,10 @@ pixel_x = -8; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "skA" = ( @@ -56387,18 +55254,27 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "skQ" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/chair/fancy/comfy{ + color = "#666666"; + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, -/area/engine/atmos) +/area/hallway/secondary/exit) "skV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -56417,9 +55293,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "sli" = ( @@ -56440,15 +55313,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"slp" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig) "slu" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56461,9 +55325,6 @@ /area/science/shuttle) "slH" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "slJ" = ( @@ -56478,14 +55339,26 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"smA" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "smF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -56506,7 +55379,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -56528,9 +55401,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) @@ -56543,13 +55413,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/tcommsat/relay) "snl" = ( /obj/effect/turf_decal/delivery, @@ -56594,10 +55464,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/dorms) -"sok" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/iron, -/area/engine/atmos) "son" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -56694,12 +55560,6 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -56737,14 +55597,15 @@ /turf/open/floor/iron/dark, /area/security/main) "spm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/crew_quarters/toilet) +/turf/open/floor/wood, +/area/crew_quarters/fitness/recreation) "spq" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -56753,10 +55614,16 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "spt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -56784,28 +55651,22 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) -"spG" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "spI" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall15"; location = "hall14" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -56821,12 +55682,27 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"sqP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +"sre" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/science/explab) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"srh" = ( +/obj/effect/turf_decal/tile/red, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/brig) "srF" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -56839,12 +55715,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/port) -"srG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/exploration_prep) "srL" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 @@ -56871,47 +55741,14 @@ pixel_x = 1; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/dark, /area/bridge) -"sss" = ( -/obj/machinery/door/airlock/external{ - name = "Transport Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel/monastery) -"ssB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) -"ssC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "ssI" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -56938,7 +55775,7 @@ /area/security/prison) "ssV" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /obj/machinery/light{ dir = 4 @@ -56949,10 +55786,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "stg" = ( @@ -56960,14 +55796,13 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "sts" = ( @@ -56982,6 +55817,9 @@ "stu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "stB" = ( @@ -56992,9 +55830,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "stD" = ( @@ -57002,11 +55840,9 @@ /turf/open/floor/iron/white, /area/science/explab) "stJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "stR" = ( @@ -57054,9 +55890,6 @@ /area/ai_monitored/turret_protected/ai_upload) "sut" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8 - }, /obj/item/wrench, /turf/open/floor/plating, /area/maintenance/port) @@ -57073,7 +55906,7 @@ /turf/open/floor/iron/dark, /area/chapel/office) "svj" = ( -/obj/machinery/airalarm/server{ +/obj/machinery/airalarm{ pixel_y = -24 }, /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ @@ -57111,7 +55944,6 @@ /area/security/execution/education) "svy" = ( /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/chair/stool/bar/directional/south{ dir = 1 }, @@ -57122,7 +55954,6 @@ /area/crew_quarters/bar) "svL" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -57138,9 +55969,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "svX" = ( @@ -57159,7 +55990,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "swJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/telecomms, @@ -57168,7 +55999,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/stairs/right{ @@ -57176,7 +56010,7 @@ }, /area/hallway/secondary/service) "swU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating/asteroid, @@ -57236,9 +56070,7 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "syv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "syz" = ( @@ -57266,9 +56098,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "sze" = ( @@ -57279,16 +56108,16 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "szf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "szh" = ( @@ -57297,10 +56126,10 @@ /turf/open/floor/iron/white/side, /area/medical/surgery) "szx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/orange, @@ -57355,6 +56184,10 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "sAp" = ( @@ -57399,6 +56232,17 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/science/lab) +"sAR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "sAT" = ( /obj/structure/table/wood, /obj/machinery/requests_console{ @@ -57424,13 +56268,13 @@ /turf/open/floor/iron, /area/medical/chemistry) "sBn" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "sBo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -57466,6 +56310,24 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"sBF" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) +"sBR" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "sCe" = ( /obj/structure/sign/poster/random{ pixel_x = -32 @@ -57483,6 +56345,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "sCh" = ( @@ -57523,14 +56391,13 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"sCs" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "sCx" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/kirbyplants/random, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) @@ -57538,13 +56405,13 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "sDu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, @@ -57561,28 +56428,26 @@ pixel_x = 6; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/library) -"sDS" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/hydroponics) -"sDX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/turf/open/floor/wood, +/area/library) +"sDS" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/security/brig) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "sEs" = ( /obj/machinery/power/solar, /obj/structure/cable/white{ @@ -57594,19 +56459,19 @@ /turf/closed/wall, /area/quartermaster/qm) "sEA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/brig/dock) "sEE" = ( @@ -57619,7 +56484,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "sEV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 }, /turf/open/floor/iron/dark, @@ -57640,13 +56505,11 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "sFR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -57676,18 +56539,32 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) +"sGv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/aft) "sGz" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, @@ -57739,8 +56616,6 @@ /turf/open/floor/iron, /area/quartermaster/storage) "sHi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -57750,15 +56625,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/office) "sHu" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/door/poddoor/shutters/preopen{ id = "atmos"; name = "Atmospherics Lockdown" @@ -57777,9 +56650,6 @@ icon_state = "2-4" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/junction/flip{ dir = 2 }, @@ -57787,16 +56657,18 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "sHL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "sHT" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 4 }, /turf/open/floor/plating, @@ -57856,13 +56728,16 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "sJj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/central) "sJF" = ( @@ -57883,11 +56758,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"sJI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white, -/area/science/lab) "sJK" = ( /obj/machinery/computer/security{ dir = 4 @@ -57910,10 +56780,6 @@ "sJS" = ( /turf/closed/wall/r_wall, /area/security/checkpoint/engineering) -"sJW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/science/robotics/lab) "sJX" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -57944,7 +56810,9 @@ /turf/open/floor/iron, /area/teleporter) "sKh" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, @@ -57970,10 +56838,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "sKx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/library) "sKz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -58013,9 +56882,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/engine/storage) "sKW" = ( @@ -58039,18 +56905,13 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) -"sLb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, -/turf/closed/wall, -/area/engine/atmospherics_engine) "sLm" = ( /turf/closed/wall, /area/science/storage) @@ -58092,12 +56953,18 @@ /turf/open/floor/engine, /area/science/xenobiology) "sLX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/structure/fireaxecabinet{ pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "sLZ" = ( @@ -58118,21 +56985,19 @@ /obj/item/stack/ore/iron, /obj/item/stack/ore/iron, /obj/item/stack/ore/iron, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "sMv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civillian, /turf/open/floor/carpet/green, /area/crew_quarters/bar) +"sMD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "sMX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -58141,20 +57006,21 @@ /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "sNb" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/iron/dark, +/area/crew_quarters/fitness/recreation) "sNd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58165,7 +57031,7 @@ /area/security/brig/medbay) "sNf" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "sNo" = ( @@ -58222,32 +57088,16 @@ pixel_x = 1; pixel_y = 28 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/genetics) "sNC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/starboard) +/area/hallway/secondary/exit/departure_lounge) "sNK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -58265,19 +57115,20 @@ }, /turf/open/floor/iron, /area/bridge) -"sOB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"sPb" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, -/area/science/shuttle) +/area/hallway/primary/central) "sPg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/iron, @@ -58291,29 +57142,44 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "sPt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/quartermaster/sorting) "sPx" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/science/nanite) +"sPN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/color_adapter, +/turf/open/floor/plating, +/area/hallway/primary/aft) "sQk" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron, @@ -58322,36 +57188,20 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /turf/open/floor/iron, /area/storage/tools) -"sQv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/science/mixing) "sQC" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) -"sQG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "sQL" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ @@ -58375,6 +57225,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "sRw" = ( @@ -58422,15 +57275,29 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/atmospherics_engine) "sRL" = ( /turf/closed/wall/r_wall, /area/quartermaster/storage) -"sSj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"sRY" = ( +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"sSj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/security/courtroom) "sSk" = ( @@ -58452,6 +57319,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "sSB" = ( @@ -58459,8 +57328,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) @@ -58469,7 +57336,7 @@ /obj/structure/window/reinforced/spawner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -58483,28 +57350,28 @@ pixel_x = 1; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/siding/wood/corner{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/dorms) "sTm" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "sTo" = ( @@ -58517,13 +57384,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "sTs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -58532,6 +57393,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/science/mixing) "sTN" = ( @@ -58546,12 +57413,6 @@ /turf/open/floor/iron, /area/hydroponics) "sUq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = -24 }, @@ -58567,8 +57428,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "sUs" = ( @@ -58580,10 +57439,26 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"sUt" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "sUu" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "sUC" = ( @@ -58593,17 +57468,21 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/medbay/flip{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "sUL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -58614,21 +57493,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/sleeper) "sVf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -58638,9 +57511,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "sVn" = ( @@ -58651,20 +57524,6 @@ }, /turf/open/floor/plating, /area/science/research) -"sVB" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "sVG" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 @@ -58702,7 +57561,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "sWJ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 4 }, /turf/open/floor/engine/plasma, @@ -58712,11 +57571,16 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "sWM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "sWR" = ( @@ -58731,9 +57595,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/science) "sXg" = ( @@ -58742,39 +57606,22 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"sXr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "sXv" = ( -/obj/machinery/advanced_airlock_controller/directional/west, /obj/structure/closet/emcloset, /obj/effect/loot_jobscale/medical/oxy_kit, /turf/open/floor/plating, /area/security/main) "sXw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) -"sYe" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "sYf" = ( /obj/machinery/door/window/brigdoor{ dir = 8; @@ -58801,13 +57648,13 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/dark/telecomms, +/turf/open/floor/iron/dark/textured, /area/tcommsat/computer) "sYt" = ( /obj/machinery/navbeacon{ @@ -58815,12 +57662,12 @@ location = "hall15" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "sYS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -58836,12 +57683,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/white, /area/science/xenobiology) "sZn" = ( @@ -58896,8 +57737,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/light{ @@ -58918,6 +57759,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) +"tar" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "taC" = ( /obj/structure/table, /obj/item/book/manual/wiki/engineering_construction, @@ -58937,6 +57784,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/components/binary/valve/digital/on/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "taY" = ( @@ -58952,40 +57800,38 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "tbb" = ( /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/engine/engine_room) "tbj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, /turf/open/floor/iron, /area/hallway/primary/fore) -"tbt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) +"tbm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "tbu" = ( -/obj/item/kirbyplants/random, /obj/machinery/light_switch{ pixel_x = 1; pixel_y = -25 @@ -58993,11 +57839,11 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/engine/atmos) "tbG" = ( /obj/machinery/light, -/obj/machinery/portable_atmospherics/canister/proto, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, @@ -59006,15 +57852,6 @@ "tca" = ( /turf/open/floor/iron, /area/science/robotics) -"tch" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/brig) "tck" = ( /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/siding/wood, @@ -59053,6 +57890,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "tdj" = ( @@ -59068,8 +57908,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -59104,36 +57942,26 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"tfp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "tfu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, /area/crew_quarters/heads/hor) "tfx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/law_office/flip{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "tfy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/requests_console{ @@ -59143,6 +57971,12 @@ pixel_y = -32 }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "tfA" = ( @@ -59192,10 +58026,13 @@ /obj/item/melee/baton/loaded, /turf/open/floor/iron/dark, /area/security/warden) -"tgs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"tgn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"tgs" = ( /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/quartermaster/storage) @@ -59204,10 +58041,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -59229,7 +58066,7 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "tgX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron/dark, @@ -59284,6 +58121,12 @@ /obj/item/radio/intercom{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "thw" = ( @@ -59296,16 +58139,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/command{ name = "Head of Security's Dorm"; req_access_txt = "58" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "thD" = ( @@ -59313,9 +58156,6 @@ name = "Port to Thermoelectric Generator" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -59327,15 +58167,6 @@ }, /turf/open/floor/wood, /area/maintenance/port) -"thN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "tid" = ( /obj/machinery/power/smes, /obj/structure/cable/yellow{ @@ -59373,7 +58204,7 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) "tiw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tiJ" = ( @@ -59381,18 +58212,15 @@ /turf/open/floor/iron/white, /area/medical/surgery) "tiU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "tjc" = ( @@ -59408,12 +58236,10 @@ /area/maintenance/port) "tjr" = ( /obj/item/wrench, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/engine, /area/engine/engine_room) "tjA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59458,9 +58284,6 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -59539,9 +58362,6 @@ /area/security/prison) "tlY" = ( /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "tme" = ( @@ -59549,7 +58369,7 @@ icon_state = "4-8" }, /obj/machinery/igniter/incinerator_atmos, -/obj/machinery/air_sensor/atmos/incinerator_tank{ +/obj/machinery/air_sensor/incinerator_tank{ pixel_x = 32; pixel_y = -32 }, @@ -59562,10 +58382,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -59588,10 +58408,21 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"tmC" = ( -/obj/machinery/atmospherics/components/unary/passive_vent, +"tmB" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, -/area/crew_quarters/fitness/recreation) +/area/maintenance/starboard/central) "tmF" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -59623,8 +58454,8 @@ /turf/open/floor/circuit/telecomms, /area/science/xenobiology) "tnA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "tnJ" = ( @@ -59640,7 +58471,6 @@ /obj/structure/closet{ name = "Evidence Closet 4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/railing{ dir = 8 }, @@ -59654,14 +58484,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "tof" = ( @@ -59682,7 +58514,6 @@ /turf/open/floor/iron, /area/science/misc_lab/range) "tov" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -59695,22 +58526,15 @@ /area/hallway/primary/aft) "toz" = ( /obj/structure/dresser, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, /turf/open/floor/wood, /area/crew_quarters/dorms) "tpe" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/prison, /area/security/prison) "tps" = ( @@ -59737,10 +58561,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -59779,9 +58603,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "tqh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock{ name = "Bar Bathrooms" }, @@ -59802,12 +58623,6 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai_upload) "tqG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -59833,16 +58648,14 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/office) "trd" = ( @@ -59856,22 +58669,24 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, /area/library) +"trk" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/prison, +/area/security/prison) "trm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/prison) "trp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -59881,14 +58696,12 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "trC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/science/xenobiology) "trJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -59899,12 +58712,6 @@ "trM" = ( /turf/open/floor/iron/dark, /area/science/robotics/lab) -"tsf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/red/diagonal_edge, -/turf/open/floor/iron/dark, -/area/security/main) "tsA" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -59942,21 +58749,19 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "tsP" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/quartermaster/storage) "ttb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -59973,6 +58778,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "ttB" = ( @@ -60004,6 +58812,8 @@ /obj/structure/sign/poster/official/space_cops{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "tug" = ( @@ -60032,9 +58842,8 @@ /area/security/main) "tuK" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "tuP" = ( @@ -60050,10 +58859,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -60076,6 +58885,21 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"tvo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "tvp" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -60094,21 +58918,25 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "tvv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Nitrogen Outlet" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "tvz" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/port) "tvF" = ( @@ -60123,8 +58951,8 @@ name = "MiniSat AI Access"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -60135,13 +58963,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/checkpoint/science) "tvU" = ( @@ -60162,13 +58993,16 @@ }, /turf/open/floor/iron/white, /area/science/research) -"twH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"twG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/bridge) +"twH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -60187,6 +59021,9 @@ /turf/open/floor/plating/asteroid, /area/maintenance/port) "txW" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/stairs/medium{ dir = 8 }, @@ -60209,7 +59046,7 @@ /area/medical/chemistry) "tyO" = ( /obj/effect/spawner/structure/window/depleteduranium, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/plating, @@ -60222,13 +59059,11 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "tyX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) "tyZ" = ( @@ -60245,24 +59080,8 @@ dir = 8 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) -"tzl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/bridge) "tzI" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -60298,24 +59117,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/gateway) -"tAc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "tAr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60323,13 +59133,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/teleporter) "tAv" = ( @@ -60367,6 +59180,8 @@ /area/space/nearstation) "tBk" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tBq" = ( @@ -60403,14 +59218,16 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sign/poster/random{ pixel_x = -32 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "tCj" = ( @@ -60424,9 +59241,6 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "tCk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -60460,8 +59274,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -60475,9 +59289,6 @@ department = "Holodeck"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -60492,13 +59303,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"tCE" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Port to Supermatter Fuel" - }, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) "tCR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60513,21 +59317,11 @@ /turf/open/floor/iron/dark, /area/security/execution/education) "tDl" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, -/turf/open/floor/iron, -/area/engine/atmos) +/turf/open/floor/iron/dark, +/area/engine/engine_room) "tDq" = ( /obj/machinery/requests_console{ department = "Bar"; @@ -60547,16 +59341,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/relay) -"tDI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "tDJ" = ( /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) @@ -60585,12 +59369,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -60618,10 +59396,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -60633,8 +59411,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -60657,20 +59433,14 @@ /area/medical/genetics) "tEJ" = ( /obj/machinery/telecomms/receiver/preset_exploration, -/obj/machinery/airalarm/server{ - pixel_y = 24; - dir = 1 - }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/relay) "tET" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/chapel{ dir = 6 }, @@ -60679,12 +59449,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/chapel{ dir = 9 }, @@ -60718,14 +59491,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/engine/engineering) "tFT" = ( @@ -60741,6 +59516,14 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"tGh" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "tGi" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -60769,8 +59552,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -60842,9 +59623,6 @@ /turf/open/floor/iron/dark, /area/bridge) "tIp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -60856,6 +59634,12 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/hydroponics) "tIG" = ( @@ -60877,12 +59661,6 @@ /turf/open/floor/wood, /area/maintenance/port) "tIL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -60902,7 +59680,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/warden) "tIW" = ( @@ -60910,15 +59689,18 @@ department = "Chapel"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "tJf" = ( @@ -60940,6 +59722,18 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"tJw" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "tJN" = ( /obj/structure/sign/departments/minsky/supply/mining{ pixel_x = 32 @@ -60952,28 +59746,14 @@ /obj/item/bedsheet/mime, /obj/structure/bed, /obj/effect/landmark/start/mime, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/light, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) -"tKY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron, -/area/security/brig/dock) "tLc" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61011,10 +59791,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/secondary/exit) "tLs" = ( @@ -61029,46 +59805,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"tLB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) -"tLK" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "Secure Gate"; - name = "Brig Blast Door" - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/turf/open/floor/iron/dark, -/area/security/brig) "tMa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -61076,6 +59812,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "tMm" = ( @@ -61083,11 +59821,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "tMA" = ( /obj/machinery/door/poddoor{ @@ -61106,13 +59846,6 @@ /obj/structure/closet/crate, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"tMI" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/main) "tMV" = ( /obj/machinery/door/poddoor{ id = "toxinsdriver"; @@ -61125,11 +59858,10 @@ /turf/open/floor/plating, /area/science/misc_lab/range) "tMZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/camera/directional/west, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -61149,9 +59881,6 @@ pixel_x = -6; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "tNl" = ( @@ -61186,6 +59915,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "tNy" = ( @@ -61193,7 +59928,7 @@ dir = 8 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -61209,7 +59944,6 @@ /turf/open/floor/iron, /area/science/shuttle) "tNE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -61225,18 +59959,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) -"tNT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"tNW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "tOn" = ( /obj/structure/table, /obj/item/clothing/under/rank/cargo/tech{ @@ -61283,10 +60005,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"tON" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/storage) "tOQ" = ( /obj/machinery/telecomms/processor/preset_exploration, /obj/structure/window/reinforced/spawner{ @@ -61353,7 +60071,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -61374,47 +60091,41 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) -"tSm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "tSv" = ( /obj/structure/flora/ausbushes/grassybush, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) -"tSz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "tSC" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/starboard) "tSD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/storage) "tSI" = ( @@ -61441,16 +60152,6 @@ "tTo" = ( /turf/closed/wall/r_wall, /area/security/warden) -"tTr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "tTC" = ( /obj/machinery/holopad, /turf/open/floor/iron/dark/telecomms, @@ -61461,6 +60162,9 @@ location = "hall22" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "tTK" = ( @@ -61477,18 +60181,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/execution/education) "tTV" = ( @@ -61512,8 +60216,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "tUv" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, /obj/item/pipe_dispenser, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, /turf/open/floor/engine, /area/engine/engine_room) "tUy" = ( @@ -61542,12 +60246,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/plating, /area/maintenance/port) "tVk" = ( @@ -61579,61 +60277,57 @@ /turf/open/floor/iron/dark, /area/security/brig) "tVy" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "tVK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/landmark/start/brig_physician, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/security/brig/medbay) "tWh" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/sorting/mail/destination/robotics{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) "tWl" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/atmos) "tWt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/virology) "tWu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tWH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/holopad, /obj/effect/turf_decal/box, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "tWI" = ( @@ -61641,27 +60335,20 @@ pixel_x = 1; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/white, -/area/science/lab) -"tWT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/lab) "tXc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61679,13 +60366,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "tXf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) "tXi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61696,26 +60381,24 @@ /area/security/brig) "tXq" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/exploration_prep) "tXx" = ( /turf/closed/mineral/random, /area/maintenance/starboard/secondary) "tXK" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "tYd" = ( @@ -61773,6 +60456,16 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/port) +"tZd" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/brig) "tZe" = ( /obj/effect/decal/cleanable/glass, /obj/structure/cable/yellow{ @@ -61809,19 +60502,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) -"tZS" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/engine_room) "tZZ" = ( /turf/open/floor/iron/dark, /area/quartermaster/warehouse) @@ -61832,20 +60516,13 @@ /obj/machinery/requests_console{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/plating, /area/maintenance/fore) "uar" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8; - name = "Hot Turbine Waste to Generator" - }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-4" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/atmos) "uas" = ( /obj/structure/cable/yellow{ @@ -61854,17 +60531,17 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "uau" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/item/paper/fluff{ default_raw_text = "Priority Command Notice:\nAfter several incident reports, all crew are advised to NOT put felinids in the pet containment cells. Unlike the animals some of them might have some form of cognitive ability, however this is just a hypothesis at this time."; name = "Pet store notice" @@ -61907,6 +60584,16 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) +"uaS" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) "uaU" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -61929,15 +60616,15 @@ "ubn" = ( /obj/machinery/modular_fabricator/exosuit_fab, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/robotics/lab) "ubo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -61950,6 +60637,15 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/port) +"ubF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "uco" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -61958,9 +60654,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "ucp" = ( @@ -61973,18 +60669,13 @@ /area/crew_quarters/bar) "ucs" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "ucw" = ( @@ -61996,7 +60687,6 @@ /area/medical/virology) "ucM" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -62009,6 +60699,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "ucP" = ( @@ -62016,19 +60712,29 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Mining Docks"; req_access_txt = "48" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "ucS" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ucV" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "uda" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62045,9 +60751,6 @@ /turf/open/floor/iron/techmaint, /area/medical/genetics/cloning) "udt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/chair/fancy/sofa/old/right{ dir = 4 }, @@ -62062,35 +60765,29 @@ pixel_y = -30 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/virology) "udy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "udz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -62102,11 +60799,18 @@ /obj/machinery/vending/cigarette, /turf/open/floor/grass, /area/hallway/primary/fore) +"udN" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/fore) "uel" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/item/radio/intercom{ pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) "uem" = ( @@ -62124,8 +60828,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -62134,12 +60838,6 @@ /turf/open/floor/iron/white, /area/medical/virology) "ueH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62147,27 +60845,35 @@ /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) +"ueT" = ( +/obj/structure/flora/ausbushes/palebush, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/grass/no_border, +/area/hallway/secondary/command) "ueW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "ufc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "ufq" = ( /obj/structure/cable/yellow{ @@ -62178,13 +60884,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -62196,6 +60902,8 @@ /obj/machinery/light_switch{ pixel_x = 26 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "ufV" = ( @@ -62212,19 +60920,19 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/customs) "ugh" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8; - name = "Gas to Chamber" - }, /obj/machinery/light/small, /obj/machinery/camera/directional/west, /obj/machinery/light_switch{ pixel_x = -25 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Gas to Chamber" + }, /turf/open/floor/engine, /area/engine/supermatter) "ugo" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/iron/dark, @@ -62236,6 +60944,18 @@ }, /turf/open/floor/engine, /area/engine/engine_room) +"ugs" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/main) "ugC" = ( /obj/machinery/camera/directional/east, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -62248,19 +60968,9 @@ /obj/machinery/newscaster{ pixel_y = -29 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "ugL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -62275,10 +60985,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "uhy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -62288,8 +60994,25 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"uhz" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "uhE" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -62304,12 +61027,12 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "uhX" = ( @@ -62317,12 +61040,21 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "uib" = ( @@ -62335,9 +61067,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -62371,12 +61100,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -62385,16 +61108,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_red/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/security/prison) "uiA" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/item/radio/intercom{ pixel_x = 32 }, @@ -62427,6 +61143,9 @@ pixel_x = 1; name = "la creatura" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "uiI" = ( @@ -62448,6 +61167,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "ujE" = ( @@ -62456,9 +61177,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/science/robotics/lab) "ujG" = ( @@ -62472,13 +61190,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/security/checkpoint/supply) "ujI" = ( @@ -62491,6 +61209,12 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/courtroom) "ujR" = ( @@ -62504,24 +61228,23 @@ /area/maintenance/starboard/secondary) "ujZ" = ( /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "ukb" = ( /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "ukj" = ( @@ -62533,20 +61256,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"ukx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/caution{ - dir = 8; - pixel_x = -3 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/noslip/dark, -/area/hallway/secondary/service) "uky" = ( /obj/structure/table/glass, /obj/item/book/manual/wiki/plumbing, @@ -62560,35 +61269,17 @@ /obj/effect/gibspawner/xeno/bodypartless, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ukN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron, -/area/medical/morgue) -"uln" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/security/brig) "ulo" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/genetics) "ulq" = ( @@ -62604,13 +61295,22 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"ulG" = ( +"ulE" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/iron/dark, +/area/bridge) +"ulG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -62623,6 +61323,12 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "ulM" = ( @@ -62643,18 +61349,13 @@ dir = 8 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"ulY" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) "umi" = ( /obj/structure/table/glass, /obj/item/clothing/gloves/color/latex, @@ -62670,7 +61371,6 @@ /turf/open/floor/iron/white, /area/medical/virology) "ump" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -62692,13 +61392,13 @@ /turf/open/floor/iron, /area/hydroponics) "umK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -62706,7 +61406,8 @@ /area/engine/atmos) "und" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/turf/open/floor/iron/dark/telecomms, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, /area/tcommsat/relay) "unf" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -62765,9 +61466,6 @@ "uoj" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/rack, /obj/item/analyzer, /obj/item/extinguisher, @@ -62784,8 +61482,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engine_smes) "uou" = ( @@ -62800,14 +61498,14 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/holopad, /obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/security/brig/dock) "uoE" = ( @@ -62817,22 +61515,19 @@ /area/quartermaster/storage) "uoO" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron, -/area/science/shuttle) -"upa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/iron, +/area/science/shuttle) +"upa" = ( /obj/structure/sign/map/left{ pixel_x = 16; pixel_y = -32 @@ -62841,10 +61536,11 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) "upb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) @@ -62859,9 +61555,6 @@ /turf/open/floor/iron, /area/science/mixing) "upt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/departments/minsky/medical/chemistry/chemical2{ pixel_y = 32 }, @@ -62882,22 +61575,15 @@ /turf/open/floor/plating, /area/quartermaster/qm) "upV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) -"upX" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "uqv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62915,25 +61601,31 @@ /turf/open/floor/iron/white, /area/medical/storage) "uqH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/security/brig) -"uqV" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"uqS" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/turf/open/floor/iron, +/area/hallway/secondary/service) +"uqV" = ( +/obj/machinery/light{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "uri" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -62941,6 +61633,12 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/port) "uru" = ( @@ -62957,12 +61655,6 @@ }, /obj/item/folder/white, /obj/item/flashlight/pen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/window/northright{ dir = 4; name = "medbay Interior"; @@ -62977,10 +61669,11 @@ /turf/open/floor/circuit/green, /area/security/nuke_storage) "urE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "urL" = ( @@ -62999,18 +61692,18 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/security/brig/medbay) "urU" = ( @@ -63018,6 +61711,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "usf" = ( @@ -63030,25 +61725,19 @@ /area/medical/medbay/aft) "usA" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/sorting) "usU" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -63067,6 +61756,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/central) "utq" = ( @@ -63074,9 +61765,6 @@ /turf/open/floor/plating, /area/engine/atmospherics_engine) "uuu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -63088,6 +61776,12 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "uuw" = ( @@ -63125,10 +61819,13 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/primary/fore) "uvd" = ( @@ -63150,16 +61847,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) -"uvU" = ( -/obj/machinery/door/airlock/external{ - name = "Exploration Shuttle Bay" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plating, -/area/medical/virology) "uvY" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -63176,17 +61863,19 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"uwl" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/maintenance/starboard/aft) +"uwo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "uwC" = ( /obj/machinery/smartfridge{ name = "Sample Storage" @@ -63197,15 +61886,12 @@ /turf/open/floor/iron/white, /area/medical/virology) "uwE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 10 }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -63213,14 +61899,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/computer/atmos_control/tank/toxins_mixing_tank, +/obj/machinery/computer/atmos_control/toxinsmix, /turf/open/floor/iron, /area/science/mixing) "uwL" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -63276,19 +61959,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "uxZ" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Fuel Line to Supermatter" @@ -63311,7 +61991,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -63348,20 +62028,26 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/iron/white, -/area/science/research) -"uyQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/science/research) +"uyQ" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/turf/open/floor/iron/dark, +/area/engine/atmos) "uyX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63369,7 +62055,6 @@ icon_state = "1-8" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/box, /turf/open/floor/iron, @@ -63384,9 +62069,6 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "uzr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/maintenance/department/science) @@ -63400,28 +62082,30 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "uzS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "uAa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/destination/rd_office/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "uAc" = ( @@ -63467,17 +62151,6 @@ /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/white, /area/science/xenobiology) -"uBb" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "uBg" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -63489,6 +62162,15 @@ /obj/machinery/icecream_vat, /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) +"uBj" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "uBw" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -63497,10 +62179,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -63516,6 +62194,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "uBD" = ( @@ -63536,15 +62220,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/secondary) -"uCb" = ( -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/security/main) "uCr" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses/advanced, @@ -63556,6 +62231,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/lawoffice) "uCC" = ( @@ -63576,16 +62254,29 @@ /area/engine/engineering) "uDa" = ( /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"uDp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "uDq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "uDs" = ( @@ -63632,18 +62323,27 @@ /turf/open/floor/iron/white, /area/quartermaster/exploration_prep) "uDW" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) +"uEc" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "uEf" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ @@ -63655,8 +62355,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) "uEi" = ( @@ -63677,9 +62377,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/iron, /area/science/robotics) "uEq" = ( @@ -63691,6 +62388,8 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/noslip/white, /area/medical/medbay/central) "uEB" = ( @@ -63704,31 +62403,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/port) "uEX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hydroponics) -"uFb" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/port) "uFe" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -63738,7 +62426,6 @@ name = "Shuttle Lab"; req_one_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -63756,17 +62443,17 @@ /turf/open/floor/iron, /area/engine/engineering) "uFv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engine_room) @@ -63778,16 +62465,20 @@ /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Dock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "uFW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "uGc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -63795,10 +62486,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -63856,6 +62547,9 @@ location = "hall2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "uGg" = ( @@ -63866,25 +62560,25 @@ dir = 8 }, /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/machinery/newscaster{ pixel_y = -30 }, /turf/open/floor/iron, /area/security/brig) -"uGU" = ( -/obj/effect/turf_decal/stripes/line, -/turf/closed/wall, -/area/engine/atmospherics_engine) +"uGI" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "uGY" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -63894,15 +62588,14 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "uHo" = ( -/obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/end{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron, +/area/engine/atmos) "uHw" = ( /obj/machinery/porta_turret/ai{ dir = 4; @@ -63912,11 +62605,15 @@ /turf/open/floor/plating/airless, /area/ai_monitored/turret_protected/aisat_interior) "uHy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/prison, -/area/security/prison) +/turf/open/floor/iron/white, +/area/science/research) "uHz" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -63938,12 +62635,6 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/bridge) "uIa" = ( @@ -63954,11 +62645,14 @@ /turf/open/space/basic, /area/space/nearstation) "uIc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "uIh" = ( @@ -63969,9 +62663,6 @@ pixel_y = -28; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/dorms) @@ -63982,37 +62673,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/bridge) -"uIF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) -"uIH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 2 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"uIQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/iron/dark, +/area/bridge) "uIT" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/iron/white, /area/science/explab) "uIY" = ( @@ -64032,10 +62704,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "uJj" = ( @@ -64069,6 +62744,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "uJG" = ( @@ -64078,8 +62755,6 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "uJJ" = ( @@ -64101,11 +62776,14 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "uKa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/chair{ + dir = 8 }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/grimy, +/area/chapel/office) "uKr" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -64113,9 +62791,6 @@ departmentType = 5; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64125,10 +62800,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -64142,15 +62817,11 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/central) "uKS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/bridge) "uKT" = ( @@ -64160,12 +62831,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/office) "uKY" = ( @@ -64200,10 +62871,10 @@ icon_state = "1-2" }, /obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -64233,6 +62904,12 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "uLA" = ( @@ -64242,13 +62919,33 @@ }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) +"uLF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"uLI" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "uMg" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64274,7 +62971,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs/left{ dir = 1 }, @@ -64297,9 +62995,6 @@ pixel_y = 6; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -64310,12 +63005,6 @@ /obj/item/radio/intercom{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -64323,6 +63012,12 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/white, /area/science/lab) "uMY" = ( @@ -64337,6 +63032,9 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/crew_quarters/cryopods) "uNh" = ( @@ -64359,12 +63057,6 @@ /area/tcommsat/computer) "uNt" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64374,26 +63066,24 @@ /turf/open/floor/iron/dark, /area/chapel/main/monastery) "uNE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/caution/stand_clear{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "uNH" = ( /obj/effect/turf_decal/caution/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -64415,7 +63105,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -64428,7 +63118,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -64451,7 +63140,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) "uOo" = ( @@ -64479,7 +63168,6 @@ /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "uOJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/machinery/firealarm{ dir = 8; @@ -64488,7 +63176,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "uPb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/sign/departments/minsky/medical/medical2{ pixel_x = 32 }, @@ -64514,19 +63201,22 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "uQg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, /area/security/nuke_storage) "uQB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -64589,12 +63279,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -64626,12 +63310,13 @@ /turf/open/floor/grass, /area/hallway/primary/starboard) "uRT" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/central) +/area/hallway/primary/fore) "uRZ" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -64641,33 +63326,16 @@ /turf/open/floor/iron, /area/security/brig) "uSv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "uSz" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/dark, /area/engine/atmos) -"uSJ" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/security/courtroom) -"uSM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/carpet/grimy, -/area/chapel/office) "uTg" = ( /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/iron/freezer, @@ -64685,21 +63353,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "uTo" = ( /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid/airless, @@ -64732,27 +63400,11 @@ /area/engine/engine_room) "uUh" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/keycard_auth{ pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/bridge) -"uUk" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - external_pressure_bound = 140; - name = "RD Server Vent"; - pressure_checks = 0 - }, -/turf/open/floor/circuit, -/area/science/server) "uUn" = ( /obj/machinery/computer/teleporter{ dir = 8 @@ -64763,16 +63415,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/engine/engineering) "uUX" = ( @@ -64791,16 +63443,9 @@ dir = 8 }, /obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "uVi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/requests_console{ department = "Escape Hallway"; pixel_y = -32 @@ -64812,6 +63457,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "uVu" = ( @@ -64872,29 +63523,28 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "uWX" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ dir = 4 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) -"uXc" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +"uXi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating, -/area/engine/engine_room) +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "uXD" = ( /obj/machinery/requests_console{ pixel_y = -32 @@ -64906,16 +63556,13 @@ /area/ai_monitored/turret_protected/aisat_interior) "uXG" = ( /obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 4 }, /turf/open/floor/iron/white, /area/science/robotics/lab) "uXM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/table/reinforced, /obj/item/analyzer, /obj/item/paper/fluff{ @@ -64941,9 +63588,6 @@ /obj/machinery/door/airlock/external/glass{ name = "Escape Pod Alpha" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) @@ -64956,15 +63600,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) -"uYx" = ( -/obj/machinery/advanced_airlock_controller/directional/north, -/obj/effect/turf_decal/tile/brown/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/quartermaster/storage) +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "uYz" = ( /obj/structure/table/glass, /obj/item/radio/off{ @@ -64975,14 +63615,14 @@ }, /area/science/breakroom) "uYE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/sign/departments/minsky/engineering/engineering{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -65001,7 +63641,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) "uYV" = ( @@ -65018,14 +63658,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) @@ -65048,8 +63688,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -65062,9 +63700,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/machinery/holopad, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) @@ -65072,7 +63707,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -65090,14 +63725,6 @@ }, /turf/open/floor/wood, /area/security/prison) -"vaP" = ( -/obj/machinery/advanced_airlock_controller/directional/west, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/security/brig/dock) "vbv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -65150,10 +63777,15 @@ /obj/structure/disposalpipe/segment, /obj/item/beacon, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/security/courtroom) "vcp" = ( @@ -65163,15 +63795,6 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) -"vcw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "vcO" = ( /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, @@ -65182,6 +63805,13 @@ /obj/structure/closet/l3closet/security, /turf/open/floor/iron/dark, /area/security/main) +"vdy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/wood, +/area/crew_quarters/bar) "vdA" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -65246,6 +63876,14 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/security/courtroom) +"vei" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/black/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/main) "ven" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 1 @@ -65259,7 +63897,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "ver" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "vet" = ( @@ -65269,10 +63907,11 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "vey" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -65309,10 +63948,17 @@ /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "veZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/security/brig) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/research) "vfa" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -65346,8 +63992,12 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "vft" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) @@ -65362,25 +64012,27 @@ /turf/open/floor/iron/dark, /area/bridge) "vfD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engine_room) "vgb" = ( /turf/closed/wall/r_wall, /area/engine/gravity_generator) "vge" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /obj/machinery/meter, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_y = 27 }, /turf/open/floor/catwalk_floor/flat_white, @@ -65398,21 +64050,21 @@ /turf/open/floor/iron, /area/engine/engine_smes) "vgE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/brig) "vgU" = ( @@ -65432,6 +64084,12 @@ dir = 8 }, /obj/machinery/camera/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "vhc" = ( @@ -65441,19 +64099,19 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/hallway/secondary/service) "vhl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "vho" = ( @@ -65467,10 +64125,23 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "vhu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "vhD" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -65541,39 +64212,48 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "vid" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "vja" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "vjC" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/door/airlock/external{ + name = "Solar Panel Airlock"; + req_access_txt = "10" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -65595,9 +64275,6 @@ /obj/effect/turf_decal/plaque{ icon_state = "L11" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -65614,9 +64291,6 @@ /turf/open/floor/iron/dark, /area/security/execution/education) "vkc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall32"; location = "hall31" @@ -65624,31 +64298,43 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/hallway/primary/fore) -"vkh" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 +"vke" = ( +/obj/structure/table/reinforced, +/obj/item/storage/bag/tray, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) +"vkh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "vky" = ( /obj/item/radio/intercom{ pixel_y = 24 }, -/turf/open/floor/engine, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "vkA" = ( /obj/structure/lattice/catwalk, @@ -65730,12 +64416,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "vlU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -65751,8 +64440,6 @@ icon_state = "1-2" }, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -65787,6 +64474,8 @@ /area/crew_quarters/kitchen/coldroom) "vmR" = ( /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "vno" = ( @@ -65813,6 +64502,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "vnr" = ( @@ -65822,22 +64513,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "vnz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron, -/area/security/courtroom) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/science/mixing) "vnB" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron, /area/hallway/primary/fore) "vnF" = ( @@ -65883,13 +64574,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/starboard/central) "voS" = ( @@ -65902,16 +64593,6 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"voV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/diagonal_edge, -/turf/open/floor/iron/dark, -/area/security/main) "vpg" = ( /obj/structure/window/reinforced{ dir = 8 @@ -65924,17 +64605,6 @@ }, /turf/open/floor/iron/dark, /area/science/robotics/lab) -"vph" = ( -/obj/machinery/light_switch{ - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron, -/area/science/shuttle) "vpN" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -65949,6 +64619,9 @@ /area/maintenance/department/chapel/monastery) "vpS" = ( /obj/item/wrench, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engine_room) "vqa" = ( @@ -65972,12 +64645,15 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "vqh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "vqk" = ( @@ -66014,6 +64690,18 @@ }, /turf/open/floor/iron, /area/security/prison) +"vqt" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hydroponics) "vqE" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -66023,7 +64711,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "vqI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -66034,19 +64721,16 @@ /turf/open/floor/plating, /area/maintenance/port) "vqO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/quartermaster/qm) "vrb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/iron, /area/engine/atmos) "vre" = ( @@ -66075,15 +64759,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/central) -"vrl" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "vrp" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ @@ -66111,13 +64786,14 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "vrQ" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -66128,6 +64804,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "vrV" = ( @@ -66171,9 +64853,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -66212,9 +64891,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "vtM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -66227,6 +64903,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "vud" = ( @@ -66243,9 +64925,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -66270,17 +64949,20 @@ /obj/machinery/door/airlock/public/glass{ name = "Visitors Centre" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/prison) "vuG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron, -/area/security/courtroom) +/area/science/shuttle) "vuH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66294,32 +64976,15 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) -"vuX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) -"vvb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig) "vvd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -66328,18 +64993,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) "vvk" = ( @@ -66363,10 +65028,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -66388,22 +65053,11 @@ /obj/machinery/holopad, /turf/open/floor/iron/white, /area/medical/medbay/central) -"vvx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "vvL" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "vvO" = ( @@ -66423,6 +65077,9 @@ /obj/effect/landmark/start/station_engineer, /obj/machinery/holopad, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage_shared) "vwz" = ( @@ -66430,49 +65087,38 @@ dir = 8 }, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vwD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "vwK" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, -/area/maintenance/port/fore) -"vwV" = ( -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/security/main) +/turf/open/floor/plating, +/area/maintenance/port/fore) "vxc" = ( /obj/machinery/door/airlock/atmos{ name = "Incinerator"; @@ -66482,9 +65128,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/atmos) "vxe" = ( @@ -66501,10 +65147,17 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"vxy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"vxq" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/turf/open/floor/iron, +/area/security/brig) +"vxy" = ( /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -66515,21 +65168,13 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "vxz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/medical/medbay/central) +/turf/open/floor/iron/dark, +/area/engine/engine_room) "vxL" = ( /obj/structure/table/wood, /obj/item/book/random, @@ -66550,30 +65195,27 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "vxU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/aft) -"vyc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/turf/open/floor/wood, +/area/crew_quarters/fitness/recreation) +"vyc" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/light{ light_color = "#7AC3FF" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "vyd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/science/shuttle) @@ -66587,12 +65229,15 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/security/brig) "vyv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -66667,6 +65312,9 @@ location = "hall29" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "vzm" = ( @@ -66676,9 +65324,6 @@ /turf/open/floor/iron, /area/engine/atmos) "vzp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -66690,16 +65335,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"vzs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) "vzu" = ( /obj/structure/alien/weeds, /turf/open/floor/plating, @@ -66711,6 +65346,21 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"vzz" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "vzD" = ( @@ -66723,33 +65373,20 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "vzG" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/atmos) -"vzP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/security/nuke_storage) +/area/engine/atmos) "vzZ" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -66760,14 +65397,6 @@ "vAt" = ( /turf/closed/wall, /area/crew_quarters/toilet) -"vAx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/aft) "vAA" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot, @@ -66775,10 +65404,13 @@ /area/science/storage) "vAH" = ( /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/landmark/start/security_officer, /turf/open/floor/iron, /area/security/brig) "vAR" = ( @@ -66788,12 +65420,6 @@ dir = 4 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/security/main) "vBf" = ( @@ -66806,6 +65432,8 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/aft) "vBI" = ( @@ -66817,7 +65445,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/airalarm/kitchen_cold_room{ +/obj/machinery/airalarm{ dir = 1; pixel_y = 24 }, @@ -66833,9 +65461,6 @@ /turf/open/floor/iron, /area/science/mixing) "vBM" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "vBN" = ( @@ -66878,23 +65503,11 @@ }, /turf/open/space/basic, /area/solar/port/fore) -"vCt" = ( -/obj/machinery/door/airlock/external{ - name = "Transport Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/shuttle) "vCz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -66911,12 +65524,6 @@ /obj/item/radio/intercom{ pixel_y = -29 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/wood, /area/security/detectives_office) "vDg" = ( @@ -66926,14 +65533,24 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"vDk" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "vDn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -66964,12 +65581,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/security/execution/education) "vEh" = ( @@ -66980,6 +65591,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/brig) "vEj" = ( @@ -67000,6 +65615,16 @@ /obj/item/gps/mining, /turf/open/floor/iron/dark, /area/quartermaster/qm) +"vEq" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "vEs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67013,13 +65638,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "vEu" = ( @@ -67032,25 +65660,18 @@ }, /turf/open/floor/plating, /area/security/nuke_storage) -"vEz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/service) "vEJ" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/iron, /area/construction/mining/aux_base) @@ -67062,26 +65683,17 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/hallway/primary/starboard) "vEV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) -"vFk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/security/nuke_storage) "vFC" = ( /obj/machinery/light_switch{ pixel_x = -28 @@ -67099,15 +65711,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "vFT" = ( @@ -67119,15 +65734,12 @@ /area/medical/medbay/central) "vFX" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/atmos) "vFZ" = ( @@ -67143,6 +65755,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/storage/tools) "vGB" = ( @@ -67151,6 +65766,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/crew_quarters/cryopods) "vGC" = ( @@ -67175,11 +65791,13 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "vGJ" = ( /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -67196,16 +65814,13 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit) "vHc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -67213,55 +65828,35 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"vHd" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Panel Airlock"; - req_access_txt = "10" - }, -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/solars/port/fore) "vHs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "vHA" = ( /obj/effect/turf_decal/caution, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/west, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) -"vHK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "vHM" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/binary/valve/digital/on/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "vHS" = ( @@ -67271,9 +65866,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -67305,13 +65897,13 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/siding/white, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "vIj" = ( @@ -67331,13 +65923,14 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "vIk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "vIx" = ( @@ -67348,23 +65941,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) -"vIW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/storage) "vJi" = ( /turf/closed/wall, /area/hallway/secondary/entry) @@ -67386,8 +65967,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/engineering) "vJF" = ( @@ -67422,35 +66003,19 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/mixing) -"vKl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "vKn" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Port to Supermatter Fuel" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "vKq" = ( /obj/machinery/door/airlock/hatch{ @@ -67464,9 +66029,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/tcommsat/computer) "vKM" = ( @@ -67480,14 +66045,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) -"vKP" = ( -/obj/machinery/atmospherics/components/unary/passive_vent, -/obj/item/radio/intercom{ - pixel_x = -28; - pixel_y = 4 - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/recreation) "vKY" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -67497,40 +66054,41 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/east, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/security/checkpoint/engineering) "vLg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/structure/disposalpipe/junction/flip{ dir = 2 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/security/brig) -"vLG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +"vLI" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/engine_room) +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "vLT" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/black/opposingcorners, @@ -67557,25 +66115,17 @@ /area/chapel/office) "vMC" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/virology) "vMD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hydroponics) "vMV" = ( @@ -67596,12 +66146,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -67653,10 +66197,27 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) +"vOL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/brig/dock) "vOT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "vOY" = ( @@ -67677,27 +66238,13 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "vPM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) -"vPR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Departures Lounge" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "vQa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67708,12 +66255,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) "vQd" = ( @@ -67749,12 +66294,13 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "vQo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, -/area/quartermaster/storage) +/area/hallway/primary/fore) "vQz" = ( /turf/closed/wall, /area/security/checkpoint/medical) @@ -67762,14 +66308,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -67780,7 +66326,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -67798,62 +66347,42 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/hallway/primary/aft) -"vSk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/aft) -"vSl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +"vSd" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, -/area/maintenance/department/chapel/monastery) +/area/bridge) "vSr" = ( /obj/item/beacon, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vSv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/machinery/light_switch{ pixel_x = 1; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/atmos) "vSy" = ( @@ -67872,16 +66401,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "vTi" = ( @@ -67895,33 +66420,33 @@ id_tag = "Dorm1"; name = "Cabin 1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/siding/wood/end{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/dorms) "vTH" = ( /obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "vTL" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/science/robotics/lab) "vTR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -67938,8 +66463,6 @@ "vUe" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/item/storage/backpack/duffelbag/med/implant, /obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 8 @@ -67957,7 +66480,7 @@ /turf/closed/wall, /area/crew_quarters/kitchen/coldroom) "vUN" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/camera/directional/north, @@ -67981,17 +66504,14 @@ dir = 4 }, /obj/machinery/door/firedoor, -/turf/open/floor/carpet/grimy, -/area/chapel/office) -"vVe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/science/explab) +/turf/open/floor/carpet/grimy, +/area/chapel/office) "vVs" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/iron, @@ -68020,7 +66540,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/telecomms, @@ -68029,9 +66549,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -68058,7 +66575,6 @@ /area/quartermaster/office) "vWC" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/bar) "vWF" = ( @@ -68079,9 +66595,6 @@ /turf/open/floor/carpet/cyan, /area/crew_quarters/heads/cmo) "vWY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -68091,13 +66604,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"vXj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "vXt" = ( /obj/machinery/light/small{ dir = 8 @@ -68129,14 +66635,14 @@ /turf/open/floor/engine, /area/science/explab) "vXL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "vXS" = ( @@ -68176,8 +66682,11 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "vYG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) @@ -68185,6 +66694,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "vYN" = ( @@ -68206,22 +66718,6 @@ dir = 5 }, /area/crew_quarters/heads/hor) -"vZb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Mining Dock Airlock"; - req_access_txt = "48" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/miningdock) "vZm" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/cobweb, @@ -68255,7 +66751,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hallway/secondary/service) @@ -68269,12 +66764,6 @@ /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"waM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/black, -/area/crew_quarters/heads/hos) "waO" = ( /obj/effect/turf_decal/plaque{ icon_state = "L13" @@ -68282,9 +66771,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -68294,21 +66780,17 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) -"wbc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "wbd" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, @@ -68322,6 +66804,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) "wbq" = ( @@ -68372,17 +66855,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) -"wbZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +"wcl" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) +/turf/open/floor/plating, +/area/hallway/primary/aft) "wct" = ( /obj/machinery/vending/custom{ pixel_x = -3 @@ -68390,6 +66877,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/wood, /area/library) "wcN" = ( @@ -68406,13 +66894,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/science/lab) -"wdm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/crew_quarters/toilet) "wdn" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -68434,7 +66915,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "wdC" = ( @@ -68445,10 +66925,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -68462,19 +66942,28 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"wei" = ( +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/execution/education) "wej" = ( /obj/machinery/vending/cola, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) "wey" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/atmos) "weB" = ( /obj/effect/turf_decal/stripes/line, @@ -68518,6 +67007,8 @@ req_one_access_txt = "1;4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "weT" = ( @@ -68544,12 +67035,6 @@ }, /area/medical/chemistry) "wfL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = 32 }, @@ -68571,9 +67056,6 @@ "wfR" = ( /obj/structure/chair/office, /obj/effect/landmark/start/depsec/science, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -68591,7 +67073,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "wgE" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -68600,12 +67082,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/advanced_airlock_controller/directional/north, /obj/item/pickaxe, /obj/item/pickaxe, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -68664,6 +67142,8 @@ /obj/structure/sign/poster/official/help_others{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "whL" = ( @@ -68687,27 +67167,27 @@ /area/quartermaster/sorting) "whZ" = ( /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wiq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/mixing) "wiH" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68720,12 +67200,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/engineering) "wiT" = ( @@ -68744,9 +67224,6 @@ pixel_x = -28; pixel_y = -2 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/crew_quarters/toilet) "wiY" = ( @@ -68756,15 +67233,24 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "wjc" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron/white, /area/medical/virology) +"wjl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "wjs" = ( /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) @@ -68802,22 +67288,13 @@ /obj/structure/sign/departments/minsky/supply/janitorial{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) -"wjX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "wkh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -68862,19 +67339,24 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "wks" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "wkz" = ( @@ -68886,26 +67368,26 @@ /turf/open/floor/plating, /area/medical/storage) "wlf" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/science/lab) "wli" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/medbay{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "wlj" = ( @@ -68918,14 +67400,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/hallway/secondary/command) "wlr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -68944,15 +67422,10 @@ /turf/open/floor/iron, /area/security/courtroom) "wlT" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8 - }, +/obj/machinery/holopad, /turf/open/floor/iron/dark, /area/engine/engine_room) "wlV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -68962,6 +67435,8 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "wlW" = ( @@ -68994,9 +67469,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -69009,15 +67481,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "wmZ" = ( @@ -69025,7 +67497,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -69038,7 +67510,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/central) "wnl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -69051,18 +67523,22 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Pet Storage" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "wnR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -69072,6 +67548,12 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/maintenance/department/science) "wnZ" = ( @@ -69082,6 +67564,8 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) "wod" = ( @@ -69107,6 +67591,12 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "woC" = ( @@ -69123,9 +67613,9 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "woE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "woG" = ( @@ -69151,15 +67641,18 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/storage) "wpg" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) "wpp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -69174,11 +67667,13 @@ }, /turf/open/floor/iron, /area/science/shuttle) +"wqj" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/space/basic, +/area/space/nearstation) "wqp" = ( /obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -69187,28 +67682,22 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/maintenance/department/science) "wqA" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) "wqH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -69225,14 +67714,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "wrI" = ( @@ -69322,16 +67806,16 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) "wsP" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "wtu" = ( @@ -69382,12 +67866,15 @@ /area/security/checkpoint/supply) "wul" = ( /obj/effect/spawner/structure/window/depleteduranium, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/atmospherics_engine) "wum" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/storage_shared) @@ -69414,15 +67901,12 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/lawoffice) "wuN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) @@ -69436,13 +67920,16 @@ "wuY" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "wvy" = ( @@ -69461,12 +67948,6 @@ /turf/open/floor/carpet/green, /area/crew_quarters/bar) "wvQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/light, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, @@ -69487,19 +67968,20 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/light, /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "wwk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "wwq" = ( @@ -69507,6 +67989,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "wwx" = ( @@ -69527,6 +68012,12 @@ req_access_txt = "8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "wwI" = ( @@ -69538,19 +68029,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"wwL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "wxc" = ( /obj/item/beacon, /obj/structure/cable/yellow{ @@ -69558,6 +68036,21 @@ }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) +"wxd" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/medical/surgery) +"wxi" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/security/main) "wxr" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -69571,22 +68064,18 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"wxw" = ( -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plating, -/area/maintenance/solars/port/fore) "wxC" = ( /obj/machinery/atmospherics/components/binary/pump/on, /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/engine, /area/science/mixing/chamber) "wxJ" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) "wxT" = ( @@ -69618,14 +68107,15 @@ /turf/open/floor/iron, /area/bridge) "wyw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "wyy" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 4 }, /turf/open/floor/engine/co2, @@ -69634,9 +68124,6 @@ /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -69650,6 +68137,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "wzf" = ( @@ -69659,18 +68152,6 @@ }, /turf/open/floor/iron/white, /area/science/lab) -"wzk" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "wzs" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Teleporter Maintenance"; @@ -69682,12 +68163,6 @@ /area/science/research) "wzx" = ( /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -69714,9 +68189,6 @@ /area/security/brig) "wzT" = ( /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "wzY" = ( @@ -69735,9 +68207,9 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "wAu" = ( @@ -69746,12 +68218,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"wAx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/science/xenobiology) "wAU" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -69766,21 +68232,7 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/quartermaster/storage) -"wBm" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/security/brig) "wBw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, @@ -69799,15 +68251,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = 32 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "wCt" = ( @@ -69828,7 +68283,6 @@ name = "Solar Panel Airlock"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "wCA" = ( @@ -69856,6 +68310,12 @@ dir = 4; pixel_y = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "wDp" = ( @@ -69892,6 +68352,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/security/main) "wDS" = ( @@ -69901,6 +68364,16 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"wEb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "wEp" = ( /obj/structure/table/wood, /obj/item/folder, @@ -69941,8 +68414,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/storage) "wEN" = ( @@ -69954,28 +68427,31 @@ pixel_y = -2 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "wEY" = ( /obj/effect/turf_decal/plaque{ icon_state = "L10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) "wFt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "wFC" = ( @@ -69984,7 +68460,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/science/robotics/lab) "wFQ" = ( @@ -70008,20 +68483,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/main) "wFT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/item/radio/intercom{ pixel_x = 29; pixel_y = -2 @@ -70083,14 +68557,14 @@ id_tag = "Dorm2"; name = "Cabin 2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/siding/wood/end{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -70123,12 +68597,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "wHG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -70142,6 +68610,12 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "wHJ" = ( @@ -70155,9 +68629,6 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "wIa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 @@ -70173,31 +68644,29 @@ /turf/open/floor/carpet/green, /area/crew_quarters/bar) "wId" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/structure/closet/firecloset/full, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "wIF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "wIU" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/department/science) "wIX" = ( @@ -70207,10 +68676,10 @@ /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -70222,7 +68691,7 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "wJD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -70240,20 +68709,20 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "wKh" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 @@ -70261,6 +68730,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "wKq" = ( @@ -70270,24 +68741,23 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "wKs" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/volume_pump{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 8; - name = "Atmospherics Burn Mix" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + name = "Gas Mix to TEG" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/engine/engine_room) "wKv" = ( /obj/effect/turf_decal/stripes/line{ @@ -70310,7 +68780,6 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "wKH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -70318,20 +68787,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "wKQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating/asteroid, @@ -70352,18 +68822,18 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "wLe" = ( @@ -70378,26 +68848,17 @@ /turf/open/floor/plating, /area/maintenance/port) "wLq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/green{ dir = 4 }, -/turf/open/floor/prison/dark, -/area/security/prison) -"wLr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/iron, +/area/hallway/primary/fore) "wLz" = ( /obj/docking_port/stationary{ dir = 4; @@ -70417,10 +68878,12 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) "wLG" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, /obj/structure/chair/fancy/comfy{ @@ -70436,9 +68899,11 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/iron/dark, /area/quartermaster/office) @@ -70454,10 +68919,6 @@ /turf/open/floor/grass, /area/hallway/primary/fore) "wMg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -70467,15 +68928,14 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "wMp" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -70486,11 +68946,12 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/public/glass{ name = "Fore Primary Hallway" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "wMK" = ( @@ -70523,6 +68984,12 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "wNF" = ( @@ -70536,12 +69003,6 @@ id = "custodialshutters"; name = "Custodial Closet Shutters" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, /area/janitor) @@ -70572,10 +69033,11 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "wNZ" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, /obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -70592,6 +69054,18 @@ }, /turf/open/floor/iron, /area/hydroponics) +"wOp" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hydroponics) "wOD" = ( /obj/structure/chair/office/light{ dir = 4 @@ -70614,47 +69088,48 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/bridge) "wPa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engine_room) "wPn" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Waste to Filter" - }, /obj/structure/chair/stool, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) -"wPG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "wPN" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/delivery, @@ -70703,7 +69178,6 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "wQe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 @@ -70711,7 +69185,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "wQk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/chair/stool, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -70722,6 +69196,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/security/brig) "wQB" = ( @@ -70780,9 +69260,6 @@ /area/ai_monitored/turret_protected/ai) "wRZ" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -70800,14 +69277,6 @@ /obj/item/nanite_remote, /turf/open/floor/iron/dark, /area/science/nanite) -"wSn" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "wSr" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -70815,22 +69284,6 @@ "wSu" = ( /turf/closed/wall, /area/medical/chemistry) -"wSv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/bar) -"wSz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "wSB" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -70856,13 +69309,6 @@ /obj/machinery/bookbinder, /turf/open/floor/carpet/green, /area/library) -"wSY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "wTg" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -70874,11 +69320,11 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) @@ -70926,10 +69372,24 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) +"wTL" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/security/brig) "wUo" = ( /obj/machinery/light_switch{ pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/carpet/grimy, /area/chapel/office) "wUD" = ( @@ -70955,13 +69415,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) "wVr" = ( @@ -70975,6 +69435,12 @@ /obj/machinery/firealarm{ pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "wVC" = ( @@ -70998,6 +69464,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "wVP" = ( @@ -71017,22 +69489,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) -"wWe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/engine_room) "wWh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output, /turf/open/floor/engine/n2, /area/engine/atmos) "wWj" = ( @@ -71045,11 +69512,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "wWq" = ( @@ -71064,19 +69531,18 @@ dir = 1; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "wWA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "wWO" = ( @@ -71100,11 +69566,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) -"wXl" = ( -/obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron, -/area/quartermaster/storage) "wXn" = ( /obj/machinery/light_switch{ pixel_x = 1; @@ -71122,19 +69583,21 @@ /turf/open/floor/prison, /area/security/prison) "wXO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/science/shuttle) "wXZ" = ( /obj/effect/landmark/start/station_engineer, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "wYa" = ( @@ -71151,10 +69614,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/robotics) "wYf" = ( @@ -71164,23 +69630,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "wYk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "wYm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -71233,28 +69696,22 @@ /turf/open/floor/plating, /area/maintenance/fore) "wYC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "wYS" = ( /obj/machinery/telecomms/bus/preset_one, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"wYY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "wZe" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ @@ -71268,9 +69725,6 @@ /turf/open/floor/iron/dark, /area/engine/storage) "wZf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/camera/directional/north, /obj/machinery/firealarm{ dir = 1; @@ -71284,24 +69738,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"wZg" = ( -/obj/machinery/door/poddoor/shutters{ - id = "Skynet_launch"; - name = "Mech Bay" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/robotics) "wZp" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/medical/storage) "wZA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -71342,6 +69785,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "xak" = ( @@ -71355,9 +69804,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "xay" = ( @@ -71374,6 +69820,12 @@ }, /turf/open/floor/plating, /area/security/prison) +"xbw" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/service) "xbO" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -71384,6 +69836,12 @@ "xbP" = ( /obj/effect/landmark/start/atmospheric_technician, /obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/engine/atmos) "xcf" = ( @@ -71392,13 +69850,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ name = "Theatre"; req_one_access_txt = "46" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "xcK" = ( @@ -71410,27 +69868,15 @@ /turf/open/floor/iron, /area/crew_quarters/cryopods) "xdc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) -"xdj" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "xdo" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -71438,6 +69884,8 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "xdw" = ( @@ -71446,9 +69894,9 @@ req_access_txt = "30" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -71479,10 +69927,6 @@ /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -71491,6 +69935,13 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"xeb" = ( +/obj/structure/chair/office, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "xef" = ( /obj/machinery/door/window/westleft{ dir = 1; @@ -71504,12 +69955,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/atmos) "xel" = ( @@ -71523,18 +69971,6 @@ /obj/item/shard, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xeR" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "xfp" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/table, @@ -71553,11 +69989,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/science/storage) "xfz" = ( @@ -71588,38 +70024,48 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security{ name = "Interrogation"; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) -"xfS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +"xfN" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, +/turf/open/floor/iron, +/area/hallway/primary/aft) +"xfO" = ( +/obj/machinery/atmospherics/components/tank/air, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"xfS" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/central) "xgs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "xgS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating/asteroid, @@ -71628,14 +70074,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "xhq" = ( @@ -71649,13 +70095,27 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "xhG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, -/area/medical/chemistry) +/area/science/research) "xim" = ( /obj/effect/landmark/carpspawn, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -71666,9 +70126,6 @@ /turf/open/space/basic, /area/space/nearstation) "xiw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -71690,13 +70147,13 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "xiK" = ( @@ -71743,7 +70200,6 @@ /turf/open/floor/iron, /area/medical/virology) "xkh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall29"; location = "hall28" @@ -71752,6 +70208,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "xkk" = ( @@ -71767,22 +70225,15 @@ /obj/machinery/newscaster{ pixel_y = -29 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron, /area/bridge) "xkH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "xkL" = ( @@ -71795,29 +70246,41 @@ }, /turf/open/floor/iron, /area/hydroponics) +"xkN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "xla" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) -"xlu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +"xlF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron, -/area/science/shuttle) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "xlG" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/white, /area/medical/chemistry) "xlM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/purple, /area/crew_quarters/theatre) "xmg" = ( @@ -71837,31 +70300,13 @@ /turf/open/floor/dock/drydock, /area/science/shuttle) "xmq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/fore) "xmt" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron, /area/security/prison) -"xmB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xmD" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -71878,7 +70323,7 @@ /obj/machinery/atmospherics/components/binary/pump/on{ name = "Oxygen Outlet" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -71888,21 +70333,21 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/holopad, /obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/security/brig/medbay) "xnd" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /obj/machinery/meter, @@ -71910,7 +70355,7 @@ pixel_x = -8; pixel_y = 28 }, -/obj/machinery/airalarm/mixingchamber{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -24 }, @@ -71918,15 +70363,21 @@ pixel_x = 8; pixel_y = 28 }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/catwalk_floor/flat_white, -/area/science/mixing/chamber) +/area/science/mixing) "xnh" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "xnj" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, @@ -71961,6 +70412,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xnX" = ( @@ -71975,6 +70428,14 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/cryopods) +"xod" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/security/brig) "xoh" = ( /obj/machinery/button/flasher{ id = "court"; @@ -72014,8 +70475,29 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/storage) +"xoJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "xpd" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -72023,12 +70505,6 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "xpf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/light{ dir = 4 }, @@ -72039,9 +70515,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -72057,14 +70530,14 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -72079,6 +70552,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "xpH" = ( @@ -72086,9 +70565,6 @@ name = "Gear Room"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, @@ -72103,12 +70579,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) -"xpU" = ( -/obj/machinery/advanced_airlock_controller/directional/west, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/ai_monitored/turret_protected/aisat/foyer) "xqd" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -72122,24 +70592,46 @@ }, /turf/open/space/basic, /area/solar/starboard/aft) +"xqe" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/chair, +/turf/open/floor/iron, +/area/hallway/primary/central) "xqf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) +"xqk" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/security/prison) "xqt" = ( /obj/machinery/gravity_generator/main/station, /turf/open/floor/circuit/green, @@ -72154,7 +70646,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "xrc" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -72169,6 +70661,12 @@ /obj/item/radio/intercom{ pixel_y = 24 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "xri" = ( @@ -72219,9 +70717,6 @@ /turf/open/floor/iron, /area/maintenance/department/science) "xsZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -72255,25 +70750,24 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "xti" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/virology) "xtn" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig/dock) "xtL" = ( @@ -72292,8 +70786,8 @@ /turf/closed/wall, /area/crew_quarters/heads/captain/private) "xtU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -72319,27 +70813,38 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) +"xuG" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/quartermaster/storage) "xuI" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/research) "xuQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/wood, /area/library) "xuT" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -72359,43 +70864,41 @@ dir = 1 }, /obj/machinery/disposal/bin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/trunk{ dir = 2 }, /turf/open/floor/iron, /area/security/brig) "xvl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/security/prison) "xvv" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Air to Mixing Tank" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "xvC" = ( /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "xvM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "xvO" = ( @@ -72423,10 +70926,16 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "xwH" = ( -/obj/machinery/atmospherics/pipe/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "xwN" = ( @@ -72436,17 +70945,11 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "xwO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood, /obj/machinery/light_switch{ pixel_x = 1; @@ -72454,6 +70957,19 @@ }, /turf/open/floor/wood, /area/security/detectives_office) +"xwU" = ( +/obj/machinery/door/airlock/external{ + name = "Supply Dock Airlock"; + req_access_txt = "31" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "xwV" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, @@ -72477,26 +70993,22 @@ /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"xxH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +"xxj" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"xxH" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -72510,26 +71022,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ name = "Bar Maintenance"; req_one_access_txt = "12;25;48" }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"xyk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"xyk" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -72545,6 +71051,18 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"xyz" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "xyE" = ( /obj/machinery/light{ dir = 4 @@ -72552,9 +71070,9 @@ /obj/machinery/requests_console{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "xyJ" = ( @@ -72562,7 +71080,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -72605,25 +71123,16 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "xzw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/main/monastery) -"xzx" = ( -/obj/effect/turf_decal/tile/red/diagonal_edge, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/dark, -/area/security/main) "xzA" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/engineering, @@ -72633,35 +71142,16 @@ /turf/open/floor/dock/drydock, /area/science/shuttle) "xzO" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/fore) -"xzZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, +"xAb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"xAt" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/medical/sleeper) "xAv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -72680,7 +71170,7 @@ dir = 1; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/iron/dark, @@ -72692,10 +71182,15 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xAK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall33"; location = "hall32" @@ -72713,10 +71208,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -72741,7 +71236,7 @@ /area/hallway/secondary/exit) "xBw" = ( /obj/structure/flora/ausbushes/palebush, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/firealarm/directional/west, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "xBH" = ( @@ -72778,23 +71273,20 @@ /turf/open/floor/iron, /area/hallway/primary/central) "xBT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) -"xBW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) "xCb" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/disposal/bin, @@ -72805,32 +71297,16 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"xCg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "xCj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "xCp" = ( @@ -72866,15 +71342,18 @@ /turf/open/floor/iron, /area/science/storage) "xCF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/science/shuttle) "xCV" = ( @@ -72893,7 +71372,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -72902,14 +71380,25 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"xDm" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "xDD" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "xDZ" = ( @@ -72917,19 +71406,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/science/nanite) "xEc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/chemistry{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "xEu" = ( @@ -72938,7 +71425,7 @@ /area/quartermaster/storage) "xEN" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/atmos) "xEO" = ( @@ -72955,34 +71442,41 @@ /turf/open/floor/iron/white, /area/medical/virology) "xES" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "xFs" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/plating, /area/engine/atmos) "xFx" = ( -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/black/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/security/main) +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/crew_quarters/heads/hor) "xFz" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/machinery/camera/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/research) "xFF" = ( @@ -72993,9 +71487,6 @@ /turf/open/floor/iron/dark, /area/bridge) "xFL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -73047,8 +71538,8 @@ /obj/structure/chair/fancy/bench/pew/right{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/chapel, /area/chapel/main/monastery) "xGy" = ( @@ -73074,9 +71565,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -73103,6 +71591,13 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) +"xHL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/aft) "xHM" = ( /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) @@ -73124,24 +71619,47 @@ /turf/open/floor/iron/dark, /area/engine/engine_smes) "xHU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "xHX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"xIs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"xIi" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/turf/open/floor/iron, +/area/medical/chemistry) +"xIn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) +"xIs" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -73151,6 +71669,12 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "xIx" = ( @@ -73166,10 +71690,6 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/hydroponics) -"xIL" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "xIN" = ( /obj/machinery/door/window/northleft{ name = "Containment Pen #4"; @@ -73184,10 +71704,15 @@ /turf/open/floor/iron, /area/science/xenobiology) "xIW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "xIZ" = ( @@ -73226,10 +71751,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/bridge) "xJu" = ( @@ -73247,14 +71772,11 @@ /turf/open/floor/iron, /area/quartermaster/storage) "xJE" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/chapel{ + dir = 8 }, -/turf/open/floor/iron, -/area/engine/atmos) +/area/chapel/main/monastery) "xJG" = ( /obj/machinery/light_switch{ pixel_x = 1; @@ -73264,6 +71786,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "xJH" = ( @@ -73307,22 +71835,9 @@ dir = 4; id = "QMLoad" }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/machinery/camera/directional/north, /turf/open/floor/plating, /area/quartermaster/storage) -"xJW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "xKe" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -73357,9 +71872,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -73371,7 +71883,7 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "xKS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 4 }, /turf/open/floor/engine/co2, @@ -73387,7 +71899,6 @@ /turf/open/floor/carpet/black, /area/crew_quarters/heads/hos) "xLk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -73406,16 +71917,21 @@ /obj/item/storage/secure/safe{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "xLF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "xLY" = ( @@ -73428,20 +71944,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"xMf" = ( -/obj/structure/chair/fancy/comfy{ - color = "#666666"; - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/hallway/primary/fore) "xMh" = ( /obj/structure/reagent_dispensers/water_cooler{ pixel_x = 3 @@ -73460,7 +71962,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "xMW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -73493,6 +71995,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/fore) "xNy" = ( @@ -73503,14 +72011,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_one_access_txt = "31;48" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/office) "xNB" = ( @@ -73536,8 +72044,6 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "xNU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -73553,10 +72059,6 @@ /turf/open/floor/plating, /area/maintenance/fore) "xNV" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/security/brig/dock) "xNY" = ( @@ -73573,7 +72075,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "xOa" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -73597,28 +72099,26 @@ /area/security/brig/dock) "xOm" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/primary/central) "xOn" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/department/science/central) -"xOu" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +"xOp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "xOz" = ( /obj/machinery/conveyor{ dir = 4; @@ -73638,14 +72138,20 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) "xOF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/item/radio/intercom{ pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "xOI" = ( @@ -73667,9 +72173,6 @@ /turf/open/space/basic, /area/space/nearstation) "xOV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/poster/random{ pixel_x = 32 }, @@ -73681,14 +72184,12 @@ /area/hallway/primary/aft) "xOZ" = ( /obj/structure/flora/ausbushes/grassybush, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "xPf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light{ dir = 1 }, @@ -73704,6 +72205,14 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engine_room) "xPu" = ( @@ -73758,21 +72267,20 @@ /area/ai_monitored/turret_protected/ai_upload) "xPT" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, -/area/quartermaster/storage) +/area/ai_monitored/storage/eva) "xQv" = ( /obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "xQB" = ( @@ -73821,15 +72329,8 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "xRl" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/engine/atmos) "xRq" = ( @@ -73865,21 +72366,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"xSb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/landmark/start/assistant, -/obj/structure/window/reinforced/spawner{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/carpet/green, -/area/crew_quarters/bar) +/turf/open/floor/iron, +/area/hallway/primary/starboard) "xSm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -73890,15 +72384,17 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "xSr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/nanite) "xSy" = ( @@ -73917,8 +72413,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -73933,34 +72432,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, /turf/open/floor/iron/dark, /area/science/server) -"xSH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/central) "xSL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/department/science) +/turf/open/floor/iron/dark, +/area/engine/atmos) "xSN" = ( /obj/machinery/door/airlock{ name = "Unisex Showers" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/crew_quarters/toilet) @@ -73974,8 +72463,11 @@ /turf/open/floor/iron, /area/engine/engineering) "xSV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "xTa" = ( @@ -73986,10 +72478,10 @@ /area/ai_monitored/turret_protected/ai) "xTb" = ( /obj/machinery/rnd/server, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ - dir = 1 - }, /obj/machinery/camera/directional/north, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, /turf/open/floor/circuit, /area/science/server) "xTf" = ( @@ -74009,9 +72501,6 @@ /obj/structure/chair/fancy/comfy{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron/dark, /area/chapel/office) @@ -74020,12 +72509,6 @@ dir = 8 }, /obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/bridge) "xUf" = ( @@ -74036,12 +72519,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage) "xUg" = ( @@ -74056,7 +72537,6 @@ pixel_x = 7; pixel_y = -6 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/fore) "xUv" = ( @@ -74098,7 +72578,7 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "xVh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, /turf/open/floor/plating, @@ -74118,6 +72598,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/plating, /area/maintenance/fore) "xVt" = ( @@ -74140,13 +72622,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/secondary/entry) -"xVD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) "xVF" = ( /obj/structure/chair{ dir = 4 @@ -74183,6 +72658,21 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/fore) +"xWv" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "xXa" = ( /turf/closed/wall, /area/library) @@ -74226,6 +72716,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/starboard/central) "xXH" = ( @@ -74277,12 +72769,6 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "xZa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -74295,7 +72781,6 @@ /obj/effect/turf_decal/plaque{ icon_state = "L5" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "xZV" = ( @@ -74339,7 +72824,6 @@ /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) "ybF" = ( -/obj/machinery/advanced_airlock_controller/directional/east, /obj/machinery/light/small{ dir = 1 }, @@ -74361,9 +72845,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "ybY" = ( @@ -74387,17 +72871,26 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "ycu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/engine/atmos) +/area/hallway/primary/fore) "ycE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -74419,10 +72912,25 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"ydi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "ydu" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "ydy" = ( @@ -74433,23 +72941,24 @@ /turf/open/floor/plating, /area/security/brig/medbay) "ydF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 +/obj/machinery/shower{ + pixel_y = 16 }, -/turf/closed/wall, -/area/engine/atmospherics_engine) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/noslip/standard, +/area/engine/atmos) "ydH" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron, /area/medical/cryo) "ydJ" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/engine_room) "ydK" = ( @@ -74460,6 +72969,12 @@ dir = 1 }, /obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/bar) "ydM" = ( @@ -74480,7 +72995,6 @@ /turf/open/floor/iron/white, /area/medical/storage) "yec" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -74504,16 +73018,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "yes" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "yev" = ( /obj/machinery/door/airlock{ @@ -74537,15 +73046,15 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "yeI" = ( @@ -74555,6 +73064,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library) "yeK" = ( @@ -74562,15 +73073,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "yfw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/chair/office{ dir = 8 }, @@ -74584,9 +73090,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /obj/effect/turf_decal/tile/yellow{ @@ -74602,6 +73105,8 @@ dir = 1 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "ygg" = ( @@ -74621,18 +73126,46 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) +"ygu" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "Secure Gate"; + name = "Brig Blast Door" + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "ygz" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -74648,19 +73181,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ygS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "yhd" = ( @@ -74703,7 +73230,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "yhw" = ( @@ -74712,11 +73238,12 @@ /turf/open/floor/iron/white, /area/medical/storage) "yhF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) "yhO" = ( @@ -74726,7 +73253,10 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -74737,16 +73267,19 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "yiq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/service) "yiB" = ( @@ -74767,6 +73300,12 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"yiV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "yiZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -74781,6 +73320,12 @@ }, /turf/open/floor/iron, /area/maintenance/fore) +"yjr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 5 + }, +/turf/open/floor/engine, +/area/engine/engine_room) "yjv" = ( /obj/machinery/processor/slime, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -74804,12 +73349,6 @@ }, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) -"ykb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "yki" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -74817,15 +73356,6 @@ }, /turf/open/floor/plating, /area/bridge) -"ykp" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "ykq" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -74838,6 +73368,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) "ykr" = ( @@ -74870,13 +73404,13 @@ /obj/machinery/vending/autodrobe/all_access, /turf/open/floor/carpet/royalblue, /area/crew_quarters/theatre) -"ylf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +"ykY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) +"ylf" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, @@ -74914,9 +73448,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "ylE" = ( /obj/effect/turf_decal/stripes/line, @@ -74927,11 +73463,21 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/engine/atmos) +"ylG" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/fore) "ylO" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/brig) "ymf" = ( @@ -86607,7 +85153,7 @@ ojH ojH ojH oTI -mgw +qBi xZV anT anT @@ -87120,8 +85666,8 @@ aDA aDA aLq aLq -qIS -pcZ +aDA +gBU aLq aMT aMT @@ -87377,8 +85923,8 @@ asK mOT anc kiH -aOR -onr +nCV +yjr aLq aLq aLq @@ -87633,7 +86179,7 @@ aus aWF aus aDt -grd +aWF dMj rNZ aLq @@ -87890,10 +86436,10 @@ aMB nzp aeS aiE -wWe -mFO -cSd -aTI +aOR +aZH +lfy +cPu aDT aDT aDT @@ -88147,9 +86693,9 @@ aLm aZX aZX aZX -wWe -tZS -rzF +aOR +aZH +aCE arh aku aku @@ -88406,7 +86952,7 @@ aIq aXa rGd jpa -vLG +aCE aoj aKd agG @@ -88906,7 +87452,7 @@ lFF cmm tEw aDA -aOR +otm amW rXf aPU @@ -88920,8 +87466,8 @@ auG aRJ egP aHp -aCE -aoj +cCm +oVh aNP aNP aNP @@ -89165,7 +87711,7 @@ mHb aEv agb tUv -fwU +aBS aZX aZX aqG @@ -89175,9 +87721,9 @@ aAe amZ aZX aZX -pjH +aBS aZH -aCE +qdR aGd aKQ aKQ @@ -89421,8 +87967,8 @@ pvJ wUD aLq vky -aiN -fwU +aVT +aBS aDn aDn aZX @@ -89432,9 +87978,9 @@ ugh aZX afP afP -pjH +aBS aZH -aCE +qdR aTI aDT aDT @@ -89677,9 +88223,9 @@ aMT anT aMT aLq -aOn -ewq -dxn +uFW +aVT +aBS aSc ail aZX @@ -89689,8 +88235,8 @@ aEq aZX aRI aZS -jmS -iqz +aBS +aZH auw aLq apl @@ -89917,8 +88463,8 @@ iUk anC sWJ aPf -aPf eCO +kug nZu aPf sab @@ -89934,7 +88480,7 @@ anT anT anT aDA -aOR +agY nqT eCj aQX @@ -89948,7 +88494,7 @@ aqb aio jgo tjr -aCE +qdR aLq aLq aLq @@ -90174,13 +88720,13 @@ qUk mFU moI aPf -aPf +lLu xRl ufc jQN -rEM -sok -kAN +jmS +pLm +aWt caF qBt aMT @@ -90191,7 +88737,7 @@ aMT anT aMT aDA -aOR +agY gQI eaL njl @@ -90209,7 +88755,7 @@ ajf pqp sfx qRE -awq +tDl pQv vgb iRz @@ -90430,10 +88976,10 @@ aMT wqA anT scs -aMT aPf -fEl -sjb +ydF +syv +aaQ aPf kFa jUw @@ -90448,14 +88994,14 @@ aMT anT aMT aDA -aRr +uqV lFm lQs aiN aOR aRr aOR -aBS +bSP aOR aRr jqq @@ -90464,16 +89010,16 @@ boE aHY aFb aLq -xIL +dzt +dzt atH -awq bdz vgb mwc aeZ mOK fRC -mlY +mOK wxY vgb anT @@ -90688,9 +89234,9 @@ nra acA jhh aPf -aPf -eIv -bGh +bHy +syv +aaQ aPf aPf aPf @@ -90933,15 +89479,15 @@ anT anT aPf rfG -qoU +uyQ lTh vFJ mTg -lPt +uyQ qJp kRJ mCA -lPt +uyQ kxB sWL hEw @@ -90960,7 +89506,7 @@ avt aYg gjh aVV -aGK +vxz icx qEz mEI @@ -90978,9 +89524,9 @@ htB oUI lDa aDA -dCZ -uDW dzt +uDW +dVx bCp rIq iQw @@ -91203,7 +89749,7 @@ hot hot uZP aKv -pOd +fda fsR aNF tPm @@ -91235,9 +89781,9 @@ oEh nFQ ekC aLq -bfQ +dzt vkh -awq +atH fNT vgb vgb @@ -91448,18 +89994,18 @@ aMT acA sFR lkI -dJn -aWt -aWt -aWt -aWt -aWt -xJE -aWt -aWt aWt aWt -dJn +mHK +jvD +jvD +jvD +yes +jvD +jvD +jvD +jvD +aEm yes vzG nrH @@ -91705,19 +90251,19 @@ aMT acA sFR qtP -gVx -skQ -skQ -skQ -skQ -skQ +rOg +rOg +rOg +rOg +rOg +rOg djA fdq fdq fdq kSa -iTT -ksW +aWt +ocB riG aNF glm @@ -91973,9 +90519,9 @@ tWl gDn bMw nSF -syv +aWt ocB -hKr +riG acA ijb fzS @@ -91987,13 +90533,13 @@ aLq aPm aCq kWs -org aWW +vfD aBc cWM tFT tFT -vwK +eTu aaa hsq aXT @@ -92008,7 +90554,7 @@ rLi amI sFX sKV -pPC +jZK xBR vgb ksE @@ -92097,8 +90643,8 @@ bSr bSr jDv oxd -mYD -vMw +kVV +uKa vMw duA oxd @@ -92230,7 +90776,7 @@ aPf aPf sFR nSF -syv +aWt heC jFe acA @@ -92244,12 +90790,12 @@ aLq aLq aLq gpP -rXl -aWW -aBc +lMI +odK +dzt cWM adh -aRz +kah vwK ayT aAE @@ -92261,7 +90807,7 @@ tkq amI rsZ gXg -eAY +mtx amI rUV doh @@ -92373,7 +90919,7 @@ aMT aMT jbr nXs -sss +fma nXs nXs nXs @@ -92487,11 +91033,11 @@ aMT aPf vUN nSF -syv +aWt mTf apr reo -rSH +nBe aPf wiT qYg @@ -92502,7 +91048,7 @@ srL aLw oxD rXl -aWW +dMF aHj cWM aZL @@ -92612,7 +91158,7 @@ hWu nCP oxd ibU -mYD +byS mYD mNK oBG @@ -92630,7 +91176,7 @@ aMT aMT jbr uLA -pYY +eMX kVq gzs nXs @@ -92744,10 +91290,10 @@ brJ hfs xel vvm -syv -iGU aWt -lUd +lcM +aJt +cAb wVz aPf rGw @@ -92758,13 +91304,13 @@ aMT aLq epz wlT -foS lMI +odK dzt cWM tFT sfK -ibW +aRz aaa iWj lnU @@ -92775,7 +91321,7 @@ vgq amI maj ufq -gCj +eAY amI fdh vRw @@ -92865,7 +91411,7 @@ oxd wAU xTN pLU -cAb +xTN oJV oxd wUo @@ -92888,7 +91434,7 @@ nXs jbr hbm pKE -aJt +eMX ejh bOo nXs @@ -93001,7 +91547,7 @@ anT acA fpQ maO -syv +aWt iGU aWt lUd @@ -93015,8 +91561,8 @@ qFo srL aNW pfS -aSC tgX +odK aLq cWM cWM @@ -93036,7 +91582,7 @@ xix amI lQL mhq -jAr +jZK wZe wOJ aMT @@ -93126,21 +91672,21 @@ sHo uKW kim caZ -lXD +mYD oxd jbr eQF lSX qNW fld -mIU -vSl +fld +fld nPw -qoC -gNf -qoC +fld +fld +fld tBY -qoC +fld vXL vIx nST @@ -93272,13 +91818,13 @@ aMT aLq aLq aLq -azd +aDA gLf aLq -grD +aRz wNZ -dNw -kbd +aRz +aRz dZs rvb bjI @@ -93383,18 +91929,18 @@ cnk wRN oxd cGN -uSM +mYD oxd jxj dSe mkw iTP -muy -ssC -bAG +rcw +rcw +rcw xOB rcw -rrx +rcw rcw mNd rcw @@ -93402,7 +91948,7 @@ wmn sLM eMX wsP -isR +eMX eMX qtV nXs @@ -93529,10 +92075,10 @@ qYg pwG aLq uOo -auo -xPm +dzt +iff aLq -ibW +aRz cWM qBj aEU @@ -93658,7 +92204,7 @@ nXs nXs jbr sht -vzs +oAw oAw vpN hMH @@ -93774,8 +92320,8 @@ jMB iBO bPk gnG -iXN -aLk +aWt +bDs rSH aPf rGw @@ -93786,10 +92332,10 @@ dfW xVw aCz uUf -dhR +kXj cXE aLq -ibW +aRz dZs dZs dZs @@ -93897,7 +92443,7 @@ ahW eGl ksG vqg -qqc +gHL gHL uOs oBx @@ -93915,7 +92461,7 @@ aMT aMT jbr jbr -mrm +uXX nXs jbr nXs @@ -94046,7 +92592,7 @@ bEZ kXj vja qaT -ibW +aRz dZs wkz cIu @@ -94060,7 +92606,7 @@ nmi nmi dvb dHr -otQ +bBc gdz mnb xUf @@ -94158,7 +92704,7 @@ rlM mAK jbr aYL -qPw +xXp jbr jbr nXs @@ -94172,7 +92718,7 @@ qBt aMT jbr vBM -ome +vBM qBZ jbr aMT @@ -94283,7 +92829,7 @@ iVW wWh krC wgE -bHy +xFs tvv smF ikv @@ -94300,10 +92846,10 @@ dfW xVw aCz bEZ -xdj -xPm +kXj +lLT aLq -ibW +aRz dZs aDE kyq @@ -94392,10 +92938,10 @@ vhc vhc vhc aMT -aMT -xrt -aMT -aMT +pep +vjC +pep +aXj aMT anT aMT @@ -94405,12 +92951,12 @@ aMT mkF jly kse -lzw +vDX vDX bfc vDX vDX -fWp +vDX fKG iJB jbr @@ -94557,10 +93103,10 @@ acA aPf aLq eMI -jAH +oxN kbD aLq -ibW +aRz dZs dZs jDF @@ -94651,8 +93197,8 @@ vhc aMT pep kih -pep -anT +tfA +opr anT anT anT @@ -94662,17 +93208,17 @@ anT mkF lbL jqo -lGg -gHY +kco +hNt tFk fqH kco -mPJ +hNt nwT fbF jbr caj -xgs +xXp jbr aQg qwM @@ -94798,11 +93344,11 @@ iZW bSH jlV jWp -xtU +xSL mJX tVy -mgE -tCE +lmn +vKn vKn wFt aNF @@ -94905,11 +93451,11 @@ iOB hfl jEZ vhc -aMT +pep pep vjC -tfA -aMT +pep +pep aMT anT aMT @@ -94925,7 +93471,7 @@ bjT nUp pxc mgp -dZL +nwT exe jbr miU @@ -95071,10 +93617,10 @@ rPB oUl aLq rIv -jAH -xPm +kbW +rrx aLq -ibW +aRz dZs dZs pbP @@ -95087,8 +93633,8 @@ fNA fmx jQk cof -kff -bBc +dWt +bai amI oDo hzv @@ -95162,11 +93708,11 @@ vhc vhc vhc pep -pep -pep +oxG +rPT juK -pep -pep +ozr +tfA aMT anT aMT @@ -95178,15 +93724,15 @@ eQl jqo kco hNt -aGV +oyx fqH kco hNt -dZL +nwT tub jbr tIW -xgs +xXp jbr eUP npg @@ -95322,18 +93868,18 @@ pRK aNF pHR oxI -bla -bla +mkz +fCJ bla sQC fPu -nMw +onr jAH xPm aLq -ibW +aRz dZs -cRh +rvb rvb rvb gpM @@ -95412,12 +93958,12 @@ iOB iOB baA sAH -neR +iOB tvz -uFb -uFb -uFb -uFb +ery +ery +ery +ery hFB qyo noq @@ -95435,15 +93981,15 @@ mkF rzK pxc mgp -bjT +bfS iKg pxc mgp -dZL +nwT mkF jbr wks -xgs +xXp jbr jbr jbr @@ -95577,18 +94123,18 @@ sPg jSt hUp sSm -kNC -aWt +hox +hUy xbP -hPI +oyz hPI bOL aLq nMw -nTV +dzt wPa oIZ -mAf +aRz dZs kmb oIe @@ -95605,7 +94151,7 @@ kff bBc amI luI -bxc +msv wpL qyL jeo @@ -95692,7 +94238,7 @@ mkF tmm kco hNt -aGV +oyx fqH kco hNt @@ -95835,14 +94381,14 @@ meS aaQ aNF kNC -aWt +nJJ aHI pTk rfS rfS aCz mOF -jAH +dzt uhX aLq aRz @@ -95926,8 +94472,8 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB @@ -96086,13 +94632,13 @@ aPf aPf cmD rXP -fFS +aWt aaz uxZ aaQ wGl aRi -aWt +nJJ jCO avp oxS @@ -96114,15 +94660,15 @@ swJ obH fbL dZs -gGc +tJs mfn joJ amI -jKi -oDr -oLv -oLv -rYz +luI +kNz +lAh +lAh +lAh oLv hIE fbt @@ -96131,7 +94677,7 @@ ixJ hxh jjx jjx -vCt +enz jjx jjx hxh @@ -96142,7 +94688,7 @@ pag hST ffq xNP -imE +lIe kwF iWQ aBk @@ -96183,8 +94729,8 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB @@ -96192,7 +94738,7 @@ iOB vhc iOB iOB -iQt +mqJ pFI vhc anT @@ -96205,9 +94751,9 @@ anT mkF dzP kco -hNt +xJE aGV -eGe +fqH kco hNt lWk @@ -96342,10 +94888,10 @@ qOk gYQ ktL ckO -cAH -ycu -aOz -hUy +gbC +aWt +aaz +mWA aaQ wGl kNC @@ -96356,7 +94902,7 @@ aPf aPf aLq ojH -uXc +xZV dvr ojH aPf @@ -96375,21 +94921,21 @@ tJs kff bBc amI -hKp +pFF rtF -oZt -vph +jQm +pYD lUa mFa -iFy +qHB +qop +qop +qop +qop qop -sdc -sdc -sdc -sdc -lAh nRF -lAh +nRF +hPD sdc lCK wpg @@ -96399,7 +94945,7 @@ pag ipA cMk xNP -imE +bXs roV sNp pag @@ -96440,8 +94986,8 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB @@ -96449,7 +94995,7 @@ iOB vhc iOB iOB -iQt +mqJ iOB vhc aMT @@ -96596,17 +95142,17 @@ hrK aPf oIN qOk -qOk +fEl mFU ouW aWt dUp aaz -tDl +mWA aaQ wGl kNC -aWt +vzm idm aPf aMT @@ -96633,21 +95179,21 @@ uUV vWF amI pFF -lXu +wXO ixJ ixJ gsq ixJ gug -hox -oLv -oLv -oLv -oLv -oLv -qrL -aeg -nEm +lAh +lAh +lAh +lAh +lAh +lAh +lAh +fEX +lAh lCK wpg mAR @@ -96656,7 +95202,7 @@ sLO fbY hUK xNP -imE +mAy jKO rGk pag @@ -96697,8 +95243,8 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB @@ -96706,7 +95252,7 @@ iOB vhc iOB iOB -iQt +mqJ iOB iER aMT @@ -96903,7 +95449,7 @@ vou rYJ dRF pUA -jLD +iFy lAh lCK wpg @@ -96954,16 +95500,16 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB iOB iHe iOB -hwy -nvP +tvz +tEc iOB vhc aMT @@ -96989,7 +95535,7 @@ lDT sZn fgs rYf -coF +rjl eay lwz cny @@ -97116,7 +95662,7 @@ keH pnS rmN pJo -tDl +mWA tfy aNF nRf @@ -97147,10 +95693,10 @@ dBS bBc amI kpi -lXu +wXO ixJ ixJ -hvp +gsq ixJ jjx jjx @@ -97160,7 +95706,7 @@ ixJ ixJ ixJ ixJ -xCF +kAN lAh lCK wpg @@ -97170,7 +95716,7 @@ pag iqX bMG xNP -imE +mAy kwF gQB aBk @@ -97211,15 +95757,15 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB iOB iHe iOB -iQt +mqJ iOB iOB vhc @@ -97240,13 +95786,13 @@ uFi efv veA dJM -msv +aHZ qNy lDT sZn aHm -liw -vuG +rjl +rjl fEP qMI fNi @@ -97366,15 +95912,15 @@ aMT btt aMT aMT -sLb +oCW fcp csS lxt dbq xrc mJL -lLu -abT +mWA +aaQ aNF aNF aNF @@ -97384,12 +95930,12 @@ eKn nlP mMt aIi -wey +gpF jSk aNF aNF jbm -quc +muy nNq sJF aAh @@ -97404,7 +95950,7 @@ hHS xfG amI pFF -lXu +wXO ixJ xmg aNV @@ -97427,7 +95973,7 @@ pag hnO sKl xNP -imE +mAy xIN pmj pag @@ -97446,8 +95992,8 @@ aMT aMT aMT kWB -piA -piA +jIV +jIV kWB aMT aMT @@ -97468,15 +96014,15 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB iOB vhc vhc -avl +com vhc vhc vhc @@ -97496,12 +96042,12 @@ sbZ nzi otI nKk -bSP +aHZ iBz -uSJ -fAh -oxN -fPn +qNy +lDT +sZn +dOh lbF nYO ujI @@ -97623,7 +96169,7 @@ oCW rpy oCW oCW -mBU +oCW fdV ofE qXq @@ -97638,16 +96184,16 @@ nkY fBK bwq qDh +flk +bxE woE -woE -ssB jwq -luS +jSk leD aNF heQ quc -nNq +dCZ yjH aAh mJa @@ -97660,7 +96206,7 @@ ces hYd djm amI -pFF +fFS lXu ixJ xzA @@ -97725,15 +96271,15 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB iOB vhc iOB -iQt +mqJ iOB pFI vhc @@ -97875,12 +96421,12 @@ aMT aMT aMT aMT -gyt -fsa +qBt +oCW api ndg kfp -ydF +oCW tid khJ aJZ @@ -97890,13 +96436,13 @@ bqm rhg eRe qjA -qjA +flm qjA uNE eAf uSz qNr -qNr +iOb iZO aJk xei @@ -97918,7 +96464,7 @@ hYd bBc amI bvo -lXu +gtW jjx aNV aNV @@ -97931,7 +96477,7 @@ aNV aNV aNV jjx -xCF +kAN lAh lCK wpg @@ -97982,15 +96528,15 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB iOB vhc iOB -iQt +mqJ iOB iOB vhc @@ -98006,7 +96552,7 @@ iHr dUK rPk dMv -rRd +oGx uFi hJm lGN @@ -98132,7 +96678,7 @@ aMT aMT aMT aMT -agE +gyt oYp dXn rrg @@ -98144,8 +96690,8 @@ oBJ wQk uXM nlB -jlF -jlF +gRj +eIv jlF jlF jlF @@ -98156,7 +96702,7 @@ iZm pEC nwE nBF -vzm +aWt gNn aNF pmQ @@ -98165,17 +96711,17 @@ fNF cGq adB nAu -qbP +rWk qbP dZd kpe cpb jzW rRf -eMU +bBc qpJ -aUP -lXu +pFF +wXO jjx aNV aNV @@ -98217,7 +96763,7 @@ aMT aMT aMT eTb -iot +qtM nIR uDU rde @@ -98239,19 +96785,19 @@ iOB iOB iOB iOB -qqh -iQt +iOB +mqJ iOB iOB iOB iOB vhc iOB -aTr -bTd -bTd -ido -nCX +djd +ery +ery +aPH +hmG vhc aMT aMT @@ -98259,10 +96805,10 @@ feF pNG cxY cxY -mng +cxY cxY hlF -vFP +rHC pTp uFi uFi @@ -98273,7 +96819,7 @@ qNy lDT sZn imO -vnz +rjl rjl eay lwz @@ -98401,8 +96947,8 @@ aNJ kKp jab wPn -bnG -bnG +auo +aje rwb bnG hDV @@ -98445,8 +96991,8 @@ aNV aNV aNV jjx -xCF -lAh +lVU +iMa lCK wpg uuA @@ -98454,7 +97000,7 @@ bpn hzF uMY rXn -wAx +uah qIZ hPN hPN @@ -98474,7 +97020,7 @@ aMT aMT aMT eTb -srG +cZw cZw lSt rde @@ -98496,7 +97042,7 @@ vhc vhc vhc vhc -mqn +iHe gRD vhc vhc @@ -98508,19 +97054,19 @@ iOB iOB iOB vhc -iQt +mqJ vhc aMT aMT feF loR -cxY -cxY +nIl +cUA mrH fzu dZD hdC -iff +rRd erm aMT anT @@ -98657,7 +97203,7 @@ mTz nOz rOg lDO -aaz +oeQ rgM oPq oJn @@ -98689,7 +97235,7 @@ sts jjR qrg sfN -lXu +wXO ixJ aNV aNV @@ -98702,7 +97248,7 @@ aNV aNV aNV ixJ -xCF +gug lAh lCK wpg @@ -98711,7 +97257,7 @@ oTa ehB iVZ boI -qHB +uah kRv uah uah @@ -98731,8 +97277,8 @@ aMT aMT aMT oaU -srG cZw +gvT xJI rde ePE @@ -98752,8 +97298,8 @@ iOB vhc iOB iOB -jPQ -bLy +tvz +ery lwx vhc iOB @@ -98765,7 +97311,7 @@ iOB iOB iOB vhc -iQt +mqJ vhc aMT aMT @@ -98776,7 +97322,7 @@ nYn iHr mdL rPk -vFP +rHC rRd erm aMT @@ -98913,7 +97459,7 @@ eTf tNm udz agL -lkI +uHo oBX jvn aPf @@ -98968,12 +97514,12 @@ bpn pXC uMY jPu -rRs +fZW tIL fZW -mgC +tIL ipQ -rEC +sZh iqT wpg hnE @@ -98989,7 +97535,7 @@ aMT aMT oaU mOo -cZw +dpt oUq qtM dQB @@ -99033,7 +97579,7 @@ rPk feF rPk rPk -vFP +rHC rRd erm anT @@ -99161,7 +97707,7 @@ aMT aMT aMT agE -mAy +xOI oCW hfp oCW @@ -99203,7 +97749,7 @@ amI amI amI fBh -lXu +wXO ixJ ixJ ixJ @@ -99216,7 +97762,7 @@ ixJ ixJ ixJ ixJ -xCF +gug lAh lCK wpg @@ -99246,7 +97792,7 @@ aMT bll cOY daX -cZw +ewh smR eYB pqe @@ -99278,7 +97824,7 @@ mUh vqK iOB dNQ -hwy +tvz ilw iOB iER @@ -99290,8 +97836,8 @@ aMT anT aMT rdA -vFP -rRd +vhu +nFF rdA aMT anT @@ -99418,17 +97964,17 @@ aMT aMT aMT agE -mAy +xOI oCW bCW oCW -uGU +oCW utq lWc acA uWX acA -gWV +qqh acA aPf aMT @@ -99442,7 +97988,7 @@ evX jxO cWH hXO -mvn +szx vSB aad hAq @@ -99461,13 +98007,13 @@ amI jJc imh eHi -rYU -rYU -rYU -rYU -cgM -cgM -cgM +qrL +qrL +qrL +qrL +jCz +mBx +dKI cgM rYU wNJ @@ -99487,7 +98033,7 @@ wpg wpg wpg sUs -sZh +iHs vrO wpg hnE @@ -99511,13 +98057,13 @@ vOY vhc iOB ono -lUW +iDR qBW -lUW +iDR aLx -lUW -lUW -lUW +iDR +iDR +iDR qBW oLF vhc @@ -99535,7 +98081,7 @@ iOL iOL iOL vhc -avl +com vhc vhc vhc @@ -99547,7 +98093,7 @@ aMT anT aMT erm -vFP +rHC rRd erm aMT @@ -99684,9 +98230,9 @@ tXf rbF gBZ poB -qBt -hqK -qBt +anT +anT +anT anT aMT anT @@ -99717,20 +98263,20 @@ wvV amI ant dTm -sOB -qBH -qBH -qBH -qBH -qBH -qBH -qBH -qBH -qBH -qBH +vyd +vyd +vyd +vyd +vyd +vyd qBH +vuG +vyd +vyd +vyd +vyd +vyd vyd -qfD pNL ydM ixJ @@ -99767,7 +98313,7 @@ mUW fRi vhc iOB -chC +aYX iOB vhc iOB @@ -99777,8 +98323,8 @@ iOB iOB vhc uri -lUW -lUW +iDR +iDR aHT tEc iOL @@ -99792,7 +98338,7 @@ bLK sbi iOL iOB -iQt +mqJ iOB pFI vhc @@ -99804,7 +98350,7 @@ anT anT anT erm -vFP +rHC rRd erm aMT @@ -99940,10 +98486,10 @@ aMT aMT vYr anT -gzj -anT -hqK +opr anT +opr +opr anT anT anT @@ -99958,7 +98504,7 @@ iNB cWH mlh xLm -szx +jqz jdt ksf iJM @@ -99986,7 +98532,7 @@ oEa oEa oEa qEj -xlu +nZl nZl sCm rMN @@ -100036,7 +98582,7 @@ auR auR auR eJL -aHc +chC wGq iOL lhu @@ -100049,7 +98595,7 @@ pTe bVw iOL iOB -iQt +mqJ iOB iOB vhc @@ -100061,7 +98607,7 @@ aMT anT aMT erm -vFP +rHC rRd erm aMT @@ -100197,18 +98743,18 @@ aMT aMT aMT anT -gzj +opr anT -krF -euR -euR -ptZ -bxE -bxE -bxE -hmn -gif -xJW +opr +opr +opr +opr +opr +opr +opr +jxO +lPF +wSB bvI jNl tTV @@ -100223,7 +98769,7 @@ cWH cWH nFz nfv -nFz +abT amI aMd hYi @@ -100293,30 +98839,30 @@ toz cWX auR eJL -aHc +chC wGq iOL pTe -tmC -gth -kdz -rFR -gth +pTe +rXb +htA +nVN +rXb rvp pTe iOL iOB -iQt +mqJ iOB iOB iHe iOB iOB iOB -iER -aMT -anT -aMT +vhc +rdA +rdA +rdA rdA aeC cra @@ -100454,7 +99000,7 @@ iaD iaD aMT anT -gzj +opr anT anT anT @@ -100475,11 +99021,11 @@ lOh nnt fng xte -csY +uRT csY xdc dGP -csY +lOh nNC wVT sXw @@ -100524,7 +99070,7 @@ lao tMV vun nge -cQx +pCB bKV gFt vun @@ -100535,9 +99081,9 @@ lao aWN iOB bGN -lUW -lUW -lUW +ney +ney +iDR nbG vAt fTf @@ -100557,13 +99103,13 @@ iOL iOL iOL moe -nVN +vxU iOL iOL iOL iOL iOB -iQt +mqJ iOB iOB vhc @@ -100571,10 +99117,10 @@ iOB iOB iOB vhc -aMT -anT -aMT -rdA +dgU +sPN +faa +oGn vFP rRd rdA @@ -100711,7 +99257,7 @@ aMT anT aMT anT -gzj +opr anT aMT aMT @@ -100727,21 +99273,21 @@ aoU xRh iUE hTp -fBc +bLy pxq -rMn -mYg haM haM haM +qcZ haM -pLm haM -jkV +haM +pxq +nUZ hpa tLu djk -rMn +haM haM haM vzD @@ -100750,7 +99296,7 @@ mDG hGa kOc kNN -seY +fCY kNN ihY dcn @@ -100776,7 +99322,7 @@ lJG mSW cEm rJG -uqV +mQD lao ocq orN @@ -100803,24 +99349,24 @@ saG vAt saG auR -aUn +nis xdS dJR ylf -xCg +ffH kZD iOL pTe -vKP -gth -lxO -puc -gth -eNH +bLK +rXb +htA +cfA +rXb +bLK aar iOL iOB -iQt +mqJ iOB iOB vhc @@ -100828,11 +99374,11 @@ iOB iOB iOB vhc -aMT -anT -aMT +bSY +aoQ +wcl rdA -vFP +dAO ruc rdA aMT @@ -100968,7 +99514,7 @@ kME emg aMT anT -gzj +anT anT anT anT @@ -100983,19 +99529,19 @@ wSB kRQ eaX gWG -hmL +hTp wWA -jvD -xvl +wVr +wVr hIJ -wWA +wVr tbj -wWA -wWA -wWA +wVr +wVr +wVr wKH mMu -hnl +hpa nql wmP eyz @@ -101015,7 +99561,7 @@ pJD vrp ihY oel -nBe +jhq dLQ hed ngv @@ -101024,7 +99570,7 @@ ngv ngv ngv ngv -tZF +mgr nLJ iqa pUR @@ -101038,7 +99584,7 @@ lao epa orN qMf -adY +pCB skV fNm vun @@ -101063,7 +99609,7 @@ auR auR auR auR -kDC +rAZ ffH jKk iOL @@ -101077,7 +99623,7 @@ pTe rUt iOL vhc -avl +com vhc vhc rdA @@ -101086,8 +99632,8 @@ rdA rdA rdA rdA -erm -erm +eLS +rdA rdA vRY gZU @@ -101225,24 +99771,24 @@ dcJ emg aMT anT -iut -gBZ -gBZ -gBZ -gBZ -ptZ -nFF -nFF -nFF -lIe +opr +anT +opr +opr +opr +opr +opr +opr +opr +jxO lPF -jCz -xvl +wSB +wVr lYG mlX kVl +jKi inJ -hVn inJ mma bpB @@ -101256,23 +99802,23 @@ mma xWf mma lfN -wWA -aTY -fjj -tnA +wVr +mWw +haM +haM gTH bMx gbO -mLZ +xPT jFt -dhp +mLZ aKT iJq wDn oOl ihY fEM -lcM +jhq wdT iGT ngv @@ -101281,16 +99827,16 @@ xjQ hdp gfo ank -tZF -gAn +rTH +dhR onb cEm -uUk +grd jzB jVV cEm -uyQ -nWw +rSB +mWM lao lsf uaL @@ -101301,7 +99847,7 @@ wbq vun mhf mjY -bEw +xBT lao iOB iOB @@ -101314,21 +99860,21 @@ dMx bDY oTD hlt -hlt +evw hlt tlG fzO dfA hpb -ojz -ffH +coK +xHU llY iOL rig uAc rXb htA -cfA +mqF rXb pTe pTe @@ -101336,16 +99882,16 @@ iOL oiM dnZ lwe +xgY pfO +gER pfO -pfO -jXm iKH pfO wKh -pfO -pfO -xgY +sGv +xfN +xfN bRV fHv qEt @@ -101498,13 +100044,13 @@ hlu sJH mqL kVl -bDH +bfQ iOR agr mma pWl -dMF -qtS +vdJ +ykK mma vlr vlr @@ -101521,7 +100067,7 @@ mXH ihY ihY kNN -dhK +qtR aQC ihY ihY @@ -101547,7 +100093,7 @@ gDH rJB cEm iBp -xSL +mQD lao vun vun @@ -101577,7 +100123,7 @@ lhA iEu iEu iEu -hIQ +iEu hnq buq iOL @@ -101585,25 +100131,25 @@ iOL iOL iOL htA -cfA +spm iOL iOL vhc vhc iHe vhc -psT +mjG xvM -nHd +gwq tRS gwq meD -nHd -nHd -nHd -nHd +gwq +gwq +pGL +gwq hpQ -nHd +gwq hkP oiM erm @@ -101755,13 +100301,13 @@ dLB obn udH kVl -qno +fSN pAD mEq xNU hJo mma -rWk +qeh mma vlr vlr @@ -101773,7 +100319,7 @@ jDQ mma mma hgq -ama +mWw xLF wId ayd @@ -101795,7 +100341,7 @@ hEH hki mvW cXg -tZF +veZ gEE jpk cEm @@ -102012,13 +100558,13 @@ kVl kVl kVl kVl -qno -aEm +hKr +muh agr mma mma mma -hCn +geF hLC ykK vlr @@ -102029,8 +100575,8 @@ mma ioQ mma mma -qdm -aYi +wVr +wVr gET oSJ ihY @@ -102044,7 +100590,7 @@ gHw wDG kvR dRa -aRk +hqK yak mLt kXG @@ -102052,13 +100598,13 @@ gVn xSr wSk ank -tZF +veZ gAn jpk xuI -oui -gJZ -xVw +anT +anT +anT xry mBW wIU @@ -102081,29 +100627,29 @@ iOB iOB hvJ vAt -lLT +hlt quw -wdm +hlt xSN -spm +hlt eMF auR dNq gXl eDG -hIQ +rAZ fTU bXS iOL ifc -fCJ +mon pRb hBV qnl uau -oNk -oQg -pAw +nVN +srF +iOB iOB vhc mmp @@ -102259,23 +100805,23 @@ anT aMT aMT anT -cvP -cvP +anT +anT cvP cvP cvP pOx gtN cvP -bDH -agr -wVr -aEm +cQx +vQo +hKp +muh nWS mma xqT mma -rVU +vlr mma qeh vlr @@ -102295,9 +100841,9 @@ jEi ihk cHD aqt -jEi +grD vnr -jEi +grD jTN mev aRk @@ -102310,7 +100856,7 @@ sPx lwE hOm hgp -hzu +itY jpk pga bFD @@ -102331,7 +100877,7 @@ wqq ezJ jeM lao -wLr +iQt vhc vhc vhc @@ -102348,7 +100894,7 @@ auR lWW uIh auR -kDC +rAZ fTU bXS iOL @@ -102360,7 +100906,7 @@ sDk mon nVN vhc -gAV +iOB wLi vhc oaT @@ -102517,22 +101063,22 @@ cdk bsC anT gol -wxw +gol gol djE tlY cwa rEm cvP -qno +wLq rMn haM -aEm +muh nBl mma oUT vlr -oxJ +vlr mma qeh vlr @@ -102544,7 +101090,7 @@ dgA xdI mma mma -eyc +dgf dgf hPf mHr @@ -102605,14 +101151,14 @@ auR nis hYp auR -kDC +rAZ fTU bXS iOL vxL bgN bgN -oQi +bgN mEJ vvL uaU @@ -102775,21 +101321,21 @@ aTA cdk wdy hvo -vHd +wdy agQ dSp fNQ piq iwo lRR -fda +uhq cmv tDQ bDH mma myf mma -oxJ +vlr mma egu mma @@ -102801,7 +101347,7 @@ ajI sKa asu mma -gFZ +wVr wmk dFj mHr @@ -102823,18 +101369,18 @@ lWn lWn lWn lWn -tNr -gAn +jJM +kDC jpk pga brb -hzw eMp +hzw tIb exD mLL pwq -pwq +vnz pGv cah jqx @@ -102845,7 +101391,7 @@ kHY bGn hOe iOB -wLr +iQt vhc iOB iOB @@ -102863,7 +101409,7 @@ auR auR auR wWw -fTU +kpV rQO iOL iOL @@ -102871,17 +101417,17 @@ iOL gaO jfd wnN -iDW +gaO iOL vhc vhc vhc vhc mjG -tLB +fHv rpt cQS -peC +kcK esk glo rDE @@ -103039,14 +101585,14 @@ ilY hvt cvP aKN -lBD +haM agr mma mma mma mma mma -saC +fOZ mma cYB vlr @@ -103103,10 +101649,10 @@ jIk hOe hwy tVi -aPH -ery -ery -hmG +ido +bTd +bTd +nCX iOB vhc bZH @@ -103124,18 +101670,18 @@ qhQ iss bMa spz -uBb +oDu +kij kij -gwp gPn -mnh +kij mCm oDu eft rMl deg bgQ -qei +sjb rdA kuZ pql @@ -103147,7 +101693,7 @@ bOf olY hws qpM -bSW +mgd uie bOf bBo @@ -103295,15 +101841,15 @@ cvP cvP cvP cvP -qno -lBD +hKr +haM agr mma sRB gll rxq ybt -oxJ +vlr mma maf nde @@ -103316,14 +101862,14 @@ wuR nHQ mma xpm -hjK +haM mDG mHr rpi lGb bbq -sJI -sJI +bbq +bbq iUv mHr kIy @@ -103333,8 +101879,8 @@ nZd axN gGS kcb -sqP -vVe +kqf +hZJ mmF lWn tNr @@ -103363,17 +101909,17 @@ tYN vhc iOB iOB -djd -ery +aTr +bTd oYK -iMa hmr -iMa -iMa +hmr +hmr +hmr yeK -iMa -iMa -oyx +hmr +hmr +hmr drj aUl lVF @@ -103386,7 +101932,7 @@ iOh yhr xJH iOh -yhr +pVT xJH iOh iOh @@ -103401,11 +101947,11 @@ glo svL pXx bOf -cdw -gVw +bdw +skQ sZv puk -raQ +rnt bOf xri qvT @@ -103552,15 +102098,15 @@ jNe sCe mkJ sAp -qno -lBD +hKr +haM miP mma xUn gOI -dWt -dWt -oQR +vlr +vlr +oUT mma jzt vlr @@ -103591,7 +102137,7 @@ faR vlH hhO kqf -hZJ +oxJ gwz lWn xrf @@ -103606,7 +102152,7 @@ hZO bOW qqf vBK -eFA +luS vKb iCv eey @@ -103624,16 +102170,16 @@ iOB iOB vhc kev -cEb +lhr clI kev oGH kev kev -kjy +fAv kev vhc -kDC +rAZ spq rXb rXb @@ -103662,13 +102208,13 @@ vGZ siV bOf pEe -raQ +rnt eDQ iZh -uIQ -vHK +wIF +rmn ngK -fZt +eJW hLF aMT aMT @@ -103802,10 +102348,10 @@ aMT aMT hBl aAO -kVV +fcW uFR kcN -vKl +tnA stJ lQA svM @@ -103816,7 +102362,7 @@ mma vlr vlr vlr -rKj +vlr uai mma ioQ @@ -103830,8 +102376,8 @@ rah bco bxI vum -haM -dtg +tnA +ycu cyg rQz aot @@ -103848,16 +102394,16 @@ ejA lWn bdQ kUL -hZJ +hMA stD nBB -tNr +oDn dgd dQJ xdw cBU tfu -axI +xFx axI ryk bOW @@ -103908,7 +102454,7 @@ lLn nzh plW uco -bsr +gMV kmA qcX glo @@ -103916,14 +102462,14 @@ rUN glo bOf eKL -gVw +skQ sZv puk -raQ +rnt eDQ -iZh -iyv -gMV +lyP +sNC +rmn nOP nOP nOP @@ -104063,7 +102609,7 @@ rQM jxO tFG eDP -xMf +eDP byb sAp qno @@ -104087,13 +102633,13 @@ eKM eKM jQE wKb -haM +rEM dtg jUi aMh jtd nAo -eGa +wlf eGa uMR mHr @@ -104113,7 +102659,7 @@ hzu vuH szJ fxT -qsJ +xHM xov itu qXg @@ -104122,7 +102668,7 @@ cah dUu kUD oaw -sQv +anz qkk cEu cEu @@ -104132,7 +102678,7 @@ cEu cEu iQt auR -nSi +ccm tuk lqt gzO @@ -104147,7 +102693,7 @@ seZ nzM auR woG -ojz +coK spq rXb cUo @@ -104172,15 +102718,15 @@ rdA aMT aMT lBx -cdw +bdw cbL fnf emF -bei -vPR -tDI -mup -nJJ +rnt +eDQ +bLp +wIF +rmn ngK eJW hLF @@ -104344,8 +102890,8 @@ pNo aAM bxI cdI -haM -dtg +aSC +rFR uDy kGm tIj @@ -104361,7 +102907,7 @@ fBV vMW kcb uIT -cvq +kqf vCo vjE nBB @@ -104378,7 +102924,7 @@ kMZ cah nAV eFA -bpq +oaw anz qQo sLm @@ -104390,17 +102936,17 @@ cEu iQt srF nns -iKh -dKI -wSY +slJ +gui +slJ fUe auR acI -wbZ -nqn +aGb +sod auR -cbN -qnt +acI +aGb sod auR tpX @@ -104423,21 +102969,21 @@ oFw iOL opx trp -rLT +aPr mxa bOf bOf bOf bOf -guQ -hAT +bdw +drZ fnf gKS htt bOf qyv wIF -kbJ +rmn bBo bBo bBo @@ -104600,7 +103146,7 @@ hsx qCp xJe sxe -ijk +wMg haM hHE mHr @@ -104623,8 +103169,8 @@ eYL rJj lWn uyE -gAn -vuH +xhG +hAD sRw sAw xHM @@ -104635,12 +103181,12 @@ wFW cah fYh eFA -bpq -anz +oaw +pLW opS sLm wPN -bRv +yly vAA vAA cEu @@ -104653,16 +103199,16 @@ slJ wdV auR lgM -aGb +sMD efT auR -etM -ykb +xWv +xlF sZW auR gBI -vuX -syA +coK +ksW rXb cUo cUo @@ -104676,17 +103222,17 @@ cUo cUo rXb hYB -ttb +rEC dMR iOL trp rLT -mxa +mjA bOf xtc tSI wSC -aWu +emF ggv fnf mgd @@ -104694,7 +103240,7 @@ ykM cfL pXZ wIF -kbJ +rmn bBo aMT aQG @@ -104857,9 +103403,9 @@ vGd but ycn sxe -ijk +wMg haM -dtg +lKZ mHr goI goI @@ -104905,7 +103451,7 @@ iQt auR hlf leM -iDR +vDk leM dhH auR @@ -104919,7 +103465,7 @@ nAi auR wzx coK -syA +ksW rXb cUo cUo @@ -104936,14 +103482,14 @@ ozK msJ wEC iOL -byS -gZa +trp +rLT oNG bOf bQO bzq -mcN -cOz +pIk +pIk gVw sZv puk @@ -105115,7 +103661,7 @@ cvz sgi bxI oAp -gER +haM hVj pga kXm @@ -105149,20 +103695,20 @@ tZF hdz xQG lIO -bpq +oaw aDm lLF sLm pcl lfc -vIW +lfc tBM tjc pqO auR afz nFy -qlT +acq nFy afz auR @@ -105175,8 +103721,8 @@ auR auR auR usU -coK -syA +hjC +ksW rXb cUo cUo @@ -105190,25 +103736,25 @@ cUo cUo rXb mak -ttb +fwU lGm iOL uGY rLT -mxa +mjA sZv bdw bzq -eTu -cOz -siV +pIk +pIk +pXw bOf pEe qHw sZv -pJd -wIF -kbJ +hgF +jAB +rmn bBo aMT aQG @@ -105368,11 +103914,11 @@ bxI bxI hXn sQl -jVq +pNo sDu lxA wMg -xBW +haM tXK jEq ybV @@ -105383,29 +103929,29 @@ jHI dQx fAL lpb -lpb +fAL cft mif eAm gwC aEa +uHy nhd -vPM ygS nAl rCs rFL uAa -vPM +nhd tyX vPM -vPM -vPM -vPM +nhd +nhd +nhd ygS pYz gMW -gMW +kSl sTs nKX tbG @@ -105418,22 +103964,22 @@ cEu iQt auR tap -kmq -iBg -rGX -rGX +pun +gRn +hgl +iTT fGq wAl -rGX -rxV +oKm +kYg abu -oyz -rGX +gRn +iTT mEV fvD uhy -coK -syA +bjq +sNb rXb cUo cUo @@ -105465,7 +104011,7 @@ szC bOf jAO wIF -kbJ +rmn bBo bBo bBo @@ -105607,7 +104153,7 @@ fCz fCz fCz oGY -xnh +qBt aRL aMT azB @@ -105628,7 +104174,7 @@ mog pSE hGp bxI -ijk +wMg dmI rMx pga @@ -105675,21 +104221,21 @@ cEu iQt auR bnc +uaS kmq -kmq -kmq +bfG kmq jJw wWS -wWS -cOl +oCd +coa lvi -qGm +wWS wWS pjT vIf -gKa -coK +gBI +plK syA rXb cUo @@ -105704,7 +104250,7 @@ cUo cUo rXb aMn -ttb +iaV rrJ iOL trp @@ -105721,10 +104267,10 @@ mqE yhF cUT wYC -diA -hxV +wIF +rmn ngK -fZt +eJW hLF qoV aMT @@ -105864,7 +104410,7 @@ anT anT aRL dmg -abg +aTY aRL aMT azB @@ -105885,7 +104431,7 @@ bxI bxI bxI bxI -eyc +dgf dgf gee pga @@ -105939,9 +104485,9 @@ hhV qCV eqM pjT -nbx +fLB tTH -bUf +kmq kmq vhE nrl @@ -105961,15 +104507,15 @@ cUo cUo rXb aMn -ttb +gGc rrJ iOL jan -vxU +rLT mjA sZv fHu -nbt +ygz eYQ hJj dig @@ -105977,9 +104523,9 @@ ygz ppf rnt eDQ -iZh -ikC -kbJ +iDW +sNC +rmn nOP nOP nOP @@ -106120,8 +104666,8 @@ anT anT anT aRL -tzl -rdU +ulE +uKS aRL aMT azB @@ -106129,7 +104675,7 @@ uQg kjJ hal aUs -vzP +aDR azB aMT scI @@ -106196,9 +104742,9 @@ auR jJK auR cyT -nbx +avW +kmq kmq -bUf pGj auR auR @@ -106222,7 +104768,7 @@ ttb rqI iOL wZf -rLT +rxV oUu bOf bOf @@ -106235,7 +104781,7 @@ nTC rnt eDQ iZh -gEl +wIF rmn ngK eJW @@ -106377,15 +104923,15 @@ alZ alZ aRL aRL -pPi -rGI +dmg +aTY aRL eAd azB agS jaw caC -vFk +tbm ari azB csy @@ -106406,9 +104952,9 @@ bnT qhx pQo hmZ -sJW +aQv wFC -eQs +nxy igE jXQ vux @@ -106453,7 +104999,7 @@ fKx nTq hzU fuh -ukx +pNc eqp dPk fuh @@ -106475,7 +105021,7 @@ sWE mXv mXv sjD -ttb +fTU cIT iOL qds @@ -106611,8 +105157,8 @@ tNo gnQ stu nPn -xpU -aql +lju +nPn mqs qBt qBt @@ -106658,7 +105204,7 @@ vlr mma mux muh -qBE +smA luj aQv aLj @@ -106672,7 +105218,7 @@ vux aPI vux uYz -mNo +ska leY lcG opq @@ -106718,9 +105264,9 @@ aMT rXb fnu ewo -sYe -cky -hcf +vmz +tod +tod tod fKl wNI @@ -106729,7 +105275,7 @@ tod tod tod vmz -gNr +tod iej czg sle @@ -106737,12 +105283,12 @@ rrJ iOL vxy rLT -oUu +eBB bOf ejZ -mtx +pIk jlk -cJH +hAT jqT bOf nTC @@ -106890,7 +105436,7 @@ alZ iBi aPv adI -aOM +dhV gva xku aRL @@ -106914,8 +105460,8 @@ fOZ mma mma fKO -muh -qBE +jpv +hYe geX rCD eOw @@ -106992,13 +105538,13 @@ iOL iOL iOL iOL -byS -gZa +trp +rLT uVi bOf iPc pIk -pIk +pjn hAT jbw bOf @@ -107164,15 +105710,15 @@ scI mKY vlr jxh -vdJ -vdJ +kFd +kFd xVs -vdJ -vdJ +kFd +kFd fbo dGD qZG -qBE +ylG pkM kAm jBa @@ -107205,7 +105751,7 @@ eJK lmK fHC koy -hjC +lxi nsZ rqF rSO @@ -107251,7 +105797,7 @@ rIC rdA trp rLT -oUu +eBB bOf irq xBu @@ -107405,7 +105951,7 @@ cKH akL kIZ tIm -cgp +vSd rTw aRL aMT @@ -107429,7 +105975,7 @@ scI ejN jsC qpW -qBE +smA pkM oNO vTL @@ -107463,7 +106009,7 @@ lzJ fHC xYm mtI -hUT +mtI dvF eve hYL @@ -107508,7 +106054,7 @@ qwa rdA trp rLT -oUu +eBB xXa xXa jXL @@ -107661,7 +106207,7 @@ alZ iqV adI qFQ -tIm +ekL lVc aaX aRL @@ -107689,7 +106235,7 @@ hFv oTU pkM ubn -fDo +fRu ujE trM rcd @@ -107740,7 +106286,7 @@ kMj xUK qay dQH -jZQ +sKz cyY dpW fuh @@ -107765,7 +106311,7 @@ lkS rdA vWY rLT -oUu +eBB xXa iQQ whv @@ -107919,7 +106465,7 @@ tGj qFQ skY aPd -lVc +vSd uUh aRL atA @@ -107938,9 +106484,9 @@ qBa dbu bLQ wln -fId +mea jHq -iQP +dWq xZS eAx prQ @@ -107961,22 +106507,22 @@ rZt hzU hzU pPq -qcZ -qcZ -qcZ -qcZ +sPb +dmf +dmf +dmf ffL bjF -qcZ +dmf myn uIc rFZ qgZ -qcZ +dmf uDa ccR ffL -qcZ +dmf qyB wjJ njD @@ -107995,9 +106541,9 @@ mVc fuh ebS vhj -miG +fdi jEJ -sQG +quq qjt gUb fuh @@ -108021,12 +106567,12 @@ tDJ tDJ rdA uGY -vxU -tbt +rLT +eBB jXL eed pJt -ecP +ewj nLm qYF cuQ @@ -108189,8 +106735,8 @@ sCp kwI qUu sCp -dyZ sCp +gnz ulG cTJ hnU @@ -108203,9 +106749,9 @@ vet aXu pkM htN -fRu +sic hxM -trM +lGg tDV vpg pkM @@ -108218,26 +106764,26 @@ eJK rad mTv gxt -eMt -eMt +sAR +kJc eMt eMt xBS eMt eMt eMt -eMt -eMt +eex +njU eMt eMt eMt eMt xBS eMt -oKN +eex eMt dFu -sfj +wEb oFn hzU lzJ @@ -108246,15 +106792,15 @@ fKx fKx hzU tQE -gvN +fyL lbR xsn fuh hiP giA -pDg +lcU frc -jZQ +sKz qoB hSS fuh @@ -108282,7 +106828,7 @@ nAM mxw jzY seL -fdJ +mQn mQn ewj jfr @@ -108433,7 +106979,7 @@ qzc msF afo uHP -lVc +vSd ssm aRL atA @@ -108445,19 +106991,19 @@ tSv bvg tuK xCW -oGx +ueT oYC -oGx +iFL hai dYV mwV hVG mea -qux +jHq owR iRX wEY -hYe +xyz pkM pJu iQx @@ -108474,8 +107020,8 @@ fKx fKx hzU wYm -qYL -gWk +cpp +tJw pWm eRo mKo @@ -108491,10 +107037,10 @@ rhQ rhQ jLA mKo -lVU +pWm rhQ vzp -cpp +cSG gxn hzU hzU @@ -108509,9 +107055,9 @@ fuh djf bPC ffA -pDg +miG +dYj sKz -jZQ jqi fuh fuh @@ -108689,8 +107235,8 @@ alZ sac auP msF -bai -lVc +tIm +vSd nsK aRL aRL @@ -108714,7 +107260,7 @@ kgE cVL vjN dlu -qBE +smA sZy wYa jGG @@ -108750,25 +107296,25 @@ vJi vJi vJi vJi -eQM -lpT +mAP +ucV gTN -rFZ +uhz nGB pNg dSj raZ qPO sdi -lsm +pHL iXj pZZ vIk rLh cDr mUl -cMJ -vEz +xbw +xbw yiq qKs uel @@ -108782,18 +107328,18 @@ sks iZX kVX eYK -dKL +oaH kXw cyv mwy wKN -oVF -oVF -oVF +mwy +mwy +mwy oVF oDE -mkz -eBB +xHL +dOt nXK xLk sDy @@ -108946,8 +107492,8 @@ alZ cBC aAI kIZ -bai -eAp +tIm +vSd uKr aRL hjN @@ -108971,7 +107517,7 @@ shJ cNq waO fYd -wSz +smA fXv iyo kpk @@ -109013,17 +107559,17 @@ qfc hgL bOb quq -kiz quq -plK +quq +aJI quq uvH -jqz +uqS sKz sKz iFt -oId -mHK +sKz +sKz kHq sKz vUx @@ -109036,25 +107582,25 @@ pNH quu phW nHF -uIH +phW aTe mCV bsr mus -agY -oQO +nhe +mus pti +nEj +nEj +nEj fAZ -vAx -fAZ -fAZ -fAZ +nEj rza hJx jXL gWB +pda jeA -byW ewj tYd xXa @@ -109208,7 +107754,7 @@ opU iCC bju ddv -aiC +adV adV moH oxP @@ -109227,8 +107773,8 @@ gNN nEf qRQ qLa -gER -hYe +haM +smA sZy iYh dRT @@ -109244,7 +107790,7 @@ bDf aLW nUe sYS -onp +lib lib jKQ uaJ @@ -109270,17 +107816,17 @@ ugL sgV gXD nbF -spG upb -mlM +upb +upb upb mPb bXu dSh ggr bVh -lJn -lJn +dSh +dSh kTz dSh vZJ @@ -109291,9 +107837,9 @@ dqF htW uOg jay -pZm +tSP mca -fMQ +tSP ahk ral wBw @@ -109310,7 +107856,7 @@ jNq xiw xXa tfH -ewj +mMl xCj ewj qAf @@ -109461,7 +108007,7 @@ jjB aFu auP mSL -qoK +ekM ocw aRL fqp @@ -109484,8 +108030,8 @@ uGg nEf bJL qLa -haM -qBE +tnA +hYe sZy tca cJb @@ -109503,7 +108049,7 @@ tTK gcn ijB cRu -pEl +fgm uaJ ryp ryp @@ -109529,7 +108075,7 @@ qYI boA iAr doA -sDS +aEc umy boA vVR @@ -109550,7 +108096,7 @@ fhO xXn oRy tSP -flm +tSP rVM fhO fhO @@ -109567,7 +108113,7 @@ xXa xXa xXa pAa -ewj +sag bHM ewj ffz @@ -109717,7 +108263,7 @@ alZ alZ oXn gIz -hRJ +aOM hpT syg aRL @@ -109734,7 +108280,7 @@ mJo uGg uGg eNC -vtM +iYQ sys lln ePr @@ -109745,7 +108291,7 @@ hZU uuX sZy sZy -wZg +imR imR sZy sZy @@ -109757,10 +108303,10 @@ wPS ufV nUe hoV -wzk -hQw +wbE hQw -jKQ +sCs +oBH uaJ fSA lrx @@ -109780,13 +108326,13 @@ dnO eeR sHT xVx -kFS +xqe gdX xVF boA rnn qGi -pVT +qGi gRw wWQ dqO @@ -109805,9 +108351,9 @@ clk mEv fhO cjX -kSl +xzr dSG -flm +tSP oBk kTL lix @@ -109824,7 +108370,7 @@ nZB tNl fPs rLU -ewj +etM xuQ pJt ins @@ -109997,15 +108543,15 @@ qsE rCa ejp qRQ -mae +ryd vkc -qfM -mfy -fMI +sbh +kup +dyz bHS heU kGo -dky +udN xOF xkh bLx @@ -110043,7 +108589,7 @@ anV boA gSk cir -wwL +sbI dlf lYk kKu @@ -110062,9 +108608,9 @@ tmF vYB fhO teW -kSl +xzr tSP -flm +uLF cBa sGE sMv @@ -110078,11 +108624,11 @@ xXa xXa mPT lmv -lmv +sKx bAp inp +sag ewj -xuQ fVC vNz xXa @@ -110235,7 +108781,7 @@ iXo sjq lXw iHM -nkt +mgW qOU xtT kkg @@ -110248,7 +108794,7 @@ xUk uGg khz miV -xVD +vtM xvC bgr uGg @@ -110260,12 +108806,12 @@ onZ wza hpa fBc -wjX haM +qcZ haM vyO fmE -aYX +sBR nUZ oot vqh @@ -110295,17 +108841,17 @@ ehY xVh vJi enx -eIz +nQi ouI boA rWe -ney +bxO vMD ahi nOG pdx -reO -djh +aSo +vqt gFp cyL uYN @@ -110316,30 +108862,30 @@ uxz aYT xrD eQR -kwv +afO izd svy -anR +xzr oUF ftk -ska -sKx +ydK +sGE fQa jWy fhO nwJ akW -wSv +nwJ fhO qCK xXa xXa vhI -lmv +eQM wSU oHN +sag ewj -ecs jfr uQC xXa @@ -110488,11 +109034,11 @@ anT anT gGa olg -uKS +twG xFF lXw meA -mgW +pYR sCx lXw lXw @@ -110512,26 +109058,26 @@ uGg shJ shJ ahe -hJa -wbc kAU +kAU +uGI gvv puw fHw -jAB +dmI ump pvm -ykp +dmI dWc jhu gmD gJG -qcS +jFd qIk ijm aWm bBz -keg +fgm uaJ cmj ryp @@ -110562,7 +109108,7 @@ qMW jVZ ntO qyp -djh +oQO sIf cyL uYN @@ -110573,13 +109119,13 @@ jOn jNy hDL gVh -mMl +hDL hMT cqJ -kSl +xzr eNt nSD -cBa +lxE sGE mvC udt @@ -110745,12 +109291,12 @@ anT aMT nJn dkK -hgT +nuj knp lXw sGH uYo -uKa +ofC lZv lXw dTT @@ -110771,7 +109317,7 @@ duF duF agn jTU -tLK +ygu uKT uKT aaC @@ -110786,9 +109332,9 @@ gdD kVl teD wbE -tSm hQw -gmQ +iEj +fXu uaJ fSA lrx @@ -110808,7 +109354,7 @@ cGE cPf odl xVx -kFS +lRn aDb uwP boA @@ -110819,10 +109365,10 @@ sMa sLr ntO qyp -djh +oQO gWp cyL -uYN +lXY kuf bPr xCf @@ -110833,7 +109379,7 @@ uas xGG ods otg -gpF +quu vBN nMz ydK @@ -111002,7 +109548,7 @@ gds ctY raq cdb -rjf +uKS mYU lXw oSb @@ -111012,7 +109558,7 @@ jUc lXw bjt tWH -kug +mXJ duF kJP gTW @@ -111027,8 +109573,8 @@ tLs owr duF cUd -uln -eVL +rhu +hEX uKT tHu nSA @@ -111037,7 +109583,7 @@ vqr wtD tHX jKa -rAK +wlj nbl wlj bPJ @@ -111081,7 +109627,7 @@ aYT tnJ hZf aPw -kUI +vke wWq gEw aYT @@ -111089,27 +109635,27 @@ xNY toe afO vWC -gRj -daB -hAD -arC -xeR -fEv -xSb +cqJ +xzr +xzr +vdy +iqz +sGE +fQa lee fhO nqv lJD -hsn +kkV fhO dok pvh mhy xXa -dxf -rDi -rDi -dRC +oVr +dfi +dfi +puc kfy aMT anT @@ -111268,11 +109814,11 @@ mUo cXy lXw gEh -jHY +vEq jGN duF irz -hOu +ylO tnM phz wzA @@ -111281,15 +109827,15 @@ mla udE dWS bya -phT +owr duF pyu yec pGN uJv uzL +xvl trm -ggj gfJ mxx uKT @@ -111300,9 +109846,9 @@ hiR jRT kVl iSh -tNW lib -gmQ +lib +jKQ uaJ fSA ryp @@ -111321,7 +109867,7 @@ ehY jza xVx xfS -qOx +gNl pku gCq qYI @@ -111338,18 +109884,18 @@ aYT lBT hZf pgJ -mgr +ozm wWq tzW aYT qRa -cKW +toe uwL fhO qAi -xHU xzr -pjn +xzr +tSP vQJ dYT ipG @@ -111363,7 +109909,7 @@ xXa xXa xXa xXa -uyh +kMh kDi kfy kfy @@ -111535,14 +110081,14 @@ nRD dZV weO oCS -udE +xeb tVv -bya -vrl +aQP +owr duF -kmv -dpG ipV +dpG +cgt uKT rUM rpj @@ -111551,13 +110097,13 @@ aYk lEW uKT wDz -evw +cFU ptp cFU xVr dwC qYI -hgF +fMO fMO mPd uaJ @@ -111579,7 +110125,7 @@ peG xVx kFS cpp -cpp +feU kjZ qYI boA @@ -111590,12 +110136,12 @@ boA boA bAY boA -opB +wOp aYT tgS kjt wpp -fxJ +fSn cyL kan aYT @@ -111616,12 +110162,12 @@ iOs ihf klI qVx -rDi -rDi -rDi -rDi +dfi +dfi +dfi +dfi rvL -rDi +dfi nSl kfy aMT @@ -111782,13 +110328,13 @@ vtA vtA vtA dQl -dfw +fZZ lKw duF eXQ -ylO +mFw jfh -lKZ +lWQ oer duF vym @@ -111834,14 +110380,14 @@ vJi vJi vJi vJi -eJf -qYL -kxW +kFS +ksq +xkN mMI wNW ppr ppr -ppr +hDE hIf fXM boA @@ -111879,7 +110425,7 @@ aXM aXM aXM aXM -uyh +kMh kfy anT anT @@ -112026,19 +110572,19 @@ aMT psX pyD mxK -tsf +fSe jPP -eSF -eSF +gSX +pDl pbr wDK lyO hHj bHJ aSU +kNj fJl -fJl -fJl +ugs pOR cJI oul @@ -112046,7 +110592,7 @@ lvy wQt tLs tLs -thN +tLs duF rrr tLs @@ -112056,13 +110602,13 @@ owr duF wlr wod -iDM +cro xGi bew uKT yiB akC -lHI +skp raH cEd uiz @@ -112072,33 +110618,33 @@ cDW neZ uKT ike -lpT +cpp iIW -ggR +uEc jmv -lSJ -lld -qOx -qOx -qOx -qOx -gNl -qOx -qOx -qOx -qOx +fAG +cbl +fPc +fPc +fPc +fPr +fZF +pUH +fPc +fPc +fPc lld lSJ -qOx -qOx +xnh +xnh urE -cpp +cZF xOm kfy kfy pTS pTS -pTS +bsA aam fXM boA @@ -112121,7 +110667,7 @@ kRY myS iwg fhO -sag +oXu kfy dId jut @@ -112286,7 +110832,7 @@ oRA fSe fSe fSe -xzx +fSe tzh ttg cSX @@ -112294,9 +110840,9 @@ hHj ntR fwX vLT -vLT -vLT -vwV +jAz +vei +dNd fUg nXe nXe @@ -112313,7 +110859,7 @@ tTo tTo iap wod -kpV +tZd cUn sgK bBp @@ -112330,17 +110876,17 @@ iyd uKT pxv hMM -cpp +lUj spI -cpp +cSG cpp iof cpp cpp cpp -cpp -xSH -cpp +iFV +mxN +lUj cpp cpp cpp @@ -112374,11 +110920,11 @@ fpc tin heZ kZG -kZG +vLI rNz cHW fhO -sag +oXu kfy onR xsZ @@ -112393,7 +110939,7 @@ aeV aeV aeV aXM -uyh +kMh lOJ aMT aMT @@ -112544,8 +111090,8 @@ gpq rjU spa kTr -gdJ -xhz +fSe +rBY fSe hHj dsa @@ -112553,7 +111099,7 @@ fwX qUE jlO qUE -vwV +dNd hzq nXe wdn @@ -112569,14 +111115,14 @@ umx thk tTo uqH -vvb -veZ +rlr +fAa rZs hgY uKT wjB -jdT -skp +jhv +xqk cHB uuC tHS @@ -112588,15 +111134,15 @@ uKT vfk nGr yhu -wlf +cpp sWM mpX htb cMh uOJ -nfV -uRT -fPc +mpX +mpX +raM mpX mpX uPb @@ -112612,13 +111158,13 @@ vJF vJF vJF vJF -wED -mef +pBi +ovv fXM boA pEi iQY -oxg +aZg iOt fcN vUC @@ -112635,7 +111181,7 @@ iXm rdL fhO fhO -sag +oXu kfy orW azo @@ -112650,7 +111196,7 @@ aeV aeV aeV aXM -uyh +kMh lOJ aMT aMT @@ -112801,7 +111347,7 @@ dNd lPJ bZj eKW -voV +iuT ekp cFG jwC @@ -112826,14 +111372,14 @@ dvq dTN fAg dKD -wod +gfk vyc uKT uKT uKT kmm -cnQ -skp +jdT +xqk gqC rWl gqC @@ -112845,7 +111391,7 @@ uKT gnj gnj rsi -mFB +tNG kwW tNG qDE @@ -112853,7 +111399,7 @@ iDL iDL fgw oBg -pLW +fAK fgw iDL iDL @@ -112881,7 +111427,7 @@ sgJ vUC hhn hrc -nss +hpf dpQ dzZ fhO @@ -112892,10 +111438,10 @@ iJX bjJ fhO pXR -sag +oXu kfy pxs -iuM +lqY avI aeV aeV @@ -112907,7 +111453,7 @@ aeV aeV aeV aXM -uyh +kMh kfy anT anT @@ -113058,7 +111604,7 @@ dNd lPJ syz cCQ -gdJ +fSe vlQ fSe xkk @@ -113078,13 +111624,13 @@ xwO tTo tGi wWO -nVi +jGb ulM lGi dDl -tch +rsu wod -kpV +vxq tlJ bWW jKh @@ -113102,15 +111648,15 @@ uKT fbQ dZh fGo -wSn +chl jLU nBQ fgw qHD iaQ -qcV +iaQ vSr -ewh +sDS iaQ koh iDL @@ -113149,10 +111695,10 @@ tBz hba fhO sbX -sag +oXu kfy mVQ -iuM +ezc ayG aeV aeV @@ -113164,7 +111710,7 @@ aeV aeV ark aXM -uyh +kMh lOJ aMT aMT @@ -113315,7 +111861,7 @@ glw pNd fRX rSg -voV +fSe xhz fSe hHj @@ -113324,7 +111870,7 @@ wwq cNn gpz cNn -vwV +dNd oCK nXe auk @@ -113346,21 +111892,21 @@ uxo eXX gqA iwG -uHy -ajd +oYD +dQF npo xMh npo npo xay gFP -odK +jes vuC lBS lnJ -bjv -chl -tSC +fQH +tGh +sre pSI iDL dxz @@ -113372,7 +111918,7 @@ hFG wAu aDF vwz -xzZ +tar aDF gLV xpd @@ -113380,7 +111926,7 @@ cOr ybw tyW wiY -kEd +pCa sdO vJF kYV @@ -113406,10 +111952,10 @@ bmH hjh fhO pLJ -sag +oXu kfy tvu -iuM +qhU avI aeV aeV @@ -113421,7 +111967,7 @@ aeV aeV aeV aXM -uyh +kMh lOJ aMT aMT @@ -113571,17 +112117,17 @@ oRA fsC bRd bRd -fwZ +bRd uBw ceR xdB hHj ePG wwq -xFx +vLT uQV -kkf -vwV +vLT +dNd wKV wZF dqa @@ -113598,13 +112144,13 @@ mEH dDl dKD sli -iDM +vxq uxo dLa gqA fgu bSR -hdF +emL kJI kJI sLZ @@ -113616,8 +112162,8 @@ uKT jBK lnJ bjv -dEF -tSC +chl +oTy mfF fgw mpI @@ -113629,15 +112175,15 @@ hFG wAu vIa iXk -vXj +hYu jZZ ioZ -kmY -rgd +dcj +jWV bjl -pCa +xAb ctl -mJs +cin ttQ vJF gHf @@ -113663,7 +112209,7 @@ fhO fhO fhO pLJ -sag +oXu kfy eNF iuM @@ -113678,7 +112224,7 @@ aeV aeV aeV aXM -uyh +kMh kfy aMT aMT @@ -113827,8 +112373,8 @@ aMT oRA fSe dCs -fSe -fSe +gSX +pDl jhz kCo xxd @@ -113836,15 +112382,15 @@ hHj pwU fft kSo +wxi sjI -uCb vAR prx nXe nHy -lIG +jId goO -mkY +jId kTG tTo lpA @@ -113853,9 +112399,9 @@ vvd njs xGR dDl -sDX -jeI -iDM +rsu +sli +vxq alp oeE gqA @@ -113873,7 +112419,7 @@ uKT bld lnJ bjv -sNC +xDm tSC kEQ iDL @@ -113882,13 +112428,13 @@ hFG jxc paW fBk -hFG +goc wAu xza mCp ugH iDL -ijJ +qzM xpd cOr ajz @@ -113908,8 +112454,8 @@ gsC mMY ohH dkF -rDi -dRC +dfi +pPG pLJ pLJ kfy @@ -113920,7 +112466,7 @@ pLJ xMH kfy pLJ -xAt +pZm jXr shL vEJ @@ -114086,7 +112632,7 @@ hMG rIH wYy fSe -jhz +oLK lNg hEW hHj @@ -114094,7 +112640,7 @@ vcU dve wRZ mXJ -tMI +mXJ bSM xfp nXe @@ -114130,8 +112676,8 @@ uKT tcE pAs qsQ -sNC -tSC +fqj +oTy kEQ iDL sGm @@ -114139,14 +112685,14 @@ vvO bOi iDL oMF -tNT +hFG gNc iDL eia urw iDL -cSx -xpd +sRY +vzz vZI lcN ajz @@ -114164,7 +112710,7 @@ fRx onU sKS iaM -uyh +oXu pLJ pLJ sbX @@ -114177,7 +112723,7 @@ pLJ pLJ jbn pLJ -sag +oXu kfy qjI deN @@ -114192,7 +112738,7 @@ aeV aeV aeV aXM -uyh +kMh lOJ aMT aMT @@ -114367,7 +112913,7 @@ ndq tTo nJk tTo -csP +rsu sli rZU uKT @@ -114376,18 +112922,18 @@ gqA nuU nmg cVp -wLq +yiV hOQ -lns +fas bsc -jQm -afr +aZs +nyF hjX uKT pNU beG uRy -fqj +gyc qfA dmJ iDL @@ -114396,9 +112942,9 @@ hFG tCk pPO nNL -kTk -rJX -kpA +uwo +haN +nyj fwP dTw pvM @@ -114421,7 +112967,7 @@ qKp ifM kML ohH -uyh +oXu ipK pLJ pLJ @@ -114434,7 +112980,7 @@ pLJ pLJ kfy pLJ -sag +oXu kfy hYJ xbO @@ -114449,7 +112995,7 @@ aXM aXM aXM aXM -uyh +kMh kfy aMT aMT @@ -114599,7 +113145,7 @@ eZq byC hyr vfa -meY +jPK ilA jho wsy @@ -114607,25 +113153,25 @@ rxF vmR whx waV -oeQ -slp +aED +wTL tuf gwl mvi yhP rTO kox -rsu -rsu +mWQ +jee eXu ejP msS -rsu +wTL wsN vgE yfX -csP -sli +wTL +xod cRM qFb qBT @@ -114638,24 +113184,24 @@ lyM hZM nmg adc -sic +bqa ogz uKT mOd plB ivu -kah +fqj lWw kbi iDL hvg hFG -iHs +hFG kwG -hSe -kdj -oCo -ndj +tgn +hFG +wAu +kpA adu ofY ofY @@ -114678,7 +113224,7 @@ ohH tzX ohH ohH -uyh +oXu kfy vta xeu @@ -114697,16 +113243,16 @@ pLJ pLJ pLJ kfy -cCm -jef -jef -jef -jef -jef -jef -epD +dxf +rDi +rDi +rDi +rDi +rDi +rDi +fWt rwX -dRC +puc kfy aMT aMT @@ -114851,21 +113397,21 @@ aMT aMT shA nuW -vaP +xNV dMD jPK xtn hQj -aje +eGC uov bIT -mSO +isv dQW kod kod glJ -wBm -fEX +mDw +kod tXi fpA sSB @@ -114873,9 +113419,9 @@ mLz bkx nPz gxr -mSO +mDw vLg -wBm +kod uyX kod enR @@ -114886,7 +113432,7 @@ obs uGl uKT wtM -drZ +hlX nuU nmg oZl @@ -114901,7 +113447,7 @@ uKT kpg bCg xIx -sNC +fqj xRS hat iDL @@ -114909,7 +113455,7 @@ opK btd btd btd -gRr +btd oSK dvz gOi @@ -114938,23 +113484,23 @@ cME lbV tBk tBk -tBk +xxj tBk tBk hVH tBk tBk -tBk +lVo bfN -tBk +nlI iEX -sag +eDF tdj pLJ nAK pLJ kfy -sag +uyh pLJ kfy kfy @@ -115124,7 +113670,7 @@ cGv omT uSd uSd -nzf +srh pZU nOR nLU @@ -115132,7 +113678,7 @@ xCy uSd uSd igx -sgb +uSd tBq bJC eVb @@ -115143,7 +113689,7 @@ ryM uSd uKT wXv -mxN +trk mZi nmg hkn @@ -115186,7 +113732,7 @@ uyh tsG iEf pLJ -pLJ +qhq jTF ptf dHf @@ -115195,23 +113741,23 @@ aGj uqv oJE pLJ -pLJ +jPv pLJ pLJ pLJ pLJ bwh -pLJ +qhq eWN -pLJ +sfI hnh obO epu -jef -jef -jef -ngq -dsb +rDi +rDi +rDi +xys +dRC bwh kfy aMT @@ -115368,7 +113914,7 @@ anT anT cnK qYs -eGC +mpf sEA ezb eZq @@ -115400,7 +113946,7 @@ rxf gmv uKT teh -iwG +kTv fYF uKT uKT @@ -115446,23 +113992,23 @@ emW rDi rDi luJ -rHC +luJ tdR -uwl +luJ bOu oNE vlY -uwl -mjs +luJ +rDi tHs gyR sUr -mjs -mjs -mjs -fWt +rDi +rDi +rDi +fFv igV -dsb +dRC pLJ pLJ pLJ @@ -115478,7 +114024,7 @@ fSL sGn fYA uJG -cbo +wCx hRK wCx wOe @@ -115625,8 +114171,8 @@ iob iob eZq mDa -jeT -lyP +mvZ +vOL eYa eZq mua @@ -115657,30 +114203,30 @@ hds hds hds qeq -fes +aDg mAn uKT gKh tjA -qTC tjA tjA -qTC +tjA +tjA tjA tjA mNh uMg vET hqx -lmn +uMg kqs rpE wSu old -jJM +the cJA uBD -vvx +iVy mbe uyp gOi @@ -115717,7 +114263,7 @@ kfy pLJ eWN pLJ -sag +kMh nPb kfy kfy @@ -115882,8 +114428,8 @@ nuW xNV dMD jPK -hdm -tKY +jeT +adP iyL eZq tAv @@ -115906,7 +114452,7 @@ xna lUJ blK fOv -cfP +xoJ fOv hds hds @@ -115914,7 +114460,7 @@ hds hds hds qeq -fes +aDg xSy uKT oeF @@ -115929,13 +114475,13 @@ dIv dIv dIv cqs -scW +cqs wZU gnj wSu wxr -wYY -fyu +the +cJA gMq iVy cnx @@ -115943,7 +114489,7 @@ gFJ hdu jTw iwf -vzy +tvo ndt quz cap @@ -115974,7 +114520,7 @@ bwh pLJ mGu lNu -gtW +fMg edn pLJ kfy @@ -116158,12 +114704,12 @@ ayh oXI dqf ovz -ijU +ovz jfp hdW eLt fOv -cfP +xoJ fOv hds hds @@ -116171,7 +114717,7 @@ hds hds hds mEt -fes +aDg skk uKT oeF @@ -116203,7 +114749,7 @@ xSV xEc loo sfF -tON +hXj cXp iYq drr @@ -116231,7 +114777,7 @@ pLJ vDg vDg vDg -pXw +vDg mql sGC kfy @@ -116396,8 +114942,8 @@ anT anT eZq poi -gvT -rDt +jeT +adP ezb eZq oOs @@ -116420,7 +114966,7 @@ mgZ ceJ mFx fOv -cfP +xoJ fOv jpE hds @@ -116428,7 +114974,7 @@ hds hds hds mEt -fes +lOp jDX uKT oeF @@ -116438,7 +114984,7 @@ ldw hRG ftE xjP -bfS +ikJ yfw nzW oyb @@ -116460,9 +115006,9 @@ pDB cMG wkF uWE -hXj +ena bGz -hXj +kkN jDe bLb ndt @@ -116677,7 +115223,7 @@ rYN sNd hSZ fOv -cfP +xoJ fOv hds hds @@ -116688,7 +115234,7 @@ mEt fes cMX uKT -xmB +oeF vnF fQk onl @@ -116702,10 +115248,10 @@ blL lEI lqJ cUl -ess +jSW wSu dBe -uFW +jem pra wSu ttB @@ -116713,7 +115259,7 @@ ojQ aJa gOi khD -fyI +iwf sUC azX gJd @@ -116745,7 +115291,7 @@ pLJ odo wRG wRG -xOu +wRG mql pLJ kfy @@ -116910,7 +115456,7 @@ bug ptE hKW vXt -lZP +jtW tTL enW naL @@ -116934,7 +115480,7 @@ aMT aMT aMT jdN -cfP +xoJ fOv hds hds @@ -116945,7 +115491,7 @@ qeq fes sKE uKT -xmB +oeF vnF caG max @@ -116962,7 +115508,7 @@ wKq ess wSu wPX -uFW +cGd ofW rGa tIG @@ -116970,7 +115516,7 @@ edI cwg gOi goT -iwf +bDS lrO ndt uqG @@ -117002,7 +115548,7 @@ pLJ bIF bIF qLu -pda +bIF mql pLJ csd @@ -117172,7 +115718,7 @@ pFS qsK naL fsb -fSN +uSv gPG aPP pHj @@ -117191,7 +115737,7 @@ aMT aMT aMT jdN -cfP +xoJ fOv hds hds @@ -117202,14 +115748,14 @@ qeq fes yiD uKT -xmB +oeF vnF hze ujG ePs dIv qCs -jwW +jeh wLT gaJ hSC @@ -117219,7 +115765,7 @@ nIV rAJ wSu lfY -wPG +the the the bHh @@ -117240,7 +115786,7 @@ wTF vBf vBf nvu -hWl +abp cWd fLx lAc @@ -117259,8 +115805,8 @@ ovK ipK pLJ pLJ -ibt -sNb +pLJ +mql pLJ pzJ pLJ @@ -117425,13 +115971,13 @@ sSk xTn xTn kIL -vEd +wei qxm naL kpY -waM +pOj vHs -uSv +jxy xKT iRh oXI @@ -117448,7 +115994,7 @@ aMT aMT jdN jdN -cfP +xoJ fOv fOv fOv @@ -117473,7 +116019,7 @@ dIv hzO ybq rvY -lcL +qkO wSu fAr lLq @@ -117497,11 +116043,11 @@ paH rqe vBf jxe -abp +hAt bck -kbW +fLx vUe -rKx +wxd prA bih sxK @@ -117682,7 +116228,7 @@ jtW jtW mqu vjW -hMA +vEd bBF naL lhx @@ -117715,7 +116261,7 @@ eLr eLr eLr fWq -hsd +eLr mcq wHE kkd @@ -117730,7 +116276,7 @@ rvY mEY tvg rvY -xBm +ubF wSu wSu ulq @@ -117740,7 +116286,7 @@ wSu wSu wSu gOi -vxz +nrI nrI qkW vmg @@ -117754,15 +116300,15 @@ elo faL vBf qSi -gLl -riE +oin +jKy fLx szh nIO lYv kDe mVi -uyh +oXu pLJ pLJ xAF @@ -117771,7 +116317,7 @@ kfy bwh pLJ pLJ -pLJ +ptQ snH rDi uxA @@ -117980,14 +116526,14 @@ eWf sCf eWf nVh -key +lLj rvY vvQ ifz usA ePo rvY -xBm +ubF wSu lyt the @@ -117997,8 +116543,8 @@ gav ioV ioV gOi -bXs -pYD +upt +aAN xwv vmg doY @@ -118007,19 +116553,19 @@ vgX vBf sNt lKi -hns +syo dfL vBf cVu dLN -rAR +uDp mVi fJC vtl hyO pWb mVi -uyh +oXu gZc gZc gZc @@ -118027,7 +116573,7 @@ mql kfy pLJ pLJ -pLJ +ggj bwh uyh pLJ @@ -118233,9 +116779,9 @@ ivK msl aWM rjT -lLj +nfV eht -oNB +lLj yho wqH rvY @@ -118244,18 +116790,18 @@ dWn qnp xOz rvY -xBm +ubF wSu isl the fZa lsT vnp -the -the +bZd +bZd kEu -iaV -iwf +fmw +hHT odP vmg mJB @@ -118276,7 +116822,7 @@ tiJ fHa mVi mVi -uyh +oXu gZc uTm gZc @@ -118284,10 +116830,10 @@ xAF wkq ifS ifS -ifS +gVx qLZ ljs -bLp +nal lOg sGC kfy @@ -118492,8 +117038,8 @@ sRL dUC enS qUi +xIn kuy -vfD nXp rvY qWX @@ -118501,18 +117047,18 @@ sPt kcZ tUy rvY -xBm +ubF wSu uky xlG jri -gWJ +sBF gWJ xRq abL gOi dQP -cjE +iwf lmq uWQ vSL @@ -118526,14 +117072,14 @@ syo aak aan vBf -qSI +uXi eCC etx -jUV +irr sUu rie oaL -uyh +oXu gZc gZc gZc @@ -118543,7 +117089,7 @@ dBG pLJ nAK pLJ -vcw +ckj pLJ pQJ pLJ @@ -118722,11 +117268,11 @@ aMT aMT jdN erD -cUA -lTv +ivK +ivK whZ -lTv -hnv +ivK +cfP ivK ivK ivK @@ -118758,7 +117304,7 @@ gjT nyT nEi rvY -xBm +ubF wSu mNl itm @@ -118784,13 +117330,13 @@ xef aao vBf kBi -bjq -ulY +xOp +jyR mkL gQc qAg oaL -uyh +oXu kfy aMT aMT @@ -118800,7 +117346,7 @@ pLJ pLJ pLJ pLJ -vcw +jPv pLJ pLJ pLJ @@ -118979,11 +117525,11 @@ aMT aMT jdN ivK -nzt ivK ivK ivK -pyZ +ivK +cfP ivK ivK ivK @@ -119015,7 +117561,7 @@ nRi uRr kYm rvY -xBm +ubF wSu fVq sAZ @@ -119025,8 +117571,8 @@ elS rca ijf jsG -mBx -iwf +gLV +bDS sAn vmg vmg @@ -119042,12 +117588,12 @@ dsx vBf jaq xDD -irr +sjr cxQ -irr +ykY rie oaL -uyh +oXu kfy anT anT @@ -119057,7 +117603,7 @@ kfy lOJ lOJ lOJ -nne +aiR lOJ lOJ kfy @@ -119240,7 +117786,7 @@ mxr jdN jdN jdN -pyZ +cfP ivK sEx sEx @@ -119272,17 +117818,17 @@ qNQ tqG qwB rvY -xBm +ubF wSu cxO iIy lVQ -xhG -otm +xIi +sfP tNE -lnn +ijf oeH -tTr +gLV iwf vzy oaL @@ -119298,7 +117844,7 @@ vBf vBf vBf oaL -jhT +ejK tYC rKr ejK @@ -119314,7 +117860,7 @@ aMT aMT aMT kfy -ozr +pLJ lOJ aMT aMT @@ -119493,11 +118039,11 @@ aMT jdN ivK ivK -nzt +ivK ivK tpZ jdN -pyZ +cfP ivK sEx sck @@ -119506,20 +118052,20 @@ tsA sEx qZv nxL -nxL -nxL -nxL -nxL -nxL -nxL -nxL +qWJ +tsP +tsP +tsP +tsP +tsP +idC oaY -oiZ -cAC -oiZ -oiZ -igp -mlp +hVe +rPW +hVe +hVe +hVe +hWW ipz aWM bcz @@ -119555,7 +118101,7 @@ oAB diN mrr oJi -dpt +fpx fpx bBs oAB @@ -119750,11 +118296,11 @@ anT jdN ivK ivK -nzt +ivK ivK ivK jdN -pyZ +cfP ivK sEx lJc @@ -119762,21 +118308,21 @@ hgC oCA bCq qPK -vQo -enI -fID -aPr -qKw -aPr +hVe +fXP +uoE +aZy +uoE +aZy jgj -oiZ -iOb +jYp +aZy cHt cHt cHt cHt -oxG -pih +gYU +cVh voS aWM hfh @@ -119786,12 +118332,12 @@ hfh voP hfh hfh -jjI +uLI wSu dLE geZ oEi -kSy +exs oBc sUL dcN @@ -119801,12 +118347,12 @@ vvv kgX nzq iys -bgd sZw +sUt lJx sZw -qdR sZw +rNQ usf sZw vWa @@ -120007,11 +118553,11 @@ aMT jdN ivK ivK -nzt +ivK ivK ivK jdN -pyZ +cfP tMF sEx kYZ @@ -120019,8 +118565,8 @@ mKw pZL hdA uvY -lHy -jdB +aZy +gXs hKR aZy uoE @@ -120032,8 +118578,8 @@ cHt cHt cHt cHt -qVg -sXr +aZy +ydi rDO lQf eVI @@ -120043,7 +118589,7 @@ xWd uZd xWd hfh -jjI +uLI wSu aoF gfS @@ -120054,12 +118600,12 @@ aUQ vQz vQz sov -nIl -hPD +xKw +eaK lij -eeJ -vSk -rTH +kgl +xOp +isO sVh iWh dXh @@ -120264,11 +118810,11 @@ aMT jdN ivK ivK -nzt +ivK ivK ivK jdN -pyZ +cfP ivK sEx vjM @@ -120276,8 +118822,8 @@ vqO vEj hdA uvY -aZy -jdB +gYU +ref nAB aZy lQc @@ -120290,7 +118836,7 @@ cJj qtg cJj fxm -kMc +hdq dDe qkx xpr @@ -120300,7 +118846,7 @@ qcB lfW qnN hfh -jjI +uLI wSu xBa gfS @@ -120521,7 +119067,7 @@ aMT jdN ivK ivK -nzt +ivK ivK ivK jdN @@ -120534,7 +119080,7 @@ hBH upD uvY aZy -jdB +gXs tgs uwS vfo @@ -120547,17 +119093,17 @@ aBA ggN aml kXi -tWT +rjf aMZ aWM gID -mqF -tZZ +otA +dZb lda -mco +cvR ajl hfh -jjI +uLI wSu fVq gfS @@ -120567,7 +119113,7 @@ wfw pib lNJ woC -ewi +twH emR naE bvt @@ -120778,7 +119324,7 @@ anT jdN ivK ivK -nzt +ivK ivK ivK jdN @@ -120791,8 +119337,8 @@ rjb sEx bfe nqg -jdB -cvs +gXs +rDO aWM xEu xEu @@ -120803,8 +119349,8 @@ xEu xEu aWM xCV -rPT xak +cOC tMA aWM gbF @@ -120814,7 +119360,7 @@ rHF tZZ dOI hfh -dTU +ghF wSu qHm gfS @@ -120825,7 +119371,7 @@ wrv nKR fjJ fdl -dVx +ecV fZL bvt cHm @@ -120839,7 +119385,7 @@ vhK tij ppd ceb -ukN +bGD pMZ jsE bfm @@ -121035,7 +119581,7 @@ aMT jdN ivK ivK -nzt +ivK ivK ivK jdN @@ -121048,8 +119594,8 @@ sEx sEx ihH aZy -jdB -cvs +gXs +rDO xEu aMT aMT @@ -121071,7 +119617,7 @@ gly hKD vGN hfh -jjI +uLI wSu sfP ofx @@ -121274,12 +119820,12 @@ aMT anT aMT ivy +xfO +wjl +whZ +erD ivK ivK -eVc -oXu -vhu -tSz jdN aMT aMT @@ -121292,7 +119838,7 @@ aMT jdN ivK ivK -nzt +ivK ivK ivK jdN @@ -121300,13 +119846,13 @@ osX jdN mhl mhm -mFq +pDQ kKB ucP -kBL -aPr -fVn -kJL +xuG +oBV +hWW +rDO xEu aMT aMT @@ -121317,8 +119863,8 @@ aMT aMT xEu aDH -pVW -lMt +ayn +prn gtK aWM hfh @@ -121328,7 +119874,7 @@ hfh hfh hfh hfh -jjI +uLI wSu wSu wSu @@ -121533,10 +120079,10 @@ anT ivy ivK qmR -mqG +ivK jdN jdN -sVB +pyy jdN jdN jdN @@ -121549,7 +120095,7 @@ jdN jdN ivK ivK -nzt +ivK ivK ivK jdN @@ -121563,7 +120109,7 @@ oOY sVG xIZ iNP -tWT +pAn xEu aMT aMT @@ -121574,8 +120120,8 @@ aMT aMT xEu gjM -xPT -nOl +ayn +nPB oEE aWM aMT @@ -121586,10 +120132,10 @@ xBm xBm cOV mxu -qKu -qKu -uKG -htT +aEe +aEe +iij +rab cSs xBm tyZ @@ -121790,10 +120336,10 @@ aMT jdN erD ivK -uHo +vrC jdN ivK -mqG +ivK ivK ucS jdN @@ -121806,7 +120352,7 @@ ivK jdN ivK ivK -nzt +ivK ivK ivK jdN @@ -121819,8 +120365,8 @@ gKE uxb xEu xJA -sdz -flk +xwU +xEu aWM aMT aMT @@ -121831,8 +120377,8 @@ aMT aMT aWM xJV -xPT -iIh +ayn +aqV aMZ aWM aMT @@ -121846,7 +120392,7 @@ cSs cSs cSs cSs -jjI +tmB cSs xBm tyZ @@ -121876,7 +120422,7 @@ cSs jxt xBm cSs -fYv +rHr nCH aMT aMT @@ -122047,19 +120593,19 @@ aMT jdN jdN jdN -mqG +ivK jdN ivK -rns -lTv -lTv -oDn -lTv -lTv -lTv +ivK +ivK +ivK +mxr +ivK +ivK +ivK pyy -lTv -tsP +ivK +sAj jdN jdN jdN @@ -122075,8 +120621,8 @@ drp jZG aWM lGD -uIF -dtY +fJL +bcJ eHu oxs aMT @@ -122088,8 +120634,8 @@ aMT aMT oxs aBw -tAc -eeK +ayn +jmy gyY aWM aMT @@ -122133,7 +120679,7 @@ cSs nyS tUq iEk -fYv +rHr anT kBD aMT @@ -122304,7 +120850,7 @@ aMT aMT aMT jdN -mqG +ivK jdN ivK ivK @@ -122316,11 +120862,11 @@ ivK ivK jdN erD -exV -lTv -lTv -lTv -mbj +ivK +ivK +ivK +ivK +ivK ivK erD jdN @@ -122332,9 +120878,9 @@ eJH ght aWM wyN -wXl -dKv -pvZ +eXc +gXs +rDO abq aMT aMT @@ -122360,7 +120906,7 @@ xBm xBm xBm cSs -jjI +tmB cSs xBm xBm @@ -122390,7 +120936,7 @@ xBm fAN iEk iEk -fYv +rHr anT anT qsF @@ -122589,8 +121135,8 @@ cLI mSc aWM wMp -hbt -lwu +pck +rMW lrY aWM aMT @@ -122617,7 +121163,7 @@ xBm xBm xBm cSs -jjI +tmB cSs xBm xBm @@ -122647,7 +121193,7 @@ xBm iEk iEk aMT -fYv +rHr anT aMT aMT @@ -122818,7 +121364,7 @@ aMT aMT aMT ivy -rAw +ivK jdN ivK ivK @@ -122845,7 +121391,7 @@ lBg rhT kUJ aWM -uYx +uvY aZy lBy rDO @@ -122874,7 +121420,7 @@ xBm xBm xBm cSs -jjI +tmB cSs cSs iEk @@ -122904,7 +121450,7 @@ iEk iEk anT aMT -fYv +rHr anT aMT aMT @@ -123075,7 +121621,7 @@ aMT aMT aMT jdN -bQz +qjK jdN jdN ivy @@ -123131,7 +121677,7 @@ xBm xBm xBm nBH -jjI +tmB cSs aMT aMT @@ -123161,7 +121707,7 @@ iEk aMT anT aMT -fYv +rHr anT aMT aMT @@ -123418,7 +121964,7 @@ aMT aMT anT aMT -fYv +rHr anT aMT aMT @@ -123645,7 +122191,7 @@ xBm xBm xBm cSs -jjI +tmB cSs aMT aMT @@ -123675,7 +122221,7 @@ aMT aMT anT aMT -fYv +rHr anT aMT aMT @@ -123902,7 +122448,7 @@ xBm xBm xBm cSs -jjI +tmB cSs cSs cSs @@ -123932,7 +122478,7 @@ anT anT anT anT -fYv +rHr anT anT anT @@ -124125,9 +122671,9 @@ nLn anT aMT oOY -hGX -vZb -dAc +oOY +lpU +oOY oOY aMT qBt @@ -124159,7 +122705,7 @@ xBm xBm xBm cSs -jjI +tmB xBm xBm uVu @@ -124189,7 +122735,7 @@ anT aMT aMT aMT -fYv +rHr anT aMT aMT @@ -124418,7 +122964,7 @@ xBm cSs mxu pRx -qKu +uBj uKG iFk lyg @@ -124446,10 +122992,10 @@ anT aMT aMT aMT -fYv +rHr anT -aMT -byn +aXj +wHB xEO kjl mwf @@ -124703,16 +123249,16 @@ anT anT anT anT -fYv -anT -anT -wHB +hMW +wqj +wqj +ldR dxD -pHL +oWO xti oWO tWt -uvU +rSM enq rSM qBt @@ -124934,7 +123480,7 @@ lJl cSs xBm xBm -tyZ +dzX xBm nmb cSs @@ -124962,11 +123508,11 @@ aMT aMT fYv aMT -aMT -aMT +aXj +aXj lvw szI -tfp +iMR udw lvw lvw @@ -125191,7 +123737,7 @@ xBm cSs xBm xBm -tyZ +dzX xBm xBm nBH @@ -125448,7 +123994,7 @@ xBm cSs xBm xBm -tyZ +dzX xBm xBm cSs @@ -126953,9 +125499,9 @@ dnU lSB lpt dOo -mIA -iht -upX +fzs +dOo +qBt aMT aMT aMT @@ -127212,22 +125758,22 @@ qQf krU ybF nLn -krF -euR -euR -euR -euR -euR -euR -euR -euR -euR -euR -euR -euR -euR -euR -nev +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qBt +qqU aMT aMT anT @@ -127484,7 +126030,7 @@ jcB tGC tGC mWh -hqK +qBt anT anT anT @@ -127741,7 +126287,7 @@ aMT anT aMT aMT -hqK +qBt aMT aMT anT @@ -127998,7 +126544,7 @@ krU krU nLn krU -hqK +qBt anT aMT qBt @@ -128251,11 +126797,11 @@ mLx mLx mLx qKB -mLx +qZi +aYK +weJ aYK -ddU -qYv -aaV +qBt aMT aMT aMT @@ -128512,7 +127058,7 @@ weJ krU krU krU -hqK +qBt anT aMT aMT @@ -128769,7 +127315,7 @@ weJ nLn aMT aMT -hqK +qBt aMT aMT aMT @@ -129025,8 +127571,8 @@ krU skA nLn anT -osA -jmP +qBt +qBt anT aMT aMT @@ -129282,7 +127828,7 @@ krU weJ krU aMT -hqK +qBt aMT aMT aMT @@ -129539,7 +128085,7 @@ krU nek nLn aMT -hqK +qBt aMT aMT aMT @@ -129794,9 +128340,9 @@ weJ weJ krU qdG -gGu -euR -jmP +nLn +qBt +qBt anT anT qBt @@ -130307,7 +128853,7 @@ weJ weJ weJ krU -gCB +weJ krU aMT qBt @@ -130564,7 +129110,7 @@ weJ weJ weJ eRG -gCB +weJ nLn aMT qBt @@ -131830,7 +130376,7 @@ tXx baJ iDm lWB -cSf +lWB mLx qKB mLx diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d359fea401b2d..e4851ca40b933 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -118,8 +118,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -145,10 +145,10 @@ /area/solar/starboard/fore) "aaH" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/carpet/grimy, @@ -320,7 +320,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron, /area/construction/mining/aux_base) "abJ" = ( @@ -366,9 +365,6 @@ "abT" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /turf/open/floor/iron, /area/construction/mining/aux_base) "abZ" = ( @@ -465,7 +461,7 @@ /turf/open/space/basic, /area/space) "acO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -491,9 +487,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/maintenance/solars/starboard/fore) "acQ" = ( @@ -642,7 +635,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -670,16 +663,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "aep" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -701,10 +691,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "aeW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -775,19 +765,16 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "afB" = ( -/obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 }, -/turf/open/space, -/area/space/nearstation) +/turf/open/floor/plating, +/area/engine/atmospherics_engine) "afD" = ( /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /turf/open/floor/iron, @@ -796,7 +783,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/medical/genetics) @@ -913,8 +900,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "ahW" = ( @@ -959,13 +946,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_y = 27 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/engine, @@ -1030,7 +1017,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron, /area/hallway/secondary/entry) "aiB" = ( @@ -1277,10 +1263,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1322,8 +1308,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1344,10 +1330,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -1499,8 +1485,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "alf" = ( @@ -1510,7 +1496,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "ali" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /turf/open/floor/plating, @@ -1918,6 +1904,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hallway/secondary/entry) +"aop" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "aoq" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -1996,10 +1988,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -2123,10 +2115,10 @@ /area/solar/port/fore) "apR" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -2173,10 +2165,10 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -2384,10 +2376,10 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -2608,10 +2600,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -2863,7 +2855,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -2875,7 +2867,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/circuit/green, @@ -2884,7 +2876,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -2914,7 +2906,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/iron, @@ -3016,7 +3008,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 1 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "auM" = ( /obj/structure/disposalpipe/segment{ @@ -3085,14 +3077,14 @@ "auX" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "auY" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -3104,14 +3096,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, /area/engine/atmospherics_engine) "ava" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -3120,13 +3112,13 @@ /turf/open/floor/iron/dark/corner, /area/engine/atmospherics_engine) "avb" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/circuit/green, /area/engine/atmospherics_engine) "avc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -3143,7 +3135,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, /area/engine/atmospherics_engine) "ave" = ( @@ -3152,7 +3144,7 @@ pixel_y = -26 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/meter, @@ -3161,39 +3153,39 @@ "avf" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, /area/engine/atmospherics_engine) "avg" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "avi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "avk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, /turf/open/floor/plating, /area/engine/atmospherics_engine) "avl" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 }, /turf/open/space, @@ -3313,8 +3305,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -3383,15 +3375,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, /area/engine/supermatter) -"awl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/atmospherics_engine) "awn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -3411,7 +3394,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -3547,7 +3530,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /turf/open/floor/iron, @@ -3583,7 +3566,7 @@ /area/engine/supermatter) "axx" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/structure/cable{ @@ -3611,7 +3594,7 @@ /area/engine/supermatter) "axB" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/structure/cable{ @@ -3875,7 +3858,7 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "ayJ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/machinery/power/rad_collector/anchored, @@ -3892,7 +3875,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "ayL" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/machinery/power/rad_collector/anchored, @@ -3972,10 +3955,10 @@ icon_state = "4-8" }, /obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -4016,10 +3999,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -4119,12 +4102,12 @@ /turf/open/space, /area/space/nearstation) "azP" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "azR" = ( @@ -4154,7 +4137,7 @@ /area/engine/supermatter) "azT" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/cable{ @@ -4167,7 +4150,7 @@ /area/engine/supermatter) "azU" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/structure/cable{ @@ -4257,10 +4240,10 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "aAy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -4320,14 +4303,12 @@ /turf/open/space, /area/solar/port/fore) "aAR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, -/turf/open/floor/iron, -/area/engine/atmospherics_engine) +/turf/open/floor/plating/airless, +/area/maintenance/disposal/incinerator) "aAT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4341,13 +4322,13 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "aAU" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "aAV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/machinery/meter, @@ -4363,14 +4344,14 @@ /turf/open/floor/engine, /area/engine/supermatter) "aAX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) "aAY" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/closed/wall/r_wall, @@ -4403,13 +4384,13 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aBd" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/structure/sign/directions/engineering{ @@ -4420,7 +4401,7 @@ /turf/closed/wall/r_wall, /area/engine/atmospherics_engine) "aBe" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -4453,7 +4434,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "aBA" = ( /obj/structure/disposalpipe/segment{ @@ -4593,10 +4574,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, -/obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aCj" = ( @@ -4661,13 +4642,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aCu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /turf/closed/wall/r_wall, /area/engine/atmospherics_engine) "aCD" = ( @@ -4772,7 +4753,7 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "aDn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/item/wrench, @@ -4780,18 +4761,18 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "aDo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aDp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) "aDq" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) "aDr" = ( @@ -4812,7 +4793,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -4832,7 +4813,7 @@ /area/engine/atmospherics_engine) "aDw" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space, /area/space/nearstation) "aDC" = ( @@ -4938,7 +4919,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, @@ -4950,7 +4931,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, @@ -4984,7 +4965,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aEr" = ( @@ -5002,21 +4983,24 @@ /area/engine/atmospherics_engine) "aEt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/engine{ - pixel_y = 23; - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron, -/area/engine/supermatter) +/area/engine/atmospherics_engine) "aEu" = ( /obj/machinery/meter, /obj/structure/cable{ @@ -5025,7 +5009,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aEv" = ( @@ -5036,7 +5020,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aEw" = ( @@ -5052,7 +5036,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -5068,7 +5052,7 @@ /area/engine/atmospherics_engine) "aEA" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space, /area/space/nearstation) "aEQ" = ( @@ -5087,10 +5071,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -5141,10 +5125,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -5489,7 +5473,7 @@ /area/hallway/secondary/service) "aHs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -5553,10 +5537,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -5740,7 +5724,7 @@ /turf/open/floor/iron, /area/quartermaster/storage) "aJx" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -5754,10 +5738,10 @@ /turf/closed/wall, /area/space/nearstation) "aJE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) @@ -5818,8 +5802,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "aKd" = ( @@ -5903,7 +5888,7 @@ /area/crew_quarters/bar) "aKB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "aKC" = ( @@ -5964,10 +5949,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -6007,11 +5992,11 @@ /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "aLo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -6124,8 +6109,8 @@ /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "aMv" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 }, /turf/closed/wall, /area/maintenance/disposal/incinerator) @@ -6140,7 +6125,7 @@ /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "aMy" = ( @@ -6170,8 +6155,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aME" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/plating, /area/engine/atmos) "aMG" = ( @@ -6204,28 +6188,28 @@ /area/engine/atmos) "aMM" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/space, /area/space/nearstation) "aMN" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space, /area/space/nearstation) "aMO" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space, /area/space/nearstation) "aMP" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /turf/open/space, @@ -6296,10 +6280,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -6335,7 +6319,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/air_sensor/atmos/incinerator_tank{ +/obj/machinery/air_sensor/incinerator_tank{ pixel_x = -32; pixel_y = 32 }, @@ -6386,7 +6370,7 @@ "aOM" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -6421,17 +6405,17 @@ /turf/open/floor/iron, /area/medical/medbay/central) "aPx" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "aPy" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) "aPz" = ( @@ -6439,7 +6423,7 @@ dir = 8 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "aPA" = ( @@ -6459,21 +6443,17 @@ dir = 1; id = "incineratorturbine" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/checker, /area/maintenance/disposal/incinerator) "aPB" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/item/clipboard, /obj/item/folder/yellow, /obj/item/reagent_containers/pill/patch/silver_sulf, @@ -6482,13 +6462,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/open/floor/iron/dark/corner, /area/maintenance/disposal/incinerator) "aPC" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -6497,6 +6478,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 9 + }, /turf/open/floor/iron/dark/corner, /area/maintenance/disposal/incinerator) "aPF" = ( @@ -6531,10 +6515,10 @@ pixel_y = 1 }, /obj/machinery/computer/atmos_alert, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -6745,8 +6729,8 @@ /area/maintenance/disposal/incinerator) "aRp" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "aRr" = ( @@ -6754,7 +6738,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/item/clothing/gloves/color/black, @@ -6771,7 +6755,7 @@ }, /area/engine/atmos) "aRs" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -6780,7 +6764,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aRt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -6791,18 +6775,18 @@ /turf/open/floor/iron, /area/engine/atmos) "aRu" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/atmos) "aRv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -6811,17 +6795,17 @@ /turf/open/floor/iron, /area/engine/atmos) "aRw" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "aRy" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -6831,7 +6815,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aRz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6908,10 +6892,10 @@ /area/crew_quarters/heads/cmo) "aRZ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6968,10 +6952,10 @@ req_access_txt = "53" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -6979,40 +6963,40 @@ /area/security/nuke_storage) "aSP" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ dir = 5 }, /turf/open/space, /area/space/nearstation) "aSQ" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, /turf/open/space, /area/space/nearstation) "aSR" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, /turf/open/space, /area/space/nearstation) "aSS" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ dir = 9 }, /turf/open/space, @@ -7031,7 +7015,7 @@ /turf/open/floor/iron/checker, /area/engine/atmos) "aSV" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -7040,7 +7024,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aTd" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /obj/machinery/meter, @@ -7068,14 +7052,14 @@ /area/engine/atmos) "aTg" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "aTh" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/space, @@ -7085,13 +7069,13 @@ name = "Mixed Air Tank Out" }, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "aTj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 8 }, /turf/open/floor/engine/air, @@ -7116,10 +7100,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -7163,10 +7147,10 @@ /area/crew_quarters/theatre) "aTz" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "aTA" = ( @@ -7187,8 +7171,8 @@ /obj/item/radio/intercom{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -7208,10 +7192,10 @@ /turf/open/floor/plating, /area/quartermaster/qm) "aUt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -7233,8 +7217,8 @@ /turf/open/floor/carpet/grimy, /area/vacant_room/office) "aUN" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -7243,7 +7227,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aUQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -7253,7 +7237,7 @@ /turf/open/floor/iron/dark/corner, /area/engine/atmos) "aUR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/airalarm/directional/south{ @@ -7269,7 +7253,7 @@ /turf/open/floor/iron/dark/corner, /area/engine/atmos) "aUS" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -7283,36 +7267,36 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "aUU" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "aUW" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "aUX" = ( -/obj/machinery/computer/atmos_control/tank/air_tank{ +/obj/machinery/computer/atmos_control/air_tank{ dir = 8 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, /turf/open/floor/iron/white/corner, /area/engine/atmos) "aUY" = ( @@ -7320,7 +7304,7 @@ /turf/open/floor/plating, /area/engine/atmos) "aUZ" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) "aVa" = ( @@ -7385,10 +7369,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -7461,28 +7445,28 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "aWv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 4 }, /turf/open/floor/engine/co2, /area/engine/atmos) "aWw" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "aWx" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/space, /area/engine/atmos) "aWy" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/plating, @@ -7491,8 +7475,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -7502,7 +7486,7 @@ /turf/open/floor/wood, /area/security/detectives_office) "aWB" = ( -/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7545,10 +7529,10 @@ /turf/closed/wall, /area/engine/atmos) "aWO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -7559,13 +7543,13 @@ name = "Mixed Air Tank In" }, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "aWS" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 8 }, /turf/open/floor/engine/air, @@ -7628,11 +7612,11 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "aXX" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, /area/engine/atmos) "aYa" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7652,6 +7636,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/item/wrench, /turf/open/floor/iron, /area/engine/atmos) "aYk" = ( @@ -7668,7 +7653,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aYo" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -7698,13 +7683,11 @@ /area/quartermaster/sorting) "aYx" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "aYC" = ( @@ -7760,10 +7743,10 @@ icon_state = "4-8" }, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -7797,28 +7780,28 @@ /turf/open/floor/iron/dark, /area/bridge) "aZP" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 4 }, /turf/open/floor/engine/co2, /area/engine/atmos) "aZQ" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "aZR" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/space, /area/engine/atmos) "aZS" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/plating, @@ -7854,8 +7837,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -7871,7 +7854,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bad" = ( -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7880,13 +7863,13 @@ "baj" = ( /obj/machinery/meter, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "bak" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ dir = 8 }, /turf/open/floor/engine/o2, @@ -7910,14 +7893,14 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "baq" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -7927,10 +7910,10 @@ /area/hydroponics) "bat" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -7995,8 +7978,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bbH" = ( @@ -8008,21 +7991,21 @@ /turf/open/floor/iron, /area/engine/atmos) "bbI" = ( -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "bbK" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bbN" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "bbO" = ( @@ -8242,7 +8225,7 @@ /obj/machinery/camera/directional/east{ c_tag = "Detective's Interrogation" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/grimy, @@ -8258,7 +8241,7 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "bcZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 4 }, /turf/open/floor/engine/plasma, @@ -8296,7 +8279,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bdj" = ( -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -8305,13 +8288,13 @@ "bdm" = ( /obj/machinery/meter, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "bdn" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 8 }, /turf/open/floor/engine/o2, @@ -8506,7 +8489,7 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "bew" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, +/obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/engine/atmos) "beB" = ( @@ -8546,7 +8529,7 @@ /turf/open/floor/iron, /area/engine/atmos) "beH" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -8685,8 +8668,8 @@ /turf/open/floor/iron, /area/quartermaster/miningoffice) "bfv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -8720,19 +8703,16 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "bfT" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 4 }, /turf/open/floor/engine/plasma, /area/engine/atmos) "bgc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -8741,7 +8721,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bgf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 8 }, /turf/open/floor/engine/n2, @@ -8815,10 +8795,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -8861,13 +8841,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "bgU" = ( @@ -8896,12 +8872,12 @@ /turf/open/floor/plating, /area/security/main) "bhi" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -8936,7 +8912,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bhv" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "bhw" = ( @@ -9103,10 +9079,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -9129,8 +9105,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -9140,6 +9116,13 @@ }, /turf/open/floor/iron, /area/quartermaster/miningoffice) +"biO" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/atmos) "biP" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) @@ -9154,7 +9137,7 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "biV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 4 }, /turf/open/floor/engine/n2o, @@ -9163,7 +9146,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bjh" = ( @@ -9189,7 +9172,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bjn" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 8 }, /turf/open/floor/engine/n2, @@ -9287,8 +9270,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -9378,7 +9361,7 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "bkI" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/engine/atmos) "bkK" = ( @@ -9386,40 +9369,40 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/iron, /area/engine/atmos) "bkL" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "bkM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "bkN" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) "bkO" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/floor/iron, /area/engine/atmos) "bkP" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron, @@ -9436,7 +9419,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -9444,15 +9427,15 @@ /area/engine/atmos) "bkT" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bkU" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron, @@ -9460,7 +9443,7 @@ "bkV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron, @@ -9469,7 +9452,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/machinery/meter, @@ -9664,10 +9647,10 @@ "blG" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -9730,7 +9713,7 @@ /area/quartermaster/miningoffice) "bmb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/holopad, @@ -9747,10 +9730,10 @@ /turf/open/floor/carpet/grimy, /area/library) "bmg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -9778,11 +9761,18 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/supply) +"bmw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "bmD" = ( /obj/structure/window/reinforced{ dir = 4 @@ -9807,14 +9797,14 @@ /turf/open/space, /area/space/nearstation) "bmI" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 4 }, /turf/open/floor/engine/n2o, /area/engine/atmos) "bmO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -9847,7 +9837,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron, @@ -9857,7 +9847,7 @@ /obj/item/stack/sheet/glass/fifty, /obj/item/stack/rods/fifty, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "bmY" = ( @@ -9870,7 +9860,7 @@ pixel_y = -32 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -9882,21 +9872,21 @@ /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bnc" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "bnd" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /turf/open/space, @@ -10048,8 +10038,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -10095,17 +10085,17 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "bol" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "bom" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) @@ -10134,7 +10124,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "boy" = ( @@ -10171,7 +10161,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "boS" = ( @@ -10219,7 +10209,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_edge, @@ -10232,10 +10222,10 @@ /area/maintenance/starboard/fore) "bpd" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -10274,22 +10264,20 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos) "bpP" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 4 }, /turf/open/floor/engine/vacuum, /area/engine/atmos) "bpS" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron, /area/engine/atmos) "bpT" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -10304,7 +10292,7 @@ }, /area/engine/atmos) "bpU" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ @@ -10315,7 +10303,7 @@ }, /area/engine/atmos) "bpW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ @@ -10326,7 +10314,7 @@ }, /area/engine/atmos) "bpX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -10338,7 +10326,7 @@ /obj/item/clothing/glasses/meson/engine/tray, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -10347,7 +10335,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -10359,7 +10347,7 @@ /obj/structure/sign/poster/official/work_for_a_future{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/iron, @@ -10600,28 +10588,30 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos) "brU" = ( -/obj/machinery/air_sensor/atmos/mix_tank, +/obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/vacuum, /area/engine/atmos) "brW" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /turf/open/floor/iron, /area/engine/atmos) "brX" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "brY" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -10630,7 +10620,7 @@ /turf/open/floor/iron, /area/engine/atmos) "brZ" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -10866,10 +10856,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/genetics{ @@ -10915,13 +10905,13 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos) "btL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 4 }, /turf/open/floor/engine/vacuum, /area/engine/atmos) "btN" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -10970,8 +10960,8 @@ /area/engine/atmos) "buf" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -11046,7 +11036,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -11157,10 +11147,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -11214,10 +11204,10 @@ "bvS" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -11455,7 +11445,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port) @@ -11475,7 +11465,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron, /area/engine/gravity_generator) "bxE" = ( @@ -11572,10 +11561,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -11616,10 +11605,10 @@ /area/bridge) "byF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -11653,9 +11642,6 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /turf/open/floor/iron, /area/engine/gravity_generator) "bzf" = ( @@ -11686,10 +11672,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -11762,7 +11748,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -11937,10 +11923,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -12068,18 +12054,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bBX" = ( /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -12265,7 +12251,6 @@ /obj/machinery/door/airlock/silver{ name = "Bathroom" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/crew_quarters/heads/captain/private) "bEf" = ( @@ -12313,7 +12298,7 @@ pixel_x = -1; pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/button/door{ id = "cmoshutter"; name = "CMO Office Shutters"; @@ -12363,8 +12348,8 @@ /turf/open/floor/iron, /area/engine/storage) "bEy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -12434,10 +12419,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "bFn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bFA" = ( @@ -12470,18 +12455,14 @@ /turf/open/floor/iron, /area/hallway/primary/central) "bFF" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/iron, -/area/engine/engineering) +/area/maintenance/starboard/aft) "bFL" = ( /turf/closed/wall/r_wall, /area/security/warden) @@ -12539,6 +12520,19 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"bGf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery, +/obj/item/kirbyplants{ + icon_state = "plant-22" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "bGl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12558,10 +12552,10 @@ /obj/machinery/door/airlock/security/glass{ name = "Anti Radiation Shielded Room" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12741,10 +12735,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -12834,6 +12828,16 @@ /obj/machinery/computer/security/telescreen/entertainment, /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) +"bJf" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) +"bJB" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/engine/supermatter) "bJL" = ( /obj/machinery/light/small{ dir = 1 @@ -12844,6 +12848,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/department/medical/central) +"bJU" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "bKe" = ( /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, @@ -13029,15 +13041,11 @@ /turf/open/floor/iron/dark, /area/security/main) "bLp" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/plating, +/area/maintenance/port/aft) "bLr" = ( /obj/structure/chair/office, /turf/open/floor/iron/dark/smooth_large, @@ -13083,9 +13091,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "bMa" = ( @@ -13261,7 +13266,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -13287,8 +13292,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "bNB" = ( @@ -13339,10 +13344,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -13618,7 +13623,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/textured, @@ -13655,10 +13660,10 @@ /turf/open/floor/iron, /area/storage/tools) "bRg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -13670,8 +13675,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -13827,8 +13832,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -13907,8 +13912,8 @@ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -14122,7 +14127,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/security/glass{ @@ -14210,7 +14215,7 @@ /turf/open/space, /area/space/nearstation) "bTN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -14282,10 +14287,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -14406,10 +14411,10 @@ "bVy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -14420,10 +14425,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bVE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -14438,8 +14443,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/storage/tech) @@ -14451,7 +14456,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; name = "O2 to Airmix" @@ -14707,10 +14712,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison/dark, @@ -14736,10 +14741,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -14785,10 +14790,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -14848,10 +14853,10 @@ /turf/open/floor/iron, /area/engine/engineering) "bYA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "bYB" = ( @@ -14869,14 +14874,13 @@ /turf/open/floor/iron, /area/hallway/primary/port) "bYJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/security/main) "bYK" = ( @@ -14963,8 +14967,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -14985,8 +14989,8 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "bZl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -15246,20 +15250,20 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "caV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/library) "caX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -15344,10 +15348,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -15430,10 +15434,6 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -26; - pixel_y = 2 - }, /turf/open/floor/iron, /area/engine/engineering) "cbV" = ( @@ -15580,8 +15580,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -15615,9 +15615,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/wood/big, @@ -15723,19 +15723,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "cdN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/security/main) "cdX" = ( @@ -15763,10 +15760,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -15821,10 +15818,7 @@ /area/hallway/primary/central) "ceo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -15884,8 +15878,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_corner, /area/crew_quarters/heads/hos) "ceE" = ( @@ -15912,10 +15906,10 @@ /area/security/detectives_office) "ceQ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -15972,7 +15966,7 @@ /turf/open/floor/iron, /area/engine/engineering) "cfI" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -16087,14 +16081,14 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/hop) "cgd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/grid/steel, @@ -16226,11 +16220,13 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "cgY" = ( @@ -16243,10 +16239,10 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -16297,10 +16293,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -16486,13 +16482,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/port/aft) "civ" = ( @@ -16527,10 +16523,10 @@ /turf/open/floor/prison, /area/security/prison) "ciR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -16900,10 +16896,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ @@ -16958,11 +16954,11 @@ /turf/open/floor/plating, /area/maintenance/starboard) "clD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "clH" = ( @@ -16983,8 +16979,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -17172,7 +17168,7 @@ /area/crew_quarters/heads/hop) "cmE" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /turf/open/floor/plating, @@ -17259,8 +17255,8 @@ dir = 2 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/aft) "cnt" = ( @@ -17644,10 +17640,10 @@ icon_state = "4-8" }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -17848,8 +17844,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -18183,7 +18179,7 @@ /area/library) "csn" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ @@ -18192,7 +18188,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "cso" = ( @@ -18306,10 +18302,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -18324,13 +18320,13 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "csR" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -18504,10 +18500,10 @@ /turf/open/floor/carpet/red, /area/security/detectives_office) "ctW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/purple, @@ -18520,7 +18516,7 @@ /turf/open/floor/iron, /area/engine/engineering) "cub" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -18535,8 +18531,8 @@ /area/aisat) "cun" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -18552,18 +18548,18 @@ /turf/open/floor/wood, /area/medical/exam_room) "cuB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/security/main) "cuL" = ( @@ -18800,10 +18796,10 @@ dir = 4 }, /obj/machinery/door/window/northright, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -19124,8 +19120,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port) @@ -19414,11 +19410,11 @@ /turf/open/floor/iron, /area/hallway/primary/central) "cyM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, @@ -19450,10 +19446,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/construction/mining/aux_base) @@ -19570,10 +19566,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -19792,8 +19788,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) "cAC" = ( @@ -19841,8 +19837,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/customs) @@ -19873,8 +19869,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -20157,8 +20153,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "cCr" = ( @@ -20175,12 +20171,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/quartermaster/exploration_prep) "cCt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -20218,8 +20214,8 @@ /area/maintenance/port) "cCI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron{ dir = 1; icon_state = "chapel" @@ -20895,9 +20891,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "cFO" = ( @@ -21219,10 +21212,6 @@ /obj/structure/closet/emcloset/anchored, /obj/machinery/light/small, /obj/effect/turf_decal/bot, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -26; - pixel_y = 2 - }, /turf/open/floor/iron, /area/engine/engineering) "cHi" = ( @@ -21273,8 +21262,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/quartermaster/office) @@ -21700,7 +21689,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -21732,8 +21721,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "cJE" = ( @@ -21866,7 +21855,7 @@ /area/crew_quarters/dorms) "cKY" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/wood, @@ -21881,10 +21870,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -21899,8 +21888,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -21912,8 +21901,8 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -21938,7 +21927,7 @@ /turf/open/floor/plating, /area/maintenance/port) "cLP" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -21964,10 +21953,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -22280,15 +22269,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "cOc" = ( @@ -22337,10 +22317,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -22358,7 +22338,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "cOB" = ( @@ -22366,8 +22346,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -22398,7 +22378,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -22414,7 +22394,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron, @@ -22424,7 +22404,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron, @@ -22657,7 +22637,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron, /area/science/xenobiology) "cQz" = ( @@ -22730,8 +22710,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "cRn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment{ dir = 1 @@ -22861,7 +22841,7 @@ icon_state = "0-4" }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/plating, /area/science/xenobiology) "cSg" = ( @@ -22879,7 +22859,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/xenobiology) "cSh" = ( @@ -22908,10 +22887,10 @@ c_tag = "Central Hallway - Fore Starboard"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -22920,8 +22899,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "cSC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) @@ -22931,12 +22910,12 @@ req_access_txt = "12" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/library) "cSI" = ( -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "cSL" = ( /obj/machinery/door/airlock/research{ @@ -22959,10 +22938,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -22973,17 +22952,21 @@ /turf/open/floor/iron, /area/science/robotics/lab) "cST" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet/grimy, -/area/tcommsat/computer) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "cSV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/port) @@ -23016,8 +22999,8 @@ /obj/structure/sign/departments/minsky/engineering/engineering{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -23226,8 +23209,8 @@ /turf/open/floor/iron, /area/security/checkpoint/science/research) "cUb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -23330,8 +23313,8 @@ /turf/open/floor/iron, /area/maintenance/port) "cVx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -23404,10 +23387,10 @@ /obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/utility/radiation, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -23537,10 +23520,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -23706,12 +23689,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "cYF" = ( @@ -23719,8 +23696,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -23744,8 +23721,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -23861,10 +23838,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -23874,7 +23851,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/transit_tube) @@ -23911,7 +23888,7 @@ /obj/effect/turf_decal/edges/borderfloor{ dir = 4 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "dar" = ( /obj/structure/table/reinforced, @@ -24044,10 +24021,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24226,10 +24203,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -24377,10 +24354,10 @@ "dcG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -24448,10 +24425,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -24657,7 +24634,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/plating, @@ -24743,8 +24720,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -24803,10 +24780,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/extinguisher_cabinet{ @@ -24859,10 +24836,10 @@ /turf/open/floor/plating, /area/science/lab) "dhn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -24891,7 +24868,7 @@ /turf/open/space, /area/space/nearstation) "dhw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "N2 to Pure" @@ -25071,12 +25048,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "djn" = ( @@ -25267,10 +25238,10 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/internals, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -25385,10 +25356,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -25409,7 +25380,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -25576,10 +25547,10 @@ /turf/open/floor/carpet/grimy, /area/library) "dnN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25592,7 +25563,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/circuit/green, @@ -25604,8 +25575,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "dod" = ( @@ -25636,8 +25607,8 @@ /area/construction/mining/aux_base) "doo" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "dov" = ( @@ -25737,10 +25708,10 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -25769,8 +25740,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/teleporter) "dqp" = ( @@ -25778,10 +25749,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -25936,10 +25907,10 @@ /turf/open/floor/iron, /area/science/misc_lab/range) "drF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -26151,7 +26122,7 @@ /turf/open/floor/iron, /area/crew_quarters/heads/hor) "dts" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -26226,9 +26197,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "due" = ( @@ -26251,10 +26219,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -26388,8 +26356,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/mixing) @@ -26423,10 +26391,10 @@ c_tag = "Atmospherics - Distro Loop"; name = "atmospherics camera" }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/iron/dark/corner, /area/engine/atmos) "dvZ" = ( @@ -26442,8 +26410,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -26539,8 +26507,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) @@ -26561,10 +26529,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -26604,10 +26572,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -26709,10 +26674,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "dyi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -26782,12 +26747,22 @@ /area/maintenance/port) "dzh" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "dzi" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/port) +"dzj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "dzt" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -26813,7 +26788,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -26948,8 +26923,8 @@ pixel_x = -38; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, @@ -26963,8 +26938,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "dAk" = ( @@ -27012,10 +26987,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/space, @@ -27149,13 +27124,13 @@ /turf/open/floor/iron, /area/science/robotics/lab) "dAP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/firealarm/directional/north, @@ -27173,8 +27148,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -27184,7 +27159,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -27368,8 +27343,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/security/main) "dDn" = ( @@ -27853,10 +27828,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -27883,10 +27858,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -27949,9 +27924,6 @@ icon_state = "0-8" }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 9 - }, /turf/open/floor/plating, /area/science/server) "dHt" = ( @@ -27964,10 +27936,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -28012,8 +27984,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/central) "dHV" = ( @@ -28078,10 +28050,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -28103,10 +28075,8 @@ /turf/open/floor/iron, /area/science/storage) "dIF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) @@ -28178,10 +28148,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -28337,14 +28307,14 @@ /area/science/storage) "dKe" = ( /obj/machinery/rnd/server, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "dKg" = ( /obj/machinery/rnd/server, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -28508,8 +28478,8 @@ pixel_x = 26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -28608,10 +28578,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28711,10 +28681,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -28739,12 +28709,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "dNf" = ( @@ -28811,9 +28775,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "dNC" = ( @@ -28863,10 +28824,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -28938,9 +28899,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/maintenance/port/aft) "dOb" = ( @@ -28962,8 +28920,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "dOo" = ( @@ -29015,7 +28973,7 @@ id = "executionfireblast" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -29248,7 +29206,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "dQB" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/plating, @@ -29291,10 +29249,10 @@ req_access_txt = "27" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -29402,10 +29360,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -29659,11 +29617,13 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dUH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "dUM" = ( @@ -29754,7 +29714,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -29798,7 +29758,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -29808,8 +29768,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -29841,10 +29801,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark/smooth_half{ @@ -29856,8 +29816,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dWM" = ( @@ -29950,12 +29911,9 @@ }, /area/chapel/main) "dXJ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/advanced_airlock_controller/directional/east, /turf/open/floor/plating, /area/security/main) "dXL" = ( @@ -30008,10 +29966,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -30096,8 +30054,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "dZj" = ( @@ -30233,7 +30191,7 @@ /obj/item/newspaper, /obj/item/pen/red, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood{ broken = 1 }, @@ -30331,10 +30289,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -30354,7 +30312,7 @@ /area/chapel/main) "ebi" = ( /obj/effect/turf_decal/siding/wideplating_new/dark, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "ebk" = ( @@ -30371,12 +30329,18 @@ }, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ebm" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ebn" = ( @@ -30471,10 +30435,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -30569,10 +30533,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -30635,8 +30599,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -30660,10 +30624,10 @@ /turf/open/floor/iron/dark, /area/chapel/office) "edT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -30744,7 +30708,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -30758,10 +30722,10 @@ /area/maintenance/starboard) "eew" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -30793,8 +30757,8 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -30943,21 +30907,16 @@ /turf/open/space, /area/solar/port/aft) "ega" = ( -/obj/machinery/advanced_airlock_controller/directional/west, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, /turf/open/floor/plating, /area/science/shuttledock) "egd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -30987,8 +30946,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "egB" = ( @@ -31024,8 +30983,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "egQ" = ( @@ -31129,18 +31088,18 @@ /area/maintenance/port/fore) "ehL" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) "ehM" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31166,10 +31125,8 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -31256,17 +31213,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron, /area/tcommsat/server) "ejo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -31291,17 +31248,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/space, /area/space/nearstation) "ejE" = ( /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -31311,10 +31268,10 @@ /turf/closed/wall, /area/medical/medbay/aft) "ekb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31327,13 +31284,13 @@ /turf/open/floor/iron, /area/maintenance/department/science) "ekC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -31372,10 +31329,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -31430,7 +31387,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "elV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) @@ -31485,10 +31442,10 @@ }, /area/ai_monitored/security/armory) "emU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -31539,10 +31496,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -31560,12 +31517,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "enV" = ( @@ -31594,8 +31545,8 @@ /area/security/checkpoint/science/research) "epa" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31724,7 +31675,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/vacant_room/commissary) @@ -31741,9 +31692,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light_switch{ pixel_x = 12; @@ -31764,7 +31712,7 @@ /area/medical/patients_rooms) "erv" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -31811,10 +31759,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -31830,10 +31778,10 @@ /turf/open/floor/iron/dark, /area/gateway) "etf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ @@ -31868,10 +31816,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -31922,10 +31870,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -31947,10 +31895,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/airalarm/directional/east, @@ -32030,10 +31978,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -32043,8 +31991,8 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -32108,8 +32056,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/aft) "evS" = ( @@ -32117,10 +32065,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -32165,8 +32113,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -32191,10 +32139,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -32224,10 +32172,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -32237,10 +32185,10 @@ dir = 1 }, /obj/effect/landmark/start/chaplain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/carpet, @@ -32263,11 +32211,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) @@ -32281,12 +32226,12 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "exE" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, +/obj/machinery/air_sensor/toxins_burn_chamber, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "exO" = ( @@ -32300,8 +32245,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "exW" = ( @@ -32337,8 +32282,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/central) "eyj" = ( @@ -32399,10 +32344,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -32425,10 +32370,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -32441,8 +32386,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -32450,7 +32395,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -32485,10 +32430,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -32523,16 +32468,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/science/research) "eAZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/green, @@ -32562,10 +32507,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "eBr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -32601,10 +32546,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/medical) "eCm" = ( @@ -32630,7 +32575,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32642,10 +32587,10 @@ /turf/open/floor/iron, /area/quartermaster/exploration_prep) "eCH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -32668,8 +32613,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -32715,13 +32660,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -32822,10 +32767,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -32898,7 +32843,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -32908,10 +32853,10 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -32976,7 +32921,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "eHX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -32988,13 +32933,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/maintenance/port/aft) "eIo" = ( @@ -33004,7 +32949,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -33015,21 +32960,21 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "eIu" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) "eIA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, @@ -33043,10 +32988,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/royalblue, @@ -33056,10 +33001,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -33078,8 +33023,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -33088,7 +33033,7 @@ /turf/open/floor/iron, /area/security/brig) "eJc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "eJd" = ( @@ -33100,8 +33045,8 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -33126,10 +33071,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -33149,8 +33094,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33160,8 +33105,8 @@ /area/hallway/secondary/entry) "eKE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/machinery/light{ dir = 4 @@ -33172,9 +33117,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -33212,12 +33154,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "eLq" = ( @@ -33236,10 +33172,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -33289,8 +33225,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "eMu" = ( @@ -33320,10 +33256,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -33343,10 +33279,10 @@ /turf/open/floor/iron, /area/engine/storage_shared) "eNP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -33356,13 +33292,20 @@ icon_state = "1-2" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/maintenance/port) +"eOe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port) "eOi" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -33373,8 +33316,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, /area/maintenance/port) @@ -33382,7 +33325,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "eOw" = ( @@ -33401,8 +33344,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/grunge{ name = "Morgue"; req_one_access_txt = "5" @@ -33410,7 +33353,7 @@ /turf/open/floor/iron, /area/medical/morgue) "ePf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -33424,9 +33367,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -33436,8 +33376,8 @@ req_access_txt = "12" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/storage/tools) @@ -33448,8 +33388,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -33457,10 +33397,10 @@ /area/maintenance/port/fore) "ePA" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33493,10 +33433,10 @@ "ePM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -33515,10 +33455,10 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "ePY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -33581,8 +33521,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/medical) "eRo" = ( @@ -33598,22 +33538,21 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/aft) "eRJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/crew_quarters/dorms) "eRL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "eSj" = ( @@ -33624,19 +33563,15 @@ pixel_y = -22 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "eSx" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -33662,17 +33597,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "eTe" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/white, @@ -33693,10 +33628,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -33704,8 +33639,8 @@ /area/quartermaster/miningoffice) "eUb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -33744,12 +33679,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "eUF" = ( @@ -33807,10 +33736,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -33849,10 +33778,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -33866,7 +33795,9 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "eWM" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -33902,10 +33833,10 @@ /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "eXK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral{ @@ -34008,10 +33939,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/security/main) "eZn" = ( @@ -34045,10 +33972,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34058,8 +33985,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -34089,6 +34016,16 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/crew_quarters/heads/hos) +"eZR" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "fab" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34110,8 +34047,8 @@ req_access_txt = "38" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/lawoffice) @@ -34129,8 +34066,8 @@ "faT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -34141,10 +34078,10 @@ pixel_x = 26; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34167,15 +34104,15 @@ /turf/open/floor/iron, /area/hallway/primary/central) "fbp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/main) "fbw" = ( @@ -34187,8 +34124,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library) @@ -34215,10 +34152,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -34252,10 +34189,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -34267,7 +34204,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "fcx" = ( /obj/structure/disposalpipe/segment{ @@ -34276,7 +34215,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_edge{ @@ -34288,8 +34227,8 @@ /turf/open/floor/plating, /area/maintenance/port) "fdI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/bridge) "fdQ" = ( @@ -34323,7 +34262,7 @@ /area/engine/break_room) "fes" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -34339,16 +34278,16 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/bridge/meeting_room/council) "feR" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -34370,10 +34309,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -34431,13 +34370,13 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -34450,7 +34389,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -34468,10 +34407,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34483,10 +34422,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral{ @@ -34522,10 +34461,7 @@ "fhb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -34557,10 +34493,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -34572,10 +34508,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -34596,8 +34532,8 @@ dir = 2 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/aft) "fiW" = ( @@ -34623,15 +34559,6 @@ "fjg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port) "fju" = ( @@ -34725,8 +34652,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -34749,8 +34676,6 @@ name = "Telecomms Server Room"; req_access_txt = "61" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor/iron_smooth, /area/tcommsat/server) "fkr" = ( @@ -34778,8 +34703,8 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room/council) "fkA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -34797,10 +34722,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -34810,8 +34735,8 @@ /area/science/misc_lab/range) "fkQ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -34819,10 +34744,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34837,7 +34762,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34882,7 +34807,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/item/radio/intercom{ @@ -34898,24 +34823,26 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) "fly" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "flT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -34925,8 +34852,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -34952,11 +34881,17 @@ }, /turf/open/floor/iron/freezer, /area/security/prison) +"fms" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/carpet/grimy, +/area/tcommsat/computer) "fmt" = ( /turf/open/floor/plating, /area/maintenance/department/medical/central) "fmM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -34976,8 +34911,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "foD" = ( @@ -35012,10 +34947,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35033,8 +34968,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -35066,10 +35001,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -35079,10 +35014,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -35106,15 +35041,15 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "fqB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -35123,20 +35058,6 @@ "fqN" = ( /turf/open/floor/iron/freezer, /area/security/prison) -"fqT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/port/aft) "frd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -35155,8 +35076,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, @@ -35174,8 +35095,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -35216,8 +35137,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -35229,17 +35150,17 @@ /area/crew_quarters/heads/cmo) "fsz" = ( /obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_y = 26 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35255,10 +35176,10 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ @@ -35271,10 +35192,10 @@ /turf/open/floor/iron, /area/engine/storage) "ftJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -35287,10 +35208,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -35306,8 +35227,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/aft) "fuJ" = ( @@ -35323,7 +35244,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/white, @@ -35333,8 +35254,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -35346,7 +35267,7 @@ /obj/structure/reflector/double/anchored{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35403,10 +35324,10 @@ /obj/machinery/conveyor_switch{ id = "SciLoad" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/purple, @@ -35414,18 +35335,18 @@ /area/science/shuttledock) "fwU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "fxd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -35442,8 +35363,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "fxk" = ( @@ -35458,17 +35379,19 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "fxp" = ( /obj/machinery/vending/coffee, /turf/open/floor/iron/dark, /area/security/courtroom) "fxq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -35482,7 +35405,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35495,7 +35418,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/landmark/start/geneticist, @@ -35516,10 +35439,10 @@ /turf/open/floor/iron, /area/medical/medbay/lobby) "fyj" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) "fyp" = ( @@ -35542,8 +35465,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/courtroom) @@ -35559,10 +35482,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -35593,8 +35516,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "fzL" = ( @@ -35649,8 +35572,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "fBf" = ( @@ -35659,10 +35582,10 @@ /turf/open/floor/iron, /area/science/storage) "fBs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35771,10 +35694,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -35796,10 +35719,10 @@ /obj/effect/turf_decal/pool{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35817,8 +35740,8 @@ id_tag = "Dorm6"; name = "Cabin 6" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/crew_quarters/dorms) "fDz" = ( @@ -35827,12 +35750,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -35850,8 +35767,8 @@ /obj/item/radio/intercom{ pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/wood, @@ -35861,8 +35778,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -35875,7 +35792,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light, @@ -35893,10 +35810,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison, @@ -35922,10 +35839,10 @@ "fFn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -35957,8 +35874,8 @@ /turf/open/floor/iron/white, /area/science/research) "fGD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -35992,10 +35909,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -36025,10 +35942,10 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -36039,8 +35956,8 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) "fHD" = ( @@ -36167,13 +36084,8 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "fHV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fIk" = ( @@ -36186,8 +36098,8 @@ c_tag = "Arrivals Hallway - Bar"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -36240,10 +36152,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -36265,8 +36177,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "fKE" = ( @@ -36276,7 +36188,7 @@ /turf/open/floor/iron, /area/storage/primary) "fKN" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -36287,8 +36199,8 @@ /turf/open/floor/iron, /area/engine/atmos) "fKY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ dir = 8 @@ -36308,10 +36220,10 @@ "fLv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -36320,10 +36232,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -36333,10 +36245,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -36373,10 +36285,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -36416,15 +36328,15 @@ /turf/open/floor/iron, /area/science/robotics/lab) "fMS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "fMV" = ( @@ -36451,10 +36363,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/smooth_large, @@ -36466,10 +36378,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -36510,7 +36422,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -36523,10 +36435,10 @@ c_tag = "Engineering Hallway - Starboard"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -36576,10 +36488,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -36598,10 +36510,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -36616,7 +36528,7 @@ /area/hallway/secondary/exit/departure_lounge) "fOZ" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/space, @@ -36634,10 +36546,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -36655,15 +36567,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/hallway/secondary/entry) "fPq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -36671,8 +36584,8 @@ /area/crew_quarters/fitness/recreation) "fPr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow, @@ -36689,10 +36602,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/research/glass{ @@ -36729,9 +36642,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -36752,7 +36665,7 @@ /turf/open/floor/iron, /area/security/checkpoint/escape) "fQC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -36761,7 +36674,7 @@ /turf/open/floor/iron, /area/science/xenobiology) "fQD" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -36791,10 +36704,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -36805,8 +36718,8 @@ /turf/closed/wall, /area/medical/morgue) "fRQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "fSj" = ( @@ -36829,10 +36742,10 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36840,28 +36753,11 @@ /area/medical/patients_rooms) "fSA" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/textured, /area/ai_monitored/security/armory) -"fSE" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "fTd" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -36892,10 +36788,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -36909,15 +36805,15 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "fTq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -36925,10 +36821,10 @@ /area/science/xenobiology) "fTw" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -36937,10 +36833,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -36966,8 +36862,8 @@ /turf/open/floor/iron/dark, /area/bridge) "fTY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -37008,7 +36904,7 @@ /area/security/checkpoint/science/research) "fUs" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -37045,11 +36941,11 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "fVj" = ( @@ -37062,18 +36958,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/gateway) "fVm" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37086,8 +36982,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -37122,7 +37018,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -37148,8 +37044,8 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -37173,7 +37069,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "fWI" = ( /obj/structure/cable/yellow, @@ -37230,21 +37128,21 @@ /area/maintenance/aft) "fXH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/tools) "fXP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37261,8 +37159,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -37283,10 +37181,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -37312,8 +37210,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -37335,24 +37233,15 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "fYS" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -37389,20 +37278,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "fZU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37413,8 +37302,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -37430,7 +37319,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 8 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "gaz" = ( /obj/structure/closet/firecloset, @@ -37460,10 +37349,10 @@ /area/library) "gaU" = ( /obj/effect/turf_decal/pool, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37477,11 +37366,10 @@ /turf/open/floor/iron/dark, /area/bridge) "gbe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/main) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "gbh" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 1 @@ -37499,10 +37387,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -37525,8 +37413,8 @@ /area/quartermaster/warehouse) "gbT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light{ dir = 4 @@ -37543,7 +37431,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/reagent_dispensers/peppertank{ @@ -37558,7 +37446,7 @@ /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -37580,9 +37468,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "gbY" = ( @@ -37590,18 +37475,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/central) "gcb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37622,7 +37507,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -37649,7 +37534,7 @@ /turf/open/floor/plating, /area/quartermaster/storage) "gcE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37665,8 +37550,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage_shared) "gcL" = ( @@ -37679,8 +37564,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -37688,13 +37573,13 @@ /area/maintenance/port) "gdd" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/machinery/meter, @@ -37716,10 +37601,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/royalblue, @@ -37730,8 +37615,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/quartermaster/warehouse) "gdM" = ( @@ -37772,7 +37657,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/iron, /area/medical/patients_rooms) "gfu" = ( @@ -37793,9 +37678,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; @@ -37825,11 +37707,11 @@ icon_state = "2-4" }, /mob/living/simple_animal/bot/secbot/pingsky, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/ai_monitored/turret_protected/aisat_interior) "ggk" = ( @@ -37880,8 +37762,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37915,10 +37797,8 @@ /area/science/nanite) "ghY" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -37934,10 +37814,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -37947,7 +37827,7 @@ /area/hallway/secondary/command) "giD" = ( /obj/structure/chair/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron{ @@ -37962,8 +37842,8 @@ /obj/item/radio/intercom{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -37986,10 +37866,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -38001,10 +37881,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "gjQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -38017,8 +37897,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -38034,10 +37914,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/space, @@ -38066,10 +37946,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -38130,10 +38010,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -38167,10 +38047,10 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -38195,10 +38075,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -38214,10 +38094,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "goz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -38255,7 +38135,7 @@ /area/ai_monitored/security/armory) "goT" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - filter_type = "n2"; + filter_type = list(/datum/gas/nitrogen); name = "nitrogen filter" }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -38275,10 +38155,10 @@ /area/crew_quarters/locker) "gpu" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -38288,10 +38168,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -38308,7 +38188,7 @@ /area/maintenance/department/science) "gpR" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1423; @@ -38322,10 +38202,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -38349,10 +38229,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -38379,17 +38259,17 @@ /turf/open/floor/iron, /area/engine/atmos) "gqY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/wood, /area/security/detectives_office) "gqZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -38444,10 +38324,10 @@ c_tag = "Bridge - Command Chair"; name = "command camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/royalblue, @@ -38463,10 +38343,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -38521,7 +38401,7 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "grN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/security/main) "grZ" = ( @@ -38534,7 +38414,7 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "gsp" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /turf/open/floor/iron, @@ -38555,15 +38435,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "gsU" = ( @@ -38595,8 +38466,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -38617,10 +38488,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -38650,10 +38521,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -38670,10 +38541,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -38686,8 +38557,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -38697,8 +38568,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, @@ -38709,8 +38580,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -38749,10 +38620,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -38790,8 +38661,8 @@ pixel_y = -4; req_access_txt = "30" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "gwp" = ( @@ -38812,10 +38683,10 @@ dir = 8 }, /obj/machinery/door/window/southleft, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -38834,10 +38705,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -38850,7 +38721,7 @@ /turf/open/floor/iron, /area/quartermaster/exploration_prep) "gwH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron{ @@ -38872,8 +38743,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "gwW" = ( @@ -38921,10 +38792,10 @@ /turf/open/floor/plating, /area/security/checkpoint/customs) "gxK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -38945,8 +38816,8 @@ /area/quartermaster/office) "gyj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, @@ -38967,7 +38838,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/machinery/power/apc/auto_name/directional/north{ areastring = "/area/engine/supermatter" }, @@ -38980,10 +38851,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -38994,10 +38865,10 @@ "gyC" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -39026,10 +38897,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -39038,10 +38909,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -39059,10 +38930,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron, @@ -39109,8 +38980,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -39121,22 +38992,27 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/mixingchamber{ +/obj/machinery/airalarm{ pixel_y = 24; dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "gAP" = ( /obj/item/beacon, /obj/structure/disposalpipe/segment{ @@ -39167,18 +39043,18 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "gBU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/dead_body_placer, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -39225,8 +39101,8 @@ /area/hallway/primary/aft) "gDZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -39242,10 +39118,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -39254,10 +39130,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -39310,17 +39186,17 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/science/misc_lab) "gFg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -39342,10 +39218,10 @@ /turf/open/floor/iron, /area/quartermaster/exploration_prep) "gFB" = ( -/obj/machinery/computer/atmos_control/tank/mix_tank{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -39368,8 +39244,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port) "gGU" = ( @@ -39382,10 +39258,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -39412,10 +39288,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -39429,15 +39305,25 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/warehouse) +"gHK" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "gIg" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -39455,8 +39341,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "gIr" = ( @@ -39618,10 +39504,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -39666,10 +39552,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -39677,11 +39563,8 @@ "gJV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -39783,10 +39666,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/landmark/xeno_spawn, @@ -39816,10 +39699,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "gNg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39859,10 +39742,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -39881,7 +39764,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hor) "gNU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) @@ -39895,9 +39778,6 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "gOp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/firealarm/directional/east, /obj/machinery/light{ dir = 4 @@ -40105,8 +39985,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -40124,10 +40004,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/space, @@ -40144,9 +40024,6 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "gPI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/escape) @@ -40155,7 +40032,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -40164,8 +40041,8 @@ name = "Captain's Desk"; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "gQb" = ( @@ -40181,10 +40058,10 @@ /turf/open/floor/iron, /area/maintenance/aft) "gQh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "gQs" = ( @@ -40192,8 +40069,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "gQG" = ( @@ -40209,8 +40086,8 @@ req_one_access_txt = "1;56" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/engineering) @@ -40276,10 +40153,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -40301,7 +40178,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "gSB" = ( @@ -40322,7 +40199,7 @@ /turf/open/floor/iron/dark, /area/chapel/office) "gTm" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, /turf/open/floor/iron/dark/textured_half, @@ -40334,10 +40211,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -40347,8 +40224,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "gTF" = ( @@ -40356,8 +40233,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -40424,8 +40301,8 @@ pixel_x = -26 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -40444,8 +40321,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "gVr" = ( @@ -40459,7 +40336,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/openup{ @@ -40488,10 +40365,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -40504,16 +40381,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/aft) "gWa" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /turf/open/floor/plating{ @@ -40545,9 +40422,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/firealarm/directional/south, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -40575,10 +40449,10 @@ icon_state = "2-4" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -40633,15 +40507,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) "gYq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -40651,8 +40525,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/smooth_large, @@ -40671,10 +40545,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -40684,19 +40558,17 @@ /area/maintenance/port/fore) "gZo" = ( /obj/structure/closet/toolcloset, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/construction/mining/aux_base) "gZp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -40732,10 +40604,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "gZL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -40752,12 +40624,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/engine/engineering) "had" = ( @@ -40777,10 +40643,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -40796,10 +40662,10 @@ id = "bridgedoors"; name = "Bridge Access Blast Door" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -40826,19 +40692,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "hbC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -40916,7 +40784,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -40935,10 +40803,10 @@ /turf/open/floor/iron/dark, /area/security/main) "hcP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -40985,10 +40853,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -41029,8 +40897,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -41045,10 +40913,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -41067,10 +40935,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -41136,7 +41004,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "hfT" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -41144,8 +41012,8 @@ /area/science/xenobiology) "hgb" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -41175,10 +41043,10 @@ /turf/open/floor/carpet/grimy, /area/bridge/showroom/corporate) "hgn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -41188,10 +41056,10 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -41201,16 +41069,16 @@ /area/hallway/primary/central) "hgR" = ( /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_corner, /area/security/main) "hgU" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -41220,11 +41088,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - initial_gas_mix = "o2=0.01;n2=0.01;TEMP=2.7"; - initial_temperature = 2.7; - luminosity = 2 - }, +/turf/open/floor/plating, /area/security/main) "hha" = ( /obj/machinery/vending/coffee, @@ -41267,10 +41131,10 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41285,12 +41149,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -41334,10 +41192,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -41365,14 +41223,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/port/fore) +"hjc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "hje" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/abandoned, @@ -41382,10 +41250,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -41402,8 +41270,8 @@ icon_state = "1-2" }, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -41463,10 +41331,10 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/warehouse) @@ -41494,14 +41362,14 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "hlo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "hlG" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown{ dir = 4 }, @@ -41511,10 +41379,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -41551,12 +41419,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "hme" = ( @@ -41571,7 +41433,7 @@ /turf/open/floor/iron/dark/corner, /area/engine/atmos) "hmz" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -41585,16 +41447,16 @@ id_tag = "Dorm5"; name = "Cabin 5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "hmT" = ( /obj/structure/table, /obj/item/clipboard, /obj/item/toy/figure/scientist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 }, @@ -41614,10 +41476,10 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -41631,8 +41493,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -41701,19 +41563,19 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/science/mixing) "hov" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41740,22 +41602,22 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/gravity_generator) "hoy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -41775,7 +41637,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) "hpl" = ( @@ -41787,10 +41649,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -41822,22 +41684,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/cryopods) "hqf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/dark/textured_half, /area/maintenance/disposal/incinerator) "hqo" = ( @@ -41885,10 +41747,10 @@ /turf/open/floor/iron, /area/teleporter) "hrg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -41900,7 +41762,7 @@ /obj/structure/reflector/double/anchored{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -41939,15 +41801,15 @@ /turf/open/floor/iron, /area/maintenance/starboard) "hsB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/sign/warning/securearea{ pixel_x = -32 }, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "hsE" = ( @@ -41984,8 +41846,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) @@ -41998,10 +41860,10 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -42023,10 +41885,10 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42073,12 +41935,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/maintenance/solars/starboard/fore) "hvk" = ( @@ -42089,7 +41945,7 @@ /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "hvE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -42176,8 +42032,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -42197,10 +42053,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -42209,10 +42065,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -42241,8 +42097,8 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "hyz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -42251,8 +42107,8 @@ id_tag = "Dorm2"; name = "Cabin 2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "hzc" = ( @@ -42264,7 +42120,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -42317,7 +42173,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -42349,7 +42205,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "CO2 to Pure" @@ -42362,10 +42218,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -42395,8 +42251,8 @@ /turf/open/floor/iron/dark, /area/engine/transit_tube) "hCG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -42416,7 +42272,7 @@ /area/hallway/primary/central) "hCW" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -42463,10 +42319,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -42534,8 +42390,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "hEF" = ( @@ -42555,33 +42411,34 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "hFh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/locker) "hFo" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/space, -/area/space/nearstation) +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmospherics_engine) "hFt" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42591,10 +42448,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/iron, /area/maintenance/port/fore) "hFD" = ( @@ -42630,10 +42487,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42647,8 +42504,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -42658,7 +42515,7 @@ /turf/open/floor/iron/white, /area/medical/virology) "hGJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -42667,7 +42524,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/main) "hGU" = ( @@ -42689,8 +42546,14 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) +"hHr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/maintenance/port/aft) "hHG" = ( /obj/structure/chair/office{ dir = 1 @@ -42759,8 +42622,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "hIW" = ( @@ -42782,7 +42645,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -42818,21 +42681,21 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, /turf/open/floor/iron/white, /area/science/mixing) "hKe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "hKf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42869,20 +42732,20 @@ "hKo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/storage) "hKr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42929,10 +42792,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -42941,12 +42804,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "hLe" = ( @@ -43020,8 +42878,9 @@ /area/quartermaster/storage) "hMb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 2 + }, /turf/open/floor/iron, /area/engine/gravity_generator) "hMg" = ( @@ -43033,28 +42892,28 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "hMo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/shuttledock) "hMK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -43071,10 +42930,10 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wood, @@ -43084,10 +42943,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -43117,8 +42976,8 @@ icon_state = "1-2" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "hNE" = ( @@ -43138,10 +42997,10 @@ /turf/closed/wall, /area/vacant_room/office) "hNP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -43154,7 +43013,7 @@ dir = 4; name = "Distro to Waste" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -43171,10 +43030,10 @@ icon_state = "4-8" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -43190,8 +43049,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "hOz" = ( @@ -43207,7 +43066,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/crew_quarters/dorms) "hOP" = ( @@ -43232,8 +43091,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -43263,10 +43122,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -43288,10 +43147,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -43301,8 +43160,8 @@ /obj/structure/sign/painting/library{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/library) "hPH" = ( @@ -43422,8 +43281,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "hRS" = ( @@ -43445,8 +43304,8 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "hSc" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/disposalpipe/sorting/mail/destination/research{ dir = 1 @@ -43463,10 +43322,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -43492,7 +43351,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) "hSN" = ( @@ -43506,8 +43364,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -43523,7 +43381,7 @@ /turf/open/floor/iron/dark, /area/chapel/office) "hSW" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -43532,8 +43390,8 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "hTa" = ( @@ -43544,8 +43402,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -43607,9 +43465,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/delivery, @@ -43651,21 +43510,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, /area/hallway/secondary/entry) "hUb" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "hUi" = ( @@ -43673,7 +43535,7 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) "hUj" = ( @@ -43685,8 +43547,8 @@ /obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "hUq" = ( @@ -43694,10 +43556,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -43749,13 +43611,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron, /area/tcommsat/server) "hVM" = ( /obj/effect/turf_decal/tile/purple{ @@ -43784,10 +43643,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -43809,10 +43668,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -43839,10 +43698,10 @@ /turf/closed/wall/mineral/plastitanium, /area/security/main) "hWO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -43891,8 +43750,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -43917,10 +43776,10 @@ pixel_y = 32 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -43945,10 +43804,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -43961,10 +43820,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43991,10 +43850,10 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "hZo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -44066,7 +43925,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -44082,21 +43941,21 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/starboard) "iba" = ( /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -44111,10 +43970,10 @@ /area/hallway/secondary/entry) "ibc" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -44130,10 +43989,10 @@ dir = 4 }, /obj/machinery/door/window/southright, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -44155,7 +44014,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "ibE" = ( /obj/effect/decal/cleanable/dirt, @@ -44176,8 +44037,8 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -44207,8 +44068,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -44219,8 +44080,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -44239,8 +44100,8 @@ /area/medical/medbay/central) "icH" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/teleporter) "icI" = ( @@ -44249,11 +44110,11 @@ icon_state = "2-4" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron, /area/maintenance/port) @@ -44265,10 +44126,10 @@ c_tag = "Science - Port"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ @@ -44281,8 +44142,8 @@ /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "icZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -44316,10 +44177,10 @@ pixel_x = -26; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -44330,10 +44191,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -44356,13 +44217,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "iew" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/dark/textured_half, /area/maintenance/disposal/incinerator) "ieP" = ( @@ -44386,10 +44245,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -44406,10 +44265,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -44441,10 +44300,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "igr" = ( @@ -44455,8 +44310,8 @@ c_tag = "Central Hallway - Port"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -44492,15 +44347,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "ihB" = ( @@ -44510,8 +44356,8 @@ /obj/item/storage/pod{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -44520,8 +44366,8 @@ "ihY" = ( /obj/effect/turf_decal/bot, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "ihZ" = ( @@ -44536,7 +44382,7 @@ }, /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -44579,10 +44425,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44607,13 +44453,13 @@ /turf/open/floor/iron, /area/crew_quarters/kitchen) "ijv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ dir = 4 }, /turf/open/floor/engine, @@ -44647,8 +44493,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -44675,10 +44521,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -44688,10 +44534,10 @@ /obj/structure/sign/poster/official/work_for_a_future{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -44707,8 +44553,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "ikD" = ( @@ -44732,10 +44578,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -44784,8 +44630,8 @@ /obj/item/clothing/glasses/meson{ pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "ilJ" = ( @@ -44796,16 +44642,16 @@ /turf/open/floor/glass/reinforced, /area/hallway/secondary/entry) "ilN" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "ilS" = ( @@ -44814,8 +44660,8 @@ /turf/open/floor/iron, /area/engine/storage_shared) "ilY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -44841,7 +44687,7 @@ weaponscheck = 1 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/textured, /area/ai_monitored/security/armory) "imf" = ( @@ -44876,16 +44722,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "imy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/airalarm/directional/west, @@ -44904,8 +44750,8 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "inr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -44931,10 +44777,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -44944,15 +44790,15 @@ /area/hallway/primary/starboard) "ioj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) "ios" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -45026,8 +44872,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/tech) "iqo" = ( @@ -45084,8 +44930,8 @@ /area/ai_monitored/security/armory) "iqY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -45093,8 +44939,8 @@ /area/maintenance/starboard/aft) "irs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45105,35 +44951,35 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/space, /area/space/nearstation) "iry" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "irE" = ( /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) "irK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -45170,13 +45016,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -45212,10 +45058,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -45232,8 +45078,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) @@ -45261,10 +45107,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -45355,19 +45201,19 @@ /area/security/checkpoint/supply) "iwl" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "iwv" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -45376,10 +45222,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -45391,7 +45237,7 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "iwT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45413,18 +45259,18 @@ /turf/open/floor/iron, /area/security/checkpoint) "ixg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/bridge/showroom/corporate) "ixi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -45456,10 +45302,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -45484,7 +45330,7 @@ "ixQ" = ( /obj/effect/landmark/start/scientist, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -45493,10 +45339,10 @@ /turf/open/floor/iron, /area/science/misc_lab) "ixR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "iya" = ( @@ -45537,8 +45383,8 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45602,8 +45448,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "izq" = ( @@ -45659,20 +45505,20 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "iBt" = ( /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -45696,16 +45542,16 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "iBI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "iBJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -45730,10 +45576,10 @@ /obj/structure/sign/plaques/kiddie/library{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -45759,9 +45605,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "iDG" = ( @@ -45772,10 +45615,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -45789,10 +45632,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -45839,8 +45682,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "iEs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "iEL" = ( @@ -45856,8 +45699,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/starboard/fore) @@ -45878,7 +45721,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -45896,19 +45739,19 @@ /turf/open/floor/iron, /area/engine/break_room) "iFu" = ( -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -45917,7 +45760,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "iFO" = ( @@ -45954,10 +45797,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -46055,8 +45898,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/aft) "iIh" = ( @@ -46076,6 +45919,14 @@ }, /turf/open/floor/iron, /area/medical/break_room) +"iIJ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "iIM" = ( /obj/machinery/light{ dir = 8 @@ -46092,10 +45943,10 @@ /turf/open/floor/carpet/grimy, /area/library) "iIX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/yellow{ @@ -46127,10 +45978,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -46144,8 +45995,8 @@ req_one_access_txt = "32;19" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/transit_tube) @@ -46160,8 +46011,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "iJy" = ( @@ -46208,7 +46059,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "iKU" = ( @@ -46222,10 +46073,10 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "iLk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -46238,8 +46089,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "iLE" = ( @@ -46258,10 +46109,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -46295,8 +46143,8 @@ /area/science/robotics/lab) "iMk" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/storage/tools) @@ -46348,7 +46196,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 @@ -46378,13 +46226,13 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmospherics_engine) "iOH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "iPd" = ( @@ -46394,10 +46242,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -46427,10 +46275,8 @@ pixel_x = 3; pixel_y = 8 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 26; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46454,14 +46300,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "iPK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -46493,8 +46338,8 @@ /area/medical/patients_rooms) "iQy" = ( /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "iQF" = ( @@ -46531,8 +46376,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) "iSf" = ( @@ -46569,17 +46414,17 @@ "iSR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "iSZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -46589,10 +46434,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -46602,8 +46447,8 @@ /area/crew_quarters/dorms) "iTK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -46644,7 +46489,7 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "iUS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -46659,8 +46504,8 @@ /turf/open/floor/iron/dark, /area/security/prison) "iUW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -46676,11 +46521,11 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -46703,8 +46548,8 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/department/science) "iWC" = ( @@ -46720,8 +46565,8 @@ /turf/open/floor/iron/white, /area/medical/surgery) "iWK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /obj/structure/disposalpipe/segment{ dir = 1 @@ -46736,8 +46581,8 @@ /area/medical/patients_rooms) "iWS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron{ dir = 8; icon_state = "chapel" @@ -46764,8 +46609,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "iXu" = ( @@ -46781,10 +46626,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -46794,10 +46639,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/red, @@ -46808,10 +46653,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -46829,10 +46674,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, @@ -46863,8 +46708,8 @@ /area/security/prison) "iYS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple{ dir = 8 }, @@ -46898,12 +46743,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "jaj" = ( @@ -46922,8 +46761,8 @@ "jan" = ( /obj/structure/chair/wood, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron{ dir = 8; icon_state = "chapel" @@ -46981,11 +46820,17 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/engine/break_room) +"jbk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet/grimy, +/area/tcommsat/computer) "jbl" = ( /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/lawoffice) "jbo" = ( @@ -47034,7 +46879,7 @@ /turf/open/floor/iron/dark, /area/security/main) "jbZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -47048,7 +46893,7 @@ /turf/open/floor/iron, /area/medical/morgue) "jci" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -47059,10 +46904,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -47104,7 +46949,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -47179,8 +47024,8 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) @@ -47199,10 +47044,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "jfy" = ( @@ -47212,8 +47057,8 @@ /obj/effect/turf_decal/pool{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 10 @@ -47230,10 +47075,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -47241,10 +47086,10 @@ /area/crew_quarters/bar) "jfX" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/extinguisher_cabinet{ @@ -47257,10 +47102,10 @@ icon_state = "4-8" }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -47272,10 +47117,10 @@ /turf/open/floor/iron, /area/crew_quarters/kitchen) "jgw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -47307,10 +47152,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -47320,8 +47165,8 @@ /area/maintenance/port/aft) "jgX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -47350,10 +47195,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -47364,8 +47209,8 @@ "jho" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "jhp" = ( @@ -47394,7 +47239,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -47420,10 +47265,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -47463,10 +47308,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -47477,7 +47322,7 @@ /turf/open/floor/iron/dark, /area/library) "jjk" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -47533,8 +47378,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) @@ -47543,10 +47388,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/white, @@ -47562,7 +47407,7 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -47614,16 +47459,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) "jmH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -47690,10 +47535,10 @@ "jnP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -47720,18 +47565,18 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) "joH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -47763,8 +47608,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -47809,13 +47654,9 @@ /turf/open/floor/carpet/royalblue, /area/bridge) "jpy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jpJ" = ( @@ -47840,10 +47681,7 @@ /turf/open/floor/plating, /area/quartermaster/qm) "jqk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -47857,10 +47695,10 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -47872,8 +47710,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) "jqH" = ( @@ -47890,9 +47728,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "jqR" = ( @@ -47912,13 +47747,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -47933,7 +47768,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -47949,8 +47784,8 @@ /area/crew_quarters/theatre) "jrt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -47967,22 +47802,21 @@ /area/medical/morgue) "jrz" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "jrN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "server vent" - }, /obj/machinery/camera/directional/east{ c_tag = "Science - Server Room"; name = "science camera" }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "jrT" = ( @@ -48026,11 +47860,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -48039,10 +47873,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -48052,10 +47886,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -48109,7 +47943,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/main) "juQ" = ( @@ -48188,7 +48022,7 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "jwz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -48204,8 +48038,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "jwP" = ( @@ -48233,10 +48067,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "jxM" = ( @@ -48257,8 +48088,8 @@ /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "jyu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "jzm" = ( @@ -48272,10 +48103,10 @@ icon_state = "2-8" }, /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -48306,12 +48137,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port) "jzY" = ( @@ -48319,7 +48144,7 @@ dir = 8 }, /obj/machinery/portable_thermomachine, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -48348,20 +48173,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "jAi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -48424,10 +48243,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -48450,17 +48269,17 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmospherics_engine) "jBl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -48509,10 +48328,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -48524,10 +48343,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -48577,15 +48396,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) "jCt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -48616,10 +48435,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -48642,7 +48461,7 @@ /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "jDk" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /obj/structure/chair/office{ @@ -48681,8 +48500,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/black/filled/warning{ dir = 9 }, @@ -48693,10 +48512,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/space, @@ -48708,8 +48527,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "jDx" = ( @@ -48767,10 +48586,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/security/main) "jEN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -48789,10 +48608,10 @@ /obj/item/clothing/glasses/meson/engine, /obj/structure/table/reinforced, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/catwalk_floor/iron, @@ -48813,10 +48632,10 @@ /turf/open/floor/iron, /area/maintenance/starboard) "jFR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -48842,10 +48661,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -48858,7 +48677,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -48919,8 +48738,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/bridge/showroom/corporate) "jJu" = ( @@ -48964,19 +48783,6 @@ }, /turf/open/floor/iron, /area/engine/storage) -"jKr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/engine/engineering) "jKs" = ( /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -49005,15 +48811,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, /area/bridge) "jKM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; name = "Unfiltered & Air to Mix" @@ -49036,8 +48842,8 @@ c_tag = "Central Hallway - Aft Port"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -49063,8 +48869,8 @@ "jMF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -49098,10 +48904,10 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -49144,8 +48950,8 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "jNx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) @@ -49154,10 +48960,10 @@ name = "Security E.V.A. Storage"; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -49179,10 +48985,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/wideplating_new/dark, @@ -49199,8 +49005,8 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "jOx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "jOQ" = ( @@ -49242,10 +49048,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison/dark, @@ -49265,14 +49071,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -49293,17 +49098,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, /area/security/main) "jQx" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -49351,10 +49156,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/surgery) "jRv" = ( @@ -49422,10 +49227,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -49452,10 +49257,10 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -49464,8 +49269,8 @@ /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -49524,10 +49329,10 @@ /turf/closed/wall/r_wall, /area/medical/storage) "jUh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -49543,8 +49348,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/aft) @@ -49552,8 +49357,8 @@ /obj/effect/turf_decal/plaque{ icon_state = "L13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "jUR" = ( @@ -49568,20 +49373,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "jVd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/item/reagent_containers/cup/glass/bottle/whiskey, @@ -49614,8 +49419,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage_shared) "jVD" = ( @@ -49631,12 +49436,12 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/service) "jVL" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron, /area/medical/patients_rooms) "jVM" = ( @@ -49648,10 +49453,10 @@ req_access_txt = "3" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -49666,10 +49471,10 @@ /turf/open/floor/iron/dark, /area/security/warden) "jVW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -49696,8 +49501,8 @@ icon_state = "1-2" }, /obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/black/filled/line{ dir = 4 }, @@ -49710,20 +49515,20 @@ /area/crew_quarters/locker) "jWQ" = ( /obj/structure/reflector/box/anchored, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "jWU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -49758,18 +49563,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark/textured, /area/security/prison) "jXQ" = ( /obj/machinery/door/airlock/external, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/techmaint, /area/science/shuttledock) @@ -49812,10 +49615,10 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -49826,7 +49629,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -49835,13 +49638,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -49913,10 +49716,10 @@ /area/security/prison) "jZE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -49940,8 +49743,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "kaj" = ( @@ -49952,7 +49755,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; name = "N2 to Airmix" @@ -49990,6 +49793,15 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) +"kaE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "kaJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -50066,8 +49878,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -50082,10 +49894,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -50102,10 +49914,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -50119,10 +49931,10 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "kcQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/courtroom) "kcR" = ( @@ -50132,7 +49944,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -50146,8 +49958,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50165,10 +49977,10 @@ "kdh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50185,15 +49997,15 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "kdo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -50212,15 +50024,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/science/xenobiology) "kdu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -50237,10 +50049,10 @@ name = "medbay camera" }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -50259,13 +50071,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "kdY" = ( @@ -50306,10 +50118,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -50323,8 +50135,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "kfH" = ( @@ -50333,25 +50145,16 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "kfL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -50393,7 +50196,7 @@ /area/security/brig) "kfR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -50402,10 +50205,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -50436,10 +50239,10 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "kgo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -50493,10 +50296,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "khh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -50514,8 +50317,8 @@ icon_state = "1-2" }, /obj/structure/barricade/wooden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "khr" = ( @@ -50525,8 +50328,8 @@ /turf/open/floor/iron, /area/science/robotics/mechbay) "khv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -50619,10 +50422,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -50639,7 +50442,7 @@ /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "kjF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -50648,10 +50451,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison/shielded) "kjM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -50669,10 +50472,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -50704,7 +50507,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -50713,7 +50516,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/white, @@ -50740,10 +50543,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -50763,7 +50566,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50772,7 +50575,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -50795,22 +50598,22 @@ /turf/open/floor/iron, /area/science/research) "klc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, /turf/open/floor/iron/dark/textured_half, /area/maintenance/disposal/incinerator) "klf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -50823,13 +50626,13 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "klr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "klv" = ( @@ -50852,7 +50655,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -50888,8 +50691,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "knj" = ( @@ -50899,8 +50702,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -50910,22 +50713,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "knr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue{ @@ -50940,10 +50740,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/royalblue, @@ -50955,18 +50755,18 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) "knY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/morgue{ @@ -50976,7 +50776,10 @@ /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_prep) "koj" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8; + initialize_directions = 8 + }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/science/server) @@ -51008,10 +50811,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -51023,11 +50826,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/storage) @@ -51045,10 +50848,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "kpI" = ( @@ -51108,7 +50909,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron, @@ -51144,7 +50945,7 @@ "ksc" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51183,13 +50984,13 @@ /turf/open/floor/plating, /area/janitor/custodian) "kso" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -51241,10 +51042,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -51259,8 +51060,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -51282,10 +51083,10 @@ pixel_y = -26 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -51304,10 +51105,10 @@ "kuE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/storage) @@ -51319,13 +51120,10 @@ /turf/open/floor/iron, /area/engine/atmos) "kuZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/storage) "kvc" = ( @@ -51334,7 +51132,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -51348,10 +51146,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -51411,10 +51209,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -51429,10 +51227,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -51442,10 +51240,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -51466,8 +51264,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/light_switch{ pixel_x = -20; @@ -51497,10 +51295,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -51512,10 +51310,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -51529,10 +51327,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "kzw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -51545,14 +51343,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "kzH" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron, /area/science/research) @@ -51635,10 +51433,10 @@ /area/lawoffice) "kCi" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -51671,8 +51469,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "kCW" = ( @@ -51682,10 +51480,10 @@ /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -51700,10 +51498,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -51719,10 +51517,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -51736,10 +51531,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -51766,13 +51561,13 @@ /area/vacant_room/commissary) "kDX" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/science/xenobiology) "kEk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green, @@ -51796,10 +51591,10 @@ /turf/open/floor/iron/checker, /area/engine/atmos) "kEs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -51846,7 +51641,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_edge{ @@ -51884,7 +51679,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/circuit/green, @@ -51907,10 +51702,10 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -51920,8 +51715,8 @@ c_tag = "Arrivals Hallway - Center"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -51988,7 +51783,7 @@ dir = 8 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52002,10 +51797,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -52017,10 +51812,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52031,18 +51826,18 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "kIf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "kIu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -52064,10 +51859,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -52082,10 +51877,10 @@ /turf/open/floor/iron/dark, /area/library) "kJj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52123,8 +51918,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "kJx" = ( @@ -52162,6 +51957,16 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/prison, /area/security/prison) +"kKB" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "kKE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52178,10 +51983,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/circuit/green, @@ -52202,10 +52007,10 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -52243,18 +52048,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/gateway) "kMj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -52270,8 +52075,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -52286,17 +52091,17 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "kNg" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/dark/textured, /area/maintenance/disposal/incinerator) "kNE" = ( /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -52307,8 +52112,8 @@ /area/hallway/primary/starboard) "kNI" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/destination/virology{ dir = 4 }, @@ -52390,10 +52195,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52444,7 +52249,7 @@ pixel_y = -26 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -52466,10 +52271,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -52531,6 +52336,19 @@ }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) +"kSW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/security/main) "kSY" = ( /obj/machinery/telecomms/broadcaster/preset_exploration, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -52546,8 +52364,8 @@ /area/ai_monitored/turret_protected/aisat_interior) "kTs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -52575,8 +52393,8 @@ c_tag = "Departures Hallway - Center"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -52622,10 +52440,10 @@ "kUG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52660,10 +52478,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hallway/primary/central) @@ -52689,10 +52507,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -52709,18 +52527,18 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard) "kXk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -52777,10 +52595,10 @@ color = "#666666" }, /obj/effect/landmark/start/librarian, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52797,10 +52615,10 @@ /turf/open/floor/plating, /area/security/execution/transfer) "kZb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -52816,7 +52634,7 @@ }, /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/mapping_helpers/atmos_auto_connect, -/obj/machinery/airalarm/server{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -22 }, @@ -52826,7 +52644,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -52866,8 +52684,8 @@ "laZ" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "lbb" = ( @@ -52880,8 +52698,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52889,10 +52707,10 @@ /area/crew_quarters/heads/chief) "lbk" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -52917,10 +52735,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -52939,16 +52757,16 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "lbV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/starboard/aft) "lcB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -52984,12 +52802,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "ldx" = ( @@ -53009,7 +52821,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "N2O to Pure" @@ -53031,32 +52843,23 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/aft) -"ldQ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/advanced_airlock_controller/directional/west, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating, -/area/security/main) "ldW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -53084,10 +52887,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -53109,15 +52912,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "lfl" = ( @@ -53125,10 +52919,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -53140,7 +52934,7 @@ }, /obj/effect/landmark/start/scientist, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -53161,10 +52955,10 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -53209,8 +53003,8 @@ /area/medical/morgue) "lgJ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -53227,16 +53021,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) "lha" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -53249,10 +53043,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/bar/flip{ @@ -53265,10 +53059,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -53356,7 +53150,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -53391,7 +53185,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 1 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "ljy" = ( /obj/item/kirbyplants/random, @@ -53430,10 +53224,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -53462,8 +53256,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/starboard/fore) @@ -53475,10 +53269,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -53486,6 +53280,9 @@ "lkM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/server) "lkU" = ( @@ -53524,8 +53321,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron/dark, /area/security/main) @@ -53539,10 +53336,10 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -53569,8 +53366,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -53601,10 +53398,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "lmI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -53649,10 +53446,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -53670,10 +53467,10 @@ /area/engine/break_room) "loX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "lpi" = ( @@ -53702,9 +53499,6 @@ name = "Supply Dock Airlock"; req_access_txt = "31" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "lpu" = ( @@ -53713,8 +53507,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "lpX" = ( @@ -53724,10 +53518,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -53759,12 +53553,12 @@ /turf/open/floor/prison, /area/security/prison) "lqt" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "lqu" = ( @@ -53774,10 +53568,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -53807,10 +53601,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -53841,10 +53635,10 @@ c_tag = "Central Hallway - Aft"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -53949,10 +53743,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -53987,10 +53781,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "lty" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -54034,10 +53828,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -54049,10 +53843,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -54091,10 +53885,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "luQ" = ( @@ -54104,7 +53898,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair/office, @@ -54113,17 +53907,17 @@ }, /area/security/main) "lvd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) "lve" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -54148,9 +53942,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light_switch{ pixel_x = 12; @@ -54194,10 +53985,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "lwA" = ( @@ -54209,8 +54000,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -54223,11 +54014,11 @@ /turf/open/floor/iron, /area/medical/chemistry) "lwF" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -54240,6 +54031,16 @@ /obj/structure/sign/departments/minsky/medical/medical2, /turf/open/floor/plating, /area/medical/medbay/lobby) +"lwP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "lwT" = ( /obj/structure/window/reinforced{ dir = 1; @@ -54249,7 +54050,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/item/stack/rods{ amount = 23 }, @@ -54302,7 +54103,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -54333,9 +54134,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "lyx" = ( @@ -54393,8 +54191,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/tech) "lzq" = ( @@ -54410,26 +54208,14 @@ /area/science/shuttledock) "lzy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/medical/medbay/lobby) -"lzA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "lzH" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -54440,10 +54226,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -54458,10 +54244,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -54492,10 +54278,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -54517,10 +54303,7 @@ /area/crew_quarters/heads/hor) "lAo" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -54555,7 +54338,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/wood, /area/bridge/showroom/corporate) @@ -54573,7 +54356,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -54606,10 +54389,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -54618,7 +54398,7 @@ /turf/open/floor/iron, /area/maintenance/port) "lDf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -54638,7 +54418,7 @@ /area/medical/morgue) "lDX" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/open/floor/plating, @@ -54648,7 +54428,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -54681,22 +54461,18 @@ pixel_y = -22 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "lEB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/chair/fancy/bench{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "lEW" = ( @@ -54718,8 +54494,8 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "lFi" = ( @@ -54727,8 +54503,8 @@ /turf/open/floor/iron, /area/maintenance/aft) "lFj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -54763,7 +54539,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "lFY" = ( @@ -54894,10 +54670,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -54931,10 +54707,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral{ @@ -54961,10 +54737,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -54991,10 +54767,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -55025,8 +54801,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -55048,10 +54824,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/threatre/flip, @@ -55062,10 +54838,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -55087,7 +54863,7 @@ /area/medical/genetics/cloning) "lKh" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/white, @@ -55132,17 +54908,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "lLk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55159,17 +54935,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/service) "lLC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet/grimy, @@ -55182,23 +54958,24 @@ /turf/open/floor/iron, /area/medical/genetics/cloning) "lLS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/security/main) "lMb" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable{ @@ -55212,8 +54989,8 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55247,14 +55024,14 @@ /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "lMT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "lNi" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -55271,8 +55048,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "lNs" = ( @@ -55283,8 +55060,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -55293,8 +55070,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -55365,8 +55142,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "lOI" = ( @@ -55422,10 +55199,10 @@ }, /obj/item/folder/yellow, /obj/item/stamp/quartermaster, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55439,10 +55216,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -55503,7 +55280,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -55522,14 +55299,19 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) +"lRr" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "lRs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -55544,21 +55326,21 @@ /obj/effect/turf_decal/plaque{ icon_state = "L1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "lRS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint) "lRY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_edge{ @@ -55577,10 +55359,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -55609,10 +55391,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55620,12 +55402,12 @@ /area/crew_quarters/heads/chief) "lSu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/main) "lSx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/wood, /area/bridge/showroom/corporate) @@ -55636,10 +55418,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -55651,10 +55433,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55683,10 +55465,10 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -55698,10 +55480,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55727,10 +55509,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -55827,10 +55609,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -55860,10 +55642,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -55872,7 +55654,7 @@ /turf/open/floor/iron, /area/maintenance/department/science) "lVU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron{ @@ -55906,22 +55688,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"lWt" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) "lXf" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -55929,10 +55695,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -55980,8 +55746,8 @@ /turf/open/floor/iron, /area/science/misc_lab/range) "lXR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -55993,7 +55759,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/kirbyplants/random, @@ -56012,8 +55778,8 @@ /turf/open/floor/plating, /area/security/warden) "lYq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/courtroom) "lYA" = ( @@ -56041,10 +55807,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -56072,8 +55838,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "lZy" = ( @@ -56128,10 +55894,10 @@ "mbL" = ( /obj/machinery/light, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -56174,8 +55940,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/research) @@ -56208,10 +55974,10 @@ "mcL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -56249,8 +56015,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/locker) @@ -56282,8 +56048,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "meE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56299,10 +56065,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "meG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -56314,10 +56080,10 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -56345,10 +56111,12 @@ icon_state = "0-4" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "mff" = ( @@ -56362,14 +56130,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/central) "mfu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/storage) @@ -56396,10 +56164,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -56416,10 +56184,10 @@ req_access_txt = "58" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -56463,10 +56231,10 @@ req_access_txt = "19" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -56478,15 +56246,15 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "mgZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -56521,29 +56289,13 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"mit" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/engineering) "miw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -56554,7 +56306,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/smooth_edge, @@ -56580,10 +56332,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -56605,14 +56357,14 @@ /area/engine/atmospherics_engine) "mjp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hallway/primary/aft) "mjr" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/iron, /area/science/xenobiology) "mjz" = ( @@ -56662,8 +56414,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "mkM" = ( @@ -56726,8 +56478,8 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "mlD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment{ dir = 6 @@ -56748,6 +56500,13 @@ }, /turf/open/floor/iron/white, /area/medical/genetics) +"mlT" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "mlV" = ( /obj/structure/window/reinforced{ dir = 8 @@ -56797,13 +56556,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -56828,10 +56587,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/prison/dark, /area/security/prison) "mny" = ( @@ -56860,16 +56619,16 @@ /turf/open/floor/iron/dark, /area/gateway) "mnK" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "mnL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "mnX" = ( @@ -56891,10 +56650,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -56933,7 +56692,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -56956,10 +56715,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -56991,16 +56750,16 @@ /area/maintenance/department/science) "mpc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) "mpj" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mpk" = ( @@ -57017,10 +56776,10 @@ /area/maintenance/department/medical/central) "mpw" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -57039,10 +56798,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/junction/flip, @@ -57083,10 +56842,10 @@ pixel_x = 32; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -57097,8 +56856,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -57114,10 +56873,10 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -57132,10 +56891,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -57163,13 +56922,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -57213,8 +56972,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -57231,7 +56990,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -57242,8 +57001,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/aft) "msz" = ( @@ -57261,8 +57020,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "msI" = ( @@ -57295,10 +57053,10 @@ /area/security/prison) "mtF" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -57336,10 +57094,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -57351,10 +57109,10 @@ /turf/open/floor/iron/dark, /area/bridge) "mva" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/engine{ @@ -57367,8 +57125,8 @@ icon_state = "1-2" }, /obj/machinery/vending/cigarette, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/black/filled/line{ dir = 4 }, @@ -57380,10 +57138,10 @@ }, /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -57408,18 +57166,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/port) "mwL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -57483,8 +57241,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "mzb" = ( @@ -57499,8 +57257,8 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -57515,14 +57273,14 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/quartermaster/exploration_prep) "mzB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -57591,10 +57349,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -57604,8 +57362,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port) @@ -57648,13 +57406,13 @@ /turf/closed/wall, /area/hydroponics) "mCr" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -57706,10 +57464,10 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -57719,10 +57477,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -57746,10 +57504,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -57757,8 +57515,8 @@ "mEg" = ( /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/science/mixing/chamber) "mEw" = ( @@ -57769,10 +57527,10 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, @@ -57852,8 +57610,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "mFx" = ( @@ -57863,10 +57621,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -57906,10 +57664,10 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -57948,10 +57706,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -57960,7 +57718,7 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "mGz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -57969,10 +57727,7 @@ /area/hydroponics) "mGD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -58028,10 +57783,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -58076,10 +57831,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -58107,7 +57862,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_edge, /area/security/main) "mIs" = ( @@ -58128,8 +57883,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "mIO" = ( @@ -58139,10 +57894,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -58160,10 +57915,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mIT" = ( @@ -58187,11 +57942,11 @@ /area/security/main) "mJy" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "mJD" = ( @@ -58206,8 +57961,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "mJE" = ( @@ -58227,21 +57982,21 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "mJW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "mJY" = ( @@ -58255,10 +58010,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/grunge{ @@ -58276,8 +58031,8 @@ /obj/item/radio/intercom{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light{ dir = 4 @@ -58316,9 +58071,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/security/brig) "mLH" = ( @@ -58343,10 +58096,10 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -58356,10 +58109,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -58379,10 +58132,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -58401,8 +58154,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -58427,7 +58180,7 @@ /turf/open/floor/iron, /area/quartermaster/office) "mNn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -58435,7 +58188,7 @@ /area/security/prison) "mNo" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -58461,11 +58214,11 @@ /turf/open/floor/iron, /area/engine/engineering) "mOy" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "mOH" = ( @@ -58476,8 +58229,8 @@ color = "#666666" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -58486,8 +58239,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -58511,8 +58264,8 @@ dir = 4 }, /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -58524,7 +58277,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -58552,10 +58305,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -58570,10 +58323,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -58678,8 +58431,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -58724,8 +58477,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -58739,10 +58492,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -58751,10 +58504,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -58795,7 +58548,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "mUt" = ( /obj/machinery/computer/telecomms/monitor{ @@ -58829,10 +58584,10 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "mVn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -58843,7 +58598,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "mVF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -58870,10 +58625,10 @@ /area/crew_quarters/bar/atrium) "mWd" = ( /obj/structure/closet/toolcloset, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, @@ -58902,7 +58657,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -58913,8 +58668,8 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -58940,7 +58695,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -58955,8 +58710,8 @@ /turf/open/floor/iron, /area/gateway) "mXf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58966,10 +58721,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -59003,12 +58758,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/maintenance/port/aft) "mXr" = ( @@ -59016,8 +58765,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_edge{ @@ -59034,10 +58783,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/catwalk_floor/iron, @@ -59060,7 +58809,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "mYm" = ( @@ -59070,7 +58819,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -59127,7 +58876,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white/side, /area/security/brig/medbay) "mZu" = ( @@ -59142,19 +58891,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/starboard) "mZv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -59167,8 +58913,8 @@ id_tag = "Dorm4"; name = "Cabin 4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "mZI" = ( @@ -59185,16 +58931,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) -"mZS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "mZU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -59240,10 +58976,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -59252,20 +58988,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/catwalk_floor/iron_smooth, /area/tcommsat/server) "nbL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -59275,10 +59007,10 @@ /area/security/brig) "nbM" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59316,8 +59048,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, @@ -59344,10 +59076,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59356,8 +59088,8 @@ "ndd" = ( /obj/effect/landmark/start/paramedic, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/aft) "ndj" = ( @@ -59369,10 +59101,10 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -59386,10 +59118,10 @@ /area/medical/genetics) "ndr" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -59408,10 +59140,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -59420,10 +59152,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -59466,10 +59198,10 @@ pixel_x = -26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59479,17 +59211,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/royalblue, /area/ai_monitored/turret_protected/aisat_interior) "neQ" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison, @@ -59503,7 +59235,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -59539,10 +59271,10 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "nfB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -59588,8 +59320,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -59629,10 +59361,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59645,10 +59377,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59658,9 +59390,6 @@ /turf/open/floor/iron/dark, /area/science/nanite) "nhn" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -59668,8 +59397,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 10 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "nhq" = ( @@ -59721,10 +59453,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -59733,10 +59465,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -59759,8 +59491,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/aft) @@ -59796,14 +59528,13 @@ /turf/open/floor/iron/dark, /area/library) "nja" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59825,8 +59556,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -59842,7 +59573,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "njx" = ( /obj/effect/turf_decal/siding/wood, @@ -59855,7 +59588,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -59872,10 +59605,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59896,10 +59629,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -59934,12 +59667,6 @@ name = "External Docking Port"; req_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -59968,26 +59695,26 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) "nlZ" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "nmc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -60000,8 +59727,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) @@ -60054,14 +59781,14 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "nmW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "nnq" = ( @@ -60085,9 +59812,11 @@ icon_state = "0-4" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) @@ -60118,7 +59847,7 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -60156,10 +59885,10 @@ /turf/open/floor/iron/checker/other, /area/engine/break_room) "noE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -60181,26 +59910,25 @@ "npf" = ( /obj/machinery/door/airlock/external, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/iron/techmaint, /area/science/shuttledock) "npi" = ( -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ +/obj/machinery/computer/atmos_control/oxygen_tank{ dir = 8 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/engine/atmos) "npn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -60223,8 +59951,8 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "npW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -60237,8 +59965,8 @@ /obj/effect/turf_decal/plaque{ icon_state = "L14" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "nqi" = ( @@ -60274,17 +60002,17 @@ /area/bridge) "nqU" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/security/brig/medbay) "nrc" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/smooth_edge{ @@ -60353,13 +60081,11 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, /area/tcommsat/server) "nrX" = ( /obj/structure/table/reinforced, @@ -60388,7 +60114,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60398,8 +60124,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hallway/primary/central) @@ -60415,9 +60141,7 @@ req_access_txt = "61" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -60438,35 +60162,13 @@ "nsR" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) -"nsW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/arrivals_external{ - name = "Arrivals Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "ntb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60482,8 +60184,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ntB" = ( @@ -60513,10 +60215,10 @@ /obj/structure/sign/departments/minsky/engineering/engineering{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -60525,10 +60227,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "ntQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -60537,7 +60239,7 @@ /turf/open/floor/prison, /area/security/prison) "nub" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/sign/warning/securearea{ pixel_x = -32 }, @@ -60548,8 +60250,8 @@ c_tag = "Atmospherics - Port"; name = "atmospherics camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "nug" = ( @@ -60572,7 +60274,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -60583,8 +60285,8 @@ }, /area/security/main) "nuG" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold, /turf/open/floor/iron/dark/telecomms, /area/science/server) "nuO" = ( @@ -60594,9 +60296,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, /area/tcommsat/server) "nuU" = ( /obj/structure/reagent_dispensers/watertank/high, @@ -60650,10 +60351,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60708,8 +60409,8 @@ /area/storage/tech) "nwB" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -60760,8 +60461,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -60772,20 +60473,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"nxk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/main) "nxD" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -60804,7 +60499,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 8 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "nxM" = ( /obj/structure/cable/yellow{ @@ -60819,8 +60514,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/fore) "nxN" = ( @@ -60835,10 +60530,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60857,7 +60552,7 @@ /turf/open/floor/iron, /area/security/checkpoint) "nyt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60885,10 +60580,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60939,10 +60634,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -60955,7 +60650,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60974,10 +60669,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -61016,10 +60711,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -61047,8 +60742,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -61060,6 +60755,14 @@ }, /turf/closed/wall, /area/security/brig/medbay) +"nBe" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "nBg" = ( /obj/machinery/light{ dir = 1 @@ -61067,10 +60770,10 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61090,8 +60793,8 @@ icon_state = "1-2" }, /mob/living/basic/cockroach, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "nBn" = ( @@ -61129,10 +60832,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -61152,8 +60855,8 @@ req_access_txt = "19; 61" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/tcommsat/computer) @@ -61187,10 +60890,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -61204,10 +60907,6 @@ pixel_y = -22 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "nCA" = ( @@ -61271,7 +60970,7 @@ c_tag = "Science - Fore"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/purple{ @@ -61283,8 +60982,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -61302,10 +61001,10 @@ /turf/open/floor/iron, /area/science/misc_lab/range) "nEi" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -61315,8 +61014,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) @@ -61334,7 +61033,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -61354,7 +61053,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/item/hand_labeler, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/security/detectives_office) "nEX" = ( @@ -61373,8 +61072,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/medical) "nFf" = ( @@ -61382,8 +61081,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -61402,10 +61101,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -61415,10 +61114,10 @@ /area/maintenance/port/fore) "nFJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -61435,21 +61134,21 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) "nGc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/shuttledock) "nGr" = ( @@ -61542,10 +61241,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/morgue) "nIs" = ( @@ -61556,8 +61255,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/genetics/cloning) "nIA" = ( @@ -61599,11 +61298,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -61630,10 +61329,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -61654,10 +61353,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -61668,6 +61367,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "nKb" = ( @@ -61689,10 +61391,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -61714,8 +61416,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -61757,25 +61459,25 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/aft) "nLK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "nLN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light{ @@ -61812,8 +61514,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/science/research) @@ -61825,10 +61527,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/genpop_interface{ @@ -61886,10 +61588,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -61924,10 +61626,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/prison, @@ -61972,16 +61674,16 @@ /obj/effect/turf_decal/tile/techfloor{ dir = 1 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "nPV" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -61992,10 +61694,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -62017,7 +61719,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -62054,10 +61756,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -62126,20 +61828,20 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, /area/security/detectives_office) "nSh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -62152,10 +61854,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -62175,8 +61877,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -62188,10 +61890,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -62206,10 +61908,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -62235,7 +61937,7 @@ }, /obj/effect/landmark/start/exploration, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet, @@ -62259,15 +61961,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "nUn" = ( @@ -62277,8 +61977,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/prison/dark, /area/security/prison) "nUw" = ( @@ -62333,10 +62033,10 @@ /area/security/checkpoint/science/research) "nVA" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -62361,10 +62061,10 @@ /turf/closed/wall/r_wall, /area/maintenance/department/medical/central) "nVY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -62377,10 +62077,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -62407,8 +62107,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -62503,10 +62203,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -62521,7 +62221,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -62535,10 +62235,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/service) "nZc" = ( @@ -62564,7 +62264,7 @@ /turf/open/floor/iron, /area/security/checkpoint/escape) "nZB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -62600,8 +62300,8 @@ }, /obj/item/folder/yellow, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/bridge/meeting_room/council) "oaf" = ( @@ -62609,10 +62309,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -62651,10 +62351,10 @@ icon_state = "1-8" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -62734,8 +62434,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -62807,8 +62507,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, @@ -62850,10 +62550,10 @@ pixel_y = 32 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -62869,10 +62569,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -62893,11 +62593,11 @@ /turf/closed/wall, /area/maintenance/starboard) "ogn" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "ogo" = ( @@ -62948,10 +62648,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -62990,7 +62690,7 @@ pixel_y = 26 }, /obj/effect/landmark/start/head_of_personnel, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -63003,8 +62703,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -63028,17 +62728,17 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "oiA" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "oiE" = ( @@ -63109,10 +62809,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -63125,8 +62825,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -63147,7 +62847,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "okL" = ( @@ -63167,10 +62867,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -63207,10 +62907,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -63226,21 +62926,18 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/wood, /area/quartermaster/exploration_prep) "omQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "omR" = ( @@ -63287,7 +62984,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/extinguisher_cabinet{ @@ -63355,9 +63052,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating, /area/security/main) "ooQ" = ( /obj/item/radio/intercom{ @@ -63368,10 +63063,10 @@ /area/library) "ooY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -63380,10 +63075,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "opj" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -63447,8 +63142,8 @@ /turf/open/floor/iron, /area/science/research) "oqn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63468,10 +63163,7 @@ /turf/open/floor/iron, /area/hallway/secondary/command) "oqH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -63480,8 +63172,8 @@ /turf/open/floor/iron/dark, /area/security/main) "oqL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -63492,8 +63184,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -63514,10 +63206,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -63526,8 +63218,8 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -63536,10 +63228,10 @@ /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -63574,8 +63266,8 @@ /turf/open/floor/plating, /area/maintenance/starboard) "ose" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -63595,10 +63287,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -63607,7 +63299,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -63619,10 +63311,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -63630,6 +63322,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"osE" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 2 + }, +/turf/open/floor/iron/dark, +/area/security/main) "osG" = ( /obj/structure/table, /obj/item/clipboard, @@ -63653,13 +63354,13 @@ req_access_txt = "57" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "otG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) @@ -63672,8 +63373,8 @@ /area/security/brig/medbay) "otY" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -63692,10 +63393,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -63718,8 +63419,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/toilet/auxiliary) "oux" = ( @@ -63730,10 +63431,10 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -63748,10 +63449,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -63769,8 +63470,8 @@ /area/quartermaster/miningoffice) "ova" = ( /obj/machinery/door/window/northright, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) @@ -63792,10 +63493,10 @@ /turf/open/space, /area/space/nearstation) "ovF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -63805,10 +63506,10 @@ /turf/open/floor/iron/white, /area/science/research) "ovG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -63821,10 +63522,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -63834,10 +63535,7 @@ /area/hallway/primary/starboard) "ovX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -63852,10 +63550,10 @@ /area/quartermaster/storage) "owr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -63863,8 +63561,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -63877,7 +63575,7 @@ /obj/effect/turf_decal/tile/techfloor{ dir = 4 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "owZ" = ( /obj/structure/cable/yellow{ @@ -63899,10 +63597,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -63927,18 +63625,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "oxq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -63970,10 +63662,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -63996,13 +63688,13 @@ /turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "oyz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -64053,7 +63745,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark/smooth_corner{ @@ -64100,10 +63792,10 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -64131,10 +63823,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -64151,13 +63843,13 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "oBU" = ( -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/computer/atmos_control/plasma_tank{ dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -64169,8 +63861,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -64249,10 +63941,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -64272,8 +63964,8 @@ "oDO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -64281,10 +63973,10 @@ /area/maintenance/starboard/aft) "oDS" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "oDX" = ( @@ -64301,10 +63993,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/black/filled/line{ @@ -64317,10 +64009,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -64350,9 +64042,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "oEF" = ( @@ -64364,10 +64053,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -64379,10 +64068,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -64393,7 +64082,7 @@ /area/engine/break_room) "oFe" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64423,8 +64112,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -64466,10 +64155,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -64499,10 +64188,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -64560,10 +64249,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/royalblue, @@ -64611,13 +64300,13 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "oJJ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "oJL" = ( @@ -64629,10 +64318,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison/dark, @@ -64687,10 +64376,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -64704,10 +64393,10 @@ req_access_txt = "27" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -64730,6 +64419,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "oLD" = ( @@ -64766,8 +64458,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron, /area/engine/break_room) @@ -64814,7 +64506,7 @@ /area/science/robotics/lab) "oMK" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -64831,8 +64523,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -64868,8 +64560,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -64888,8 +64580,8 @@ icon_state = "1-2" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/supply) @@ -64945,10 +64637,10 @@ /area/quartermaster/qm) "oOL" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/medbay{ @@ -64973,8 +64665,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "oPr" = ( @@ -64988,10 +64680,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -65015,10 +64707,10 @@ /area/security/brig) "oPW" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -65037,8 +64729,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/black/filled/line{ dir = 4 }, @@ -65087,10 +64779,10 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -65169,8 +64861,8 @@ /turf/open/floor/iron, /area/engine/engineering) "oRX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -65193,10 +64885,10 @@ /area/maintenance/port/aft) "oSO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -65213,10 +64905,10 @@ /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -65252,10 +64944,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -65263,8 +64955,8 @@ /area/ai_monitored/turret_protected/aisat_interior) "oUR" = ( /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -65307,9 +64999,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/firealarm/directional/south, /turf/open/floor/plating, /area/maintenance/solars/port/fore) @@ -65332,13 +65021,13 @@ /turf/open/floor/iron, /area/hallway/primary/central) "oVS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -65404,10 +65093,10 @@ /area/science/explab) "oXc" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -65432,8 +65121,8 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "oXI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -65460,8 +65149,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/main) "oYF" = ( @@ -65487,8 +65176,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -65544,10 +65233,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/curtain, @@ -65567,8 +65256,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "oZW" = ( @@ -65585,10 +65274,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -65601,17 +65290,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/central) "paK" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -65635,8 +65324,8 @@ /turf/open/floor/iron, /area/security/checkpoint/engineering) "pbq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -65656,8 +65345,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "pci" = ( @@ -65675,8 +65364,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/tech) "pcx" = ( @@ -65704,14 +65393,14 @@ name = "Cargo Cell"; req_one_access_txt = "1;57" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/supply) "pcG" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -65728,7 +65417,9 @@ icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "pcV" = ( /obj/effect/decal/cleanable/dirt, @@ -65755,21 +65446,21 @@ /obj/effect/turf_decal/stripes/openup{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/prison/dark, /area/security/prison) "peY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/curtain, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) @@ -65820,13 +65511,13 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/service) "pgj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron{ @@ -65839,8 +65530,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/lobby) "phg" = ( @@ -65884,17 +65575,17 @@ /obj/effect/turf_decal/pool{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "phC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, -/obj/machinery/meter/atmos/atmos_waste_loop, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/meter/monitored/waste_loop, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -65913,10 +65604,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -65925,10 +65616,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "pjz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -65998,10 +65689,10 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/pool/corner, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -66019,8 +65710,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -66028,10 +65719,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -66044,10 +65735,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "pkT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -66058,10 +65749,10 @@ }, /area/hallway/secondary/service) "pkW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -66076,19 +65767,13 @@ pixel_x = -32 }, /obj/effect/turf_decal/bot, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "ple" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -66120,10 +65805,10 @@ req_access_txt = "19" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -66142,17 +65827,17 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/security/prison) "pmh" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66165,10 +65850,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -66197,7 +65882,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -66209,8 +65894,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/light_switch{ pixel_x = 22 @@ -66238,8 +65923,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -66261,8 +65946,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/customs/auxiliary) "pnE" = ( @@ -66277,7 +65962,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -66287,10 +65972,10 @@ name = "Library Access" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -66301,10 +65986,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -66315,10 +66000,10 @@ pixel_y = -32 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -66327,8 +66012,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -66339,8 +66024,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -66387,8 +66072,8 @@ req_one_access_txt = "32;19" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/transit_tube) @@ -66399,10 +66084,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -66432,13 +66117,15 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -23 }, -/obj/structure/table, /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/clipboard, -/obj/item/wrench, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/mapping_helpers/atmos_auto_connect, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/server) "prw" = ( @@ -66473,10 +66160,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -66495,10 +66182,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -66522,10 +66209,10 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -66563,10 +66250,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -66585,10 +66272,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -66616,18 +66303,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/supply) "pun" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -66683,8 +66370,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/disposalpipe/segment{ dir = 2 @@ -66705,20 +66392,20 @@ /obj/item/radio/intercom{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/iron/dark/corner, /area/engine/atmos) "pvi" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -66727,10 +66414,10 @@ "pvm" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -66740,13 +66427,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/bot, @@ -66769,12 +66456,12 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/escape) "pvY" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -66832,8 +66519,8 @@ c_tag = "MiniSat Service Bay"; start_active = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/black/filled/line{ dir = 4 }, @@ -66850,11 +66537,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -66894,7 +66578,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/landmark/start/atmospheric_technician, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -66920,7 +66604,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -66948,13 +66632,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) "pzx" = ( @@ -66965,11 +66649,11 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 8 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "pzz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -66993,8 +66677,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -67026,10 +66710,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -67041,8 +66725,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -67057,9 +66741,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -67162,10 +66846,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -67191,7 +66875,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -67236,10 +66920,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/textured, @@ -67263,7 +66947,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/security/main) "pFt" = ( @@ -67290,10 +66973,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -67304,7 +66987,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -67318,13 +67001,13 @@ /area/quartermaster/miningoffice) "pFP" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/bot, @@ -67341,10 +67024,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -67354,7 +67037,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -67371,15 +67054,15 @@ /area/medical/medbay/central) "pFZ" = ( /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, /area/medical/break_room) "pGa" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -67400,10 +67083,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -67413,7 +67096,7 @@ "pGv" = ( /obj/structure/table/wood, /obj/item/food/cheesiehonkers, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -67440,10 +67123,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -67453,10 +67136,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -67529,24 +67212,26 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/science/mixing/chamber" + }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "pJp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/directional/east{ c_tag = "Departures Hallway - Fore"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/aft) "pJq" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/structure/window/reinforced{ @@ -67558,10 +67243,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -67626,10 +67311,10 @@ /area/medical/break_room) "pJT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -67679,10 +67364,10 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -67732,8 +67417,8 @@ "pKR" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "pLn" = ( @@ -67751,7 +67436,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -67761,26 +67446,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "pLZ" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) "pMe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 4 @@ -67794,8 +67477,8 @@ /obj/effect/turf_decal/pool{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 9 @@ -67847,10 +67530,10 @@ /turf/open/floor/iron/dark, /area/chapel/office) "pNH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -67884,16 +67567,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/customs/auxiliary) -"pOB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/quartermaster/storage) "pOK" = ( /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ @@ -67967,18 +67640,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "pPq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/library) "pPt" = ( @@ -67995,8 +67665,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68006,8 +67676,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "pQe" = ( @@ -68065,10 +67735,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -68113,7 +67783,7 @@ /turf/open/floor/iron, /area/science/robotics/lab) "pRC" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -68123,8 +67793,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -68135,10 +67805,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -68185,6 +67855,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/science/explab) +"pTO" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "pTQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -68198,8 +67875,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/quartermaster/sorting) @@ -68230,10 +67907,10 @@ icon_state = "4-8" }, /obj/effect/landmark/start/depsec/medical, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -68265,17 +67942,17 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/vacant_room/office) "pVe" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -68345,10 +68022,10 @@ /turf/open/floor/noslip/dark, /area/medical/genetics/cloning) "pWu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -68370,8 +68047,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/quartermaster/sorting) @@ -68392,10 +68069,10 @@ /area/bridge/showroom/corporate) "pXw" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -68413,10 +68090,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -68434,10 +68111,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -68476,8 +68153,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -68500,22 +68177,10 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/janitor) -"pZr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 30 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "pZv" = ( /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -68554,7 +68219,9 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "qaN" = ( /obj/machinery/door/poddoor/preopen{ @@ -68568,8 +68235,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -68616,10 +68283,10 @@ /area/security/detectives_office) "qbX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -68628,10 +68295,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "qcj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -68667,8 +68334,8 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68681,10 +68348,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -68712,7 +68379,7 @@ dir = 4 }, /obj/effect/turf_decal/siding/wideplating/dark, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "qdW" = ( @@ -68721,7 +68388,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -68757,10 +68424,10 @@ /area/hallway/secondary/command) "qeM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -68790,19 +68457,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "qeQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68820,8 +68487,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) @@ -68829,10 +68496,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -68847,8 +68514,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/chapel/office) "qfU" = ( @@ -68884,13 +68551,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/iron/dark, /area/science/server) "qhn" = ( @@ -68898,8 +68566,8 @@ icon_state = "4-8" }, /mob/living/simple_animal/sloth/citrus, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -68949,20 +68617,20 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hallway/primary/central) "qhU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -68988,10 +68656,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -69001,8 +68669,8 @@ codes_txt = "patrol;next_patrol=engi1"; location = "hall3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -69021,11 +68689,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "qiv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -69050,6 +68718,16 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"qiF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "qje" = ( /obj/structure/closet/radiation, /obj/effect/decal/cleanable/dirt, @@ -69084,12 +68762,12 @@ /turf/open/floor/carpet/grimy, /area/chapel/main) "qjs" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) "qjw" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron, @@ -69111,10 +68789,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"qkd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron, -/area/quartermaster/miningoffice) "qke" = ( /obj/machinery/light{ dir = 8 @@ -69131,10 +68805,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -69160,10 +68834,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69196,8 +68870,8 @@ /area/security/main) "qlS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/storage) @@ -69214,10 +68888,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -69268,8 +68942,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -69291,10 +68965,10 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -69303,7 +68977,7 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "qnx" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "qnE" = ( @@ -69324,7 +68998,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69355,10 +69029,10 @@ /area/medical/virology) "qnW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -69415,18 +69089,18 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "qot" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) "qoL" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -69436,10 +69110,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69459,10 +69133,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69493,10 +69167,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/security/glass{ @@ -69513,7 +69187,7 @@ /turf/open/floor/iron/dark, /area/security/brig) "qpI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -69526,10 +69200,10 @@ /area/medical/surgery) "qpW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -69554,10 +69228,10 @@ /area/medical/medbay/aft) "qqF" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -69582,10 +69256,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69612,10 +69286,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69641,7 +69315,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69659,10 +69333,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -69687,10 +69361,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69702,13 +69376,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/execution/transfer) "qrU" = ( @@ -69747,8 +69419,8 @@ dir = 5 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port) "qso" = ( @@ -69778,10 +69450,10 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69798,10 +69470,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69824,7 +69496,7 @@ /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "qtF" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69843,7 +69515,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69880,7 +69552,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -69892,8 +69564,8 @@ /obj/effect/turf_decal/pool{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -69924,10 +69596,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -69948,10 +69620,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -70011,7 +69683,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light, @@ -70072,7 +69744,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable{ @@ -70088,7 +69760,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "qxz" = ( /obj/item/kirbyplants{ @@ -70112,9 +69786,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "qxH" = ( @@ -70127,14 +69798,22 @@ /obj/item/book/manual/wiki/sopservice, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) +"qxM" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "qxQ" = ( /obj/machinery/gulag_teleporter, /turf/open/floor/iron/dark, /area/security/main) "qxS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -70179,10 +69858,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -70214,7 +69893,7 @@ /area/vacant_room/commissary) "qAc" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -70229,17 +69908,13 @@ "qAl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/iron, /area/engine/gravity_generator) "qAy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -70248,7 +69923,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -70281,7 +69956,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/circuit/green, @@ -70304,8 +69979,8 @@ "qCE" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -70337,10 +70012,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -70383,15 +70058,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "qDG" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/glass/reinforced, /area/ai_monitored/storage/eva) "qDH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -70432,8 +70107,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -70491,8 +70166,8 @@ /obj/effect/turf_decal/pool/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -70502,8 +70177,8 @@ c_tag = "Chapel Morgue"; name = "chapel camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -70515,7 +70190,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/fore) "qFU" = ( @@ -70541,8 +70216,8 @@ /area/crew_quarters/heads/hos) "qGo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qHd" = ( @@ -70559,9 +70234,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -70576,7 +70251,7 @@ name = "atmospherics camera" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -70603,10 +70278,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -70646,8 +70321,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -70661,8 +70336,8 @@ pixel_y = 26 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/gateway) "qID" = ( @@ -70707,7 +70382,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -70719,19 +70394,19 @@ icon_state = "1-4" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/secondary/service) "qJK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, @@ -70745,8 +70420,8 @@ codes_txt = "patrol;next_patrol=hall11"; location = "hall10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -70785,16 +70460,16 @@ dir = 10 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/science/robotics/lab) "qKU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -70802,10 +70477,10 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "qKX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -70897,18 +70572,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "qNC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -70946,7 +70621,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/circuit/green, @@ -70968,7 +70643,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison/dark, /area/security/prison) "qOm" = ( @@ -70979,8 +70654,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -70991,7 +70666,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -71048,8 +70723,8 @@ c_tag = "Central Hallway - Aft Starboard"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -71073,13 +70748,13 @@ /turf/open/floor/carpet/grimy, /area/vacant_room/office) "qPK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -71170,10 +70845,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -71184,10 +70859,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -71212,8 +70887,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/command) "qRK" = ( @@ -71246,10 +70921,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -71278,10 +70953,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -71319,18 +70994,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) "qSE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -71341,18 +71014,20 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "qSH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/bot, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/main) "qSX" = ( @@ -71374,10 +71049,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -71403,13 +71078,21 @@ icon_state = "1-2" }, /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) +"qUd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "qUh" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -71426,7 +71109,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup, @@ -71453,8 +71136,6 @@ name = "Telecomms Server Room"; req_access_txt = "61" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor/iron_smooth, /area/tcommsat/server) "qUQ" = ( @@ -71494,19 +71175,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "qVe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -71531,7 +71206,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/circuit/green, @@ -71549,10 +71224,10 @@ icon_state = "4-8" }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -71561,10 +71236,10 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "qVG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/grimy, @@ -71614,10 +71289,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -71632,11 +71307,6 @@ /area/maintenance/starboard) "qXs" = ( /obj/structure/closet/emcloset/anchored, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -26; - pixel_y = 2 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/transit_tube) @@ -71657,7 +71327,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -71722,7 +71392,7 @@ /area/crew_quarters/dorms) "qZd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -71744,10 +71414,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -71772,10 +71442,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -71808,10 +71478,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -71830,7 +71500,7 @@ /area/chapel/office) "rai" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -71846,8 +71516,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/aft) @@ -71866,17 +71536,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/port/aft) "rbE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -71886,10 +71556,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -71904,9 +71574,6 @@ /area/science/mixing) "rca" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "rcf" = ( @@ -71928,7 +71595,7 @@ /turf/open/floor/iron/dark, /area/medical/morgue) "rcj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -71974,8 +71641,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "rdF" = ( @@ -71991,10 +71658,10 @@ c_tag = "Central Hallway - Fore Port"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -72004,10 +71671,10 @@ /area/hallway/primary/central) "rdN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -72035,10 +71702,10 @@ name = "Cryogenic Lounge" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -72063,15 +71730,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/warehouse) "red" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -72080,7 +71747,7 @@ "rej" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -72109,25 +71776,22 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "reW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/construction/mining/aux_base) "rfe" = ( @@ -72144,10 +71808,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -72158,10 +71822,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -72197,23 +71861,23 @@ /area/security/detectives_office) "rgv" = ( /obj/effect/turf_decal/siding/wideplating_new/dark, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/prison/dark, /area/security/prison) "rgK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/trimline/black/filled/line{ @@ -72269,7 +71933,7 @@ /area/crew_quarters/bar/atrium) "rhR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/landmark/start/atmospheric_technician, @@ -72287,8 +71951,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -72357,8 +72021,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -72420,10 +72084,10 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;47" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -72445,7 +72109,7 @@ icon_state = "right"; name = "gas Ports" }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron/dark, /area/security/execution/transfer) "rjL" = ( @@ -72481,7 +72145,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -72490,9 +72154,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -72635,10 +72296,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/destination/hydroponics/flip{ @@ -72700,10 +72361,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -72719,7 +72380,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -72746,10 +72407,10 @@ /area/crew_quarters/heads/hos) "roU" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/surgery) "roW" = ( @@ -72802,10 +72463,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -72819,10 +72480,10 @@ /area/crew_quarters/fitness/recreation) "rpy" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -72848,9 +72509,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "rpS" = ( @@ -72868,8 +72532,8 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "rpW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -72887,10 +72551,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -72906,8 +72570,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "rqy" = ( @@ -72948,8 +72612,8 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -72962,8 +72626,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -72985,7 +72649,7 @@ /turf/open/floor/iron, /area/engine/atmos) "rrR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/firealarm/directional/north, @@ -73002,10 +72666,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -73039,8 +72703,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -73059,8 +72723,8 @@ /obj/machinery/holopad, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "rsP" = ( @@ -73073,11 +72737,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -73098,10 +72762,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera{ @@ -73117,8 +72781,8 @@ /area/crew_quarters/heads/hop) "rtH" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -73142,13 +72806,13 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, /area/security/main) "ruB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -73167,8 +72831,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -73177,10 +72841,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -73189,8 +72853,8 @@ /turf/open/floor/iron, /area/hallway/secondary/command) "ruK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -73207,10 +72871,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -73222,14 +72886,16 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/aft) "rwl" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden, /obj/machinery/light/small, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, /turf/open/floor/iron/dark/telecomms, /area/science/server) "rwp" = ( @@ -73285,10 +72951,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -73307,10 +72973,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/wood, @@ -73327,8 +72993,8 @@ name = "Cabin 1" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood{ broken = 1 }, @@ -73360,7 +73026,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -73423,8 +73089,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "rzz" = ( @@ -73458,10 +73124,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -73510,10 +73176,10 @@ c_tag = "Auxillary Construction"; name = "engineering camera" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -73522,14 +73188,14 @@ "rAM" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/main) "rBd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -73548,10 +73214,10 @@ /area/hallway/secondary/entry) "rBs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -73573,10 +73239,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -73589,10 +73255,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/wood, /area/quartermaster/exploration_prep) "rCg" = ( @@ -73616,10 +73282,10 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -73633,7 +73299,7 @@ dir = 9 }, /obj/effect/turf_decal/tile/techfloor, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "rCv" = ( /obj/effect/turf_decal/stripes/line{ @@ -73646,7 +73312,7 @@ /area/science/misc_lab/range) "rCB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -73655,7 +73321,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -73676,10 +73342,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -73701,10 +73367,10 @@ }, /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -73745,7 +73411,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -73759,7 +73425,7 @@ "rEq" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/landmark/start/brig_physician, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -73774,10 +73440,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -73854,8 +73520,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "rGj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "rGV" = ( @@ -73906,7 +73572,7 @@ /area/quartermaster/office) "rHE" = ( /obj/structure/displaycase/captain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/firealarm/directional/east, @@ -73935,8 +73601,8 @@ /area/crew_quarters/heads/cmo) "rIo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -73948,10 +73614,10 @@ name = "Head of Personnel's Quarters"; req_access_txt = "57" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -73999,10 +73665,10 @@ /turf/open/floor/carpet/red, /area/medical/exam_room) "rIz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -74033,12 +73699,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -74087,7 +73747,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -74120,6 +73780,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"rKz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "rKG" = ( /obj/structure/window/reinforced{ dir = 4 @@ -74135,10 +73803,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -74147,8 +73815,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -74185,10 +73853,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -74216,10 +73884,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -74235,10 +73903,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -74301,7 +73969,7 @@ pixel_x = -8 }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -74309,13 +73977,13 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "rMV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -74328,8 +73996,8 @@ /area/bridge) "rNa" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -74357,10 +74025,10 @@ name = "Cell 3" }, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "rNn" = ( @@ -74368,10 +74036,10 @@ name = "exploration Preperation Room"; req_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -74395,22 +74063,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/bridge/showroom/corporate) "rNW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/library) "rNZ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -74461,14 +74129,14 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "rOx" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -74483,10 +74151,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -74504,15 +74172,24 @@ }, /obj/item/beacon, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) +"rPh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "rPm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -74525,7 +74202,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/machinery/camera/directional/east, @@ -74540,14 +74217,12 @@ /turf/open/floor/iron, /area/quartermaster/storage) "rPy" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron, -/area/security/brig) +/area/hallway/secondary/exit/departure_lounge) "rPE" = ( /obj/machinery/light/small{ dir = 1 @@ -74580,10 +74255,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -74591,10 +74266,10 @@ }, /area/crew_quarters/kitchen) "rQH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/red{ @@ -74649,10 +74324,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -74694,8 +74369,8 @@ /obj/effect/turf_decal/plaque{ icon_state = "L2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "rTp" = ( @@ -74714,8 +74389,8 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/aft) "rTq" = ( @@ -74732,10 +74407,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -74747,8 +74422,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "rTy" = ( @@ -74760,22 +74435,16 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, /turf/open/floor/iron, /area/science/xenobiology) "rTH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "rTO" = ( @@ -74806,7 +74475,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera/directional/north{ @@ -74842,18 +74511,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "rVm" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -74863,10 +74532,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -74885,8 +74554,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -74920,10 +74589,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -74945,8 +74614,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -74996,7 +74665,7 @@ /turf/open/floor/iron, /area/science/lab) "rXz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 6 @@ -75016,10 +74685,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -75055,10 +74724,10 @@ /turf/open/floor/circuit/green, /area/security/nuke_storage) "rXY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -75078,10 +74747,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -75096,7 +74765,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/smooth_corner{ @@ -75116,10 +74785,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -75134,7 +74803,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -75143,10 +74812,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/light_switch{ @@ -75174,8 +74843,8 @@ c_tag = "Cargo Bay - Aft Port"; name = "cargo camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, @@ -75186,23 +74855,23 @@ /turf/open/floor/iron, /area/quartermaster/storage) "rZo" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "rZz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -75223,10 +74892,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -75242,10 +74911,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -75337,8 +75006,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -75355,8 +75024,8 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "sbX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -75373,10 +75042,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75424,10 +75093,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/catwalk_floor/iron, @@ -75439,7 +75108,7 @@ /area/chapel/office) "sdF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) @@ -75448,8 +75117,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "sdY" = ( @@ -75459,8 +75128,8 @@ /turf/open/floor/iron, /area/security/brig) "see" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -75473,10 +75142,10 @@ /obj/effect/turf_decal/pool/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75493,7 +75162,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "seN" = ( /obj/effect/decal/cleanable/dirt, @@ -75501,8 +75170,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -75517,6 +75186,14 @@ }, /turf/open/floor/carpet/grimy, /area/library) +"seT" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/quartermaster/miningoffice) "sfo" = ( /obj/effect/decal/remains/xeno, /turf/open/floor/engine/vacuum, @@ -75527,7 +75204,7 @@ /area/maintenance/aft) "sfL" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -75555,7 +75232,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/xenobiology) "sgE" = ( @@ -75598,10 +75275,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75615,10 +75292,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -75630,16 +75307,16 @@ /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "shK" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -75658,6 +75335,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "siF" = ( @@ -75704,12 +75384,10 @@ /area/security/detectives_office) "siK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/office) "sjc" = ( @@ -75740,7 +75418,6 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Plasma to Pure" @@ -75748,6 +75425,7 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron, /area/engine/atmos) "sjm" = ( @@ -75755,10 +75433,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -75770,9 +75448,9 @@ /turf/closed/wall/r_wall, /area/security/prison/shielded) "sjY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -75803,10 +75481,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -75822,10 +75500,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75863,7 +75541,7 @@ /turf/open/floor/prison/dark, /area/security/prison) "skO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -75872,9 +75550,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light_switch{ pixel_x = -11; @@ -75884,10 +75559,10 @@ /area/maintenance/solars/port/fore) "slp" = ( /obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75905,8 +75580,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/research) @@ -75925,6 +75600,11 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"smP" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "smX" = ( /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -75946,8 +75626,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "snu" = ( @@ -75961,8 +75641,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -75980,18 +75660,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/iron, /area/maintenance/port/fore) "snQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/security/main) "snY" = ( @@ -76015,10 +75694,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -76062,10 +75741,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -76138,10 +75817,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -76169,8 +75848,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -76180,13 +75857,13 @@ /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -76196,10 +75873,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -76244,8 +75921,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage_shared) "srl" = ( @@ -76256,10 +75933,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -76290,10 +75967,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "srR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -76308,10 +75985,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -76319,8 +75996,8 @@ "ssL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/aft) "ssN" = ( @@ -76343,13 +76020,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/escape) "sty" = ( @@ -76362,10 +76039,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -76455,10 +76132,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -76488,10 +76165,10 @@ dir = 1; id = "SciLoad" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -76503,10 +76180,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -76528,10 +76205,10 @@ color = "#666666" }, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -76597,10 +76274,10 @@ pixel_x = -24 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -76655,10 +76332,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -76674,7 +76351,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/freezer, @@ -76689,8 +76366,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "swY" = ( @@ -76701,7 +76378,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -76734,10 +76411,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -76799,18 +76476,18 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "syK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/aft) "szf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -76844,7 +76521,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76856,7 +76533,7 @@ pixel_y = 24; prison_radio = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison/dark, @@ -76868,10 +76545,10 @@ }, /area/security/courtroom) "sAk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -76893,14 +76570,14 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 3 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "sAO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -76928,10 +76605,10 @@ icon_state = "1-4" }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/power/apc/auto_name/directional/west{ @@ -76949,8 +76626,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "sBC" = ( @@ -76987,22 +76664,26 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/science/misc_lab) "sBW" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/exit/departure_lounge) "sCi" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -77019,7 +76700,7 @@ "sCM" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -77027,16 +76708,16 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "sCU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, /area/library) "sDk" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -77066,8 +76747,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "sEd" = ( @@ -77090,8 +76771,8 @@ "sEq" = ( /obj/structure/curtain, /obj/effect/turf_decal/delivery/white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/prison/dark, @@ -77109,7 +76790,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/textured, @@ -77139,8 +76820,8 @@ /area/security/prison) "sFo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -77172,10 +76853,10 @@ /turf/open/floor/glass/reinforced, /area/hallway/secondary/exit/departure_lounge) "sGh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/textured, @@ -77193,10 +76874,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -77212,8 +76893,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -77252,7 +76933,7 @@ /area/medical/genetics) "sHj" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -77277,10 +76958,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -77297,7 +76978,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -77318,7 +76999,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -77328,8 +77009,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron, /area/engine/break_room) @@ -77353,8 +77034,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/break_room) @@ -77404,9 +77085,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port) "sJt" = ( @@ -77415,8 +77093,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/medical{ name = "Observation" }, @@ -77449,8 +77127,8 @@ /area/hallway/primary/fore) "sJW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -77494,10 +77172,10 @@ /turf/open/floor/iron, /area/hydroponics) "sKq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -77541,8 +77219,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "sKW" = ( @@ -77586,8 +77264,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/aft) "sLs" = ( @@ -77627,8 +77305,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/engineering) "sLS" = ( @@ -77657,8 +77335,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "sMg" = ( @@ -77729,10 +77407,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white/side{ @@ -77743,10 +77421,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -77762,8 +77440,8 @@ /obj/effect/turf_decal/pool{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -77772,10 +77450,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -77830,10 +77508,10 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "sPr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/firealarm/directional/north, @@ -77846,8 +77524,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -77859,10 +77537,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -77881,8 +77559,8 @@ }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -77974,8 +77652,8 @@ /area/bridge) "sSI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow, /obj/machinery/light{ dir = 4 @@ -77983,7 +77661,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "sTd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -78028,8 +77706,8 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "sTE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -78044,10 +77722,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -78064,10 +77742,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -78089,20 +77767,20 @@ /area/quartermaster/office) "sTZ" = ( /obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/engine/engineering) "sUf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -78116,8 +77794,8 @@ }, /area/ai_monitored/security/armory) "sUF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -78141,7 +77819,7 @@ /obj/effect/landmark/start/exploration, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) "sVb" = ( @@ -78152,10 +77830,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -78172,8 +77850,8 @@ /turf/open/floor/iron, /area/crew_quarters/bar/atrium) "sVk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow, @@ -78190,7 +77868,7 @@ /turf/open/floor/iron, /area/quartermaster/storage) "sVr" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -78201,16 +77879,16 @@ icon_state = "4-8" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) "sVw" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -78220,8 +77898,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/break_room) @@ -78241,11 +77919,11 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "sVV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "sWk" = ( @@ -78283,10 +77961,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -78296,10 +77974,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -78310,8 +77988,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78330,7 +78008,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -78363,8 +78041,8 @@ /obj/machinery/holopad, /obj/effect/landmark/start/lawyer, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78382,13 +78060,12 @@ /turf/open/floor/plating, /area/maintenance/starboard) "sYX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "sZg" = ( @@ -78425,16 +78102,16 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/medical/break_room) "sZI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -78447,13 +78124,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) "tal" = ( @@ -78472,10 +78149,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -78493,13 +78170,13 @@ /turf/open/floor/iron, /area/security/brig) "taD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light_switch{ pixel_y = 21 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -78563,15 +78240,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -78599,10 +78267,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -78610,18 +78278,18 @@ /area/aisat) "tcx" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/main) "tcB" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red{ @@ -78639,8 +78307,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "tde" = ( @@ -78654,10 +78320,10 @@ pixel_y = -32 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/catwalk_floor/iron, @@ -78676,8 +78342,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -78698,7 +78364,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "teo" = ( @@ -78734,8 +78400,8 @@ specialfunctions = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "teT" = ( @@ -78757,7 +78423,7 @@ /area/security/prison) "teZ" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/space, /area/engine/atmos) "tfc" = ( @@ -78777,10 +78443,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -78816,10 +78482,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -78829,8 +78495,8 @@ /area/science/lab) "tfT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -78880,7 +78546,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -78912,8 +78578,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -78921,8 +78587,8 @@ /area/quartermaster/warehouse) "tii" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -78945,8 +78611,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -78965,10 +78631,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -79001,10 +78667,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -79043,10 +78709,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -79058,8 +78724,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "tkX" = ( @@ -79126,8 +78792,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/destination/chemistry{ @@ -79164,8 +78830,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "tmD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -79178,13 +78844,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tmO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -79199,18 +78865,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "tmS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -79219,10 +78885,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -79254,8 +78920,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "tnl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -79349,10 +79015,10 @@ /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -79371,10 +79037,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -79396,10 +79062,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -79423,10 +79089,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -79436,7 +79102,7 @@ c_tag = "Science - Toxins Mixing Lab Fore"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/machinery/meter, @@ -79469,8 +79135,8 @@ location = "Tool Storage" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/primary) "tqw" = ( @@ -79482,13 +79148,10 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "tqB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -79501,10 +79164,10 @@ c_tag = "Dormitories - Starboard"; name = "dormitories camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -79517,7 +79180,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -79532,10 +79195,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -79558,10 +79221,10 @@ /obj/effect/turf_decal/pool{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -79596,8 +79259,8 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "trD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -79611,10 +79274,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -79624,7 +79287,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -79652,6 +79315,11 @@ }, /turf/open/floor/glass/reinforced, /area/hallway/secondary/entry) +"ttg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/quartermaster/miningoffice) "ttl" = ( /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -79684,10 +79352,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -79722,17 +79390,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/vacant_room/commissary) -"tuk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "tuv" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Space Access Airlock"; @@ -79828,16 +79485,16 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "tvJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -79872,8 +79529,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port) @@ -79915,8 +79572,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -79931,7 +79588,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/sign/poster/official/report_crimes{ @@ -79950,8 +79607,8 @@ /turf/open/floor/iron/smooth, /area/security/main) "txw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/office) @@ -79971,11 +79628,11 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "txE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -80024,10 +79681,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -80061,10 +79718,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -80111,10 +79768,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -80171,10 +79828,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -80186,28 +79843,23 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "tAW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "tBx" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -80219,17 +79871,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) "tBE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -80255,7 +79907,7 @@ /area/maintenance/department/medical/morgue) "tBX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/floor/iron, @@ -80265,8 +79917,8 @@ dir = 8 }, /obj/machinery/door/window/northleft, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -80338,8 +79990,8 @@ /turf/open/floor/iron, /area/maintenance/port) "tDT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) @@ -80348,8 +80000,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -80366,10 +80018,10 @@ }, /obj/machinery/light/small, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -80406,10 +80058,10 @@ /turf/open/floor/iron, /area/maintenance/department/science) "tFf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -80422,8 +80074,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -80449,41 +80101,42 @@ /area/medical/chemistry) "tGJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/starboard/aft) "tGN" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 }, -/obj/machinery/meter, -/obj/item/wrench, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "tHf" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/security/brig) "tHk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -80516,10 +80169,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -80564,8 +80217,8 @@ "tID" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -80598,13 +80251,13 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "tJK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -80618,10 +80271,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/grimy, @@ -80648,7 +80301,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -80657,7 +80310,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -80688,8 +80341,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -80713,16 +80366,16 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/bridge/showroom/corporate) "tLY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -80732,12 +80385,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -80745,7 +80392,7 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -80774,15 +80421,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "tMC" = ( @@ -80825,10 +80470,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "tNW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -80869,10 +80514,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -80938,21 +80583,21 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "tQI" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 8 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/engine/atmos) "tQJ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/dark/textured_half, /area/maintenance/disposal/incinerator) "tQW" = ( @@ -80969,7 +80614,6 @@ /turf/open/floor/iron, /area/security/brig) "tRn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/crew_quarters/heads/captain/private) "tRx" = ( @@ -80977,10 +80621,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -81017,8 +80661,8 @@ /turf/open/floor/carpet/grimy, /area/bridge/showroom/corporate) "tRZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -81034,10 +80678,10 @@ /turf/open/floor/iron/white, /area/science/shuttledock) "tSp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -81046,8 +80690,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) @@ -81084,10 +80728,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -81124,7 +80768,7 @@ /turf/open/floor/plating, /area/science/explab) "tTE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -81151,8 +80795,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron, @@ -81161,8 +80805,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 5 @@ -81172,7 +80816,7 @@ "tUJ" = ( /obj/structure/table/wood, /obj/item/paicard, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -81223,10 +80867,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -81241,11 +80885,10 @@ /turf/open/floor/prison, /area/security/prison) "tVp" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/trinary/filter{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "tVB" = ( @@ -81256,19 +80899,19 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, /area/medical/medbay/central) "tVN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -81282,15 +80925,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/storage) "tWO" = ( @@ -81302,10 +80936,10 @@ /area/engine/atmos) "tXk" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -81323,34 +80957,37 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, /area/crew_quarters/locker) "tXs" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "tXK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/security/main) "tXL" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -81362,10 +80999,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -81381,21 +81018,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "tYI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -81430,23 +81067,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) -"tZn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/quartermaster/storage) "tZy" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -81463,8 +81083,8 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -81527,8 +81147,8 @@ /area/crew_quarters/heads/hos) "uae" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light_switch{ pixel_x = 25 @@ -81560,10 +81180,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -81576,8 +81196,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "ubk" = ( @@ -81588,8 +81208,8 @@ c_tag = "Service Hallway - Aft"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -81622,7 +81242,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -81738,16 +81358,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) -"udX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/construction/mining/aux_base) "uep" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -81755,10 +81365,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -81766,7 +81376,7 @@ /area/maintenance/port/fore) "ueC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -81782,12 +81392,12 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/central) "ueO" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "O2 to Pure" @@ -81805,18 +81415,18 @@ /turf/open/floor/iron/white, /area/medical/genetics) "ueZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, /area/maintenance/starboard) "ufb" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -81824,10 +81434,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -81845,8 +81455,8 @@ /area/maintenance/port) "ufG" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light/small{ dir = 4 }, @@ -81872,12 +81482,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "ufT" = ( @@ -81887,7 +81491,7 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/lawoffice) "uge" = ( @@ -81924,20 +81528,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "ugO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -81959,10 +81563,7 @@ pixel_x = 26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -81994,8 +81595,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "uhW" = ( @@ -82010,7 +81611,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -82032,8 +81633,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "uiu" = ( @@ -82047,8 +81648,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -82093,10 +81694,10 @@ /area/security/brig) "ujd" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -82112,18 +81713,18 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "ujB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/status_display/evac{ pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/starboard) "ukd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -82146,8 +81747,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/primary) "ukD" = ( @@ -82156,7 +81757,6 @@ req_access_txt = "2"; shuttledocked = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/security/main) @@ -82176,10 +81776,10 @@ /turf/open/floor/prison/dark, /area/security/execution/transfer) "ukT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -82203,13 +81803,13 @@ "ulo" = ( /obj/structure/chair/office, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/office) "ulv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "ulA" = ( @@ -82285,10 +81885,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -82312,7 +81912,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/xenobiology) "unz" = ( @@ -82348,7 +81948,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -82372,17 +81972,17 @@ pixel_x = -26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch/tcomms{ pixel_x = -38; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "unY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/transit_tube) @@ -82407,8 +82007,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "uof" = ( @@ -82428,22 +82028,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "upd" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/dark/textured_half, /area/maintenance/disposal/incinerator) "upk" = ( @@ -82597,11 +82197,11 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "urb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -82612,12 +82212,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/genetics/cloning) "ury" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red, @@ -82628,8 +82228,8 @@ icon_state = "1-2" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/aft) @@ -82674,7 +82274,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -82710,13 +82310,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -82741,10 +82341,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -82761,7 +82361,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -82802,10 +82402,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -82820,7 +82420,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -82848,10 +82448,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -82876,10 +82476,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -82920,9 +82520,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "uwn" = ( @@ -82943,8 +82540,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) "uxf" = ( @@ -82960,8 +82557,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -82994,8 +82591,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -83028,8 +82625,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -83048,8 +82645,8 @@ /turf/open/floor/iron, /area/security/brig) "uzB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "uzG" = ( @@ -83070,7 +82667,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "uAc" = ( @@ -83079,10 +82676,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -83100,7 +82697,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -83129,10 +82726,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -83159,8 +82756,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command{ name = "Research Director's Quarters"; req_access_txt = "30" @@ -83208,18 +82805,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) "uDh" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -83253,10 +82850,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison/dark, /area/security/prison) "uDH" = ( @@ -83264,10 +82861,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -83317,9 +82914,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = -21 @@ -83348,8 +82942,8 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "uEr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -83393,8 +82987,8 @@ /area/engine/atmos) "uEJ" = ( /mob/living/basic/cockroach, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -83409,10 +83003,10 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -83421,16 +83015,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port) "uFf" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -83450,14 +83044,14 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "uGa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -83469,7 +83063,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/machinery/meter, @@ -83483,17 +83077,17 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "uGp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -83549,10 +83143,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -83564,24 +83158,6 @@ /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron, /area/science/research) -"uHG" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/arrivals_external{ - name = "Arrivals Airlock" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "uHK" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ @@ -83645,10 +83221,10 @@ /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -83679,14 +83255,14 @@ /area/maintenance/aft) "uIV" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "uJk" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -83696,11 +83272,11 @@ /turf/open/floor/iron, /area/engine/atmos) "uJt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -83724,10 +83300,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -83755,10 +83331,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -83809,10 +83385,10 @@ name = "Private Interrogation"; req_access_txt = "4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -83851,8 +83427,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -83875,10 +83451,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -83897,10 +83473,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -83909,25 +83485,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) -"uOp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/quartermaster/storage) "uOq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -83937,16 +83502,16 @@ req_one_access_txt = "32" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/storage_shared) "uOD" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" @@ -83956,8 +83521,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "uOM" = ( @@ -83967,10 +83532,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -83985,10 +83550,10 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -84026,8 +83591,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) @@ -84051,10 +83616,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -84064,10 +83629,10 @@ /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -84101,10 +83666,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -84147,7 +83712,7 @@ "uRV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -84156,8 +83721,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -84196,10 +83761,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -84209,10 +83774,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -84226,10 +83791,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -84237,10 +83802,7 @@ /area/crew_quarters/locker) "uUa" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -84252,15 +83814,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "uUG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -84286,7 +83845,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -84298,8 +83857,8 @@ }, /obj/effect/landmark/start/quartermaster, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -84308,10 +83867,10 @@ /turf/open/floor/iron, /area/quartermaster/storage) "uVi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -84320,8 +83879,8 @@ /turf/open/floor/iron/white, /area/science/research) "uVk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -84347,10 +83906,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -84360,10 +83919,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -84383,10 +83942,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -84406,19 +83965,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "uVU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -84453,10 +84006,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -84570,8 +84123,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -84582,10 +84135,9 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "uZO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "uZW" = ( @@ -84600,10 +84152,10 @@ c_tag = "Science - Center"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -84615,10 +84167,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/firealarm/directional/east, @@ -84639,8 +84191,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -84652,10 +84204,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -84676,13 +84228,13 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "vbg" = ( /obj/item/bikehorn/rubberducky, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/freezer, @@ -84724,10 +84276,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -84740,10 +84292,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/wood, @@ -84767,8 +84319,8 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "vcM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -84777,13 +84329,13 @@ /turf/open/floor/iron/grid/steel, /area/medical/storage) "vcT" = ( -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -84816,10 +84368,10 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "vdo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -84871,10 +84423,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -84894,10 +84446,19 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/service) +"ver" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/security/main) "vet" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, @@ -84942,10 +84503,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -84965,10 +84526,10 @@ /turf/open/floor/iron/dark, /area/security/main) "vfp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -84986,10 +84547,10 @@ /area/bridge/showroom/corporate) "vfQ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -85001,8 +84562,8 @@ c_tag = "Central Hallway - Starboard"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -85055,10 +84616,10 @@ /turf/open/floor/iron, /area/medical/genetics) "vgQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -85103,8 +84664,8 @@ icon_state = "2-8" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "vht" = ( @@ -85155,8 +84716,8 @@ /area/crew_quarters/dorms) "viM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) @@ -85187,10 +84748,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -85201,15 +84762,15 @@ }, /area/hallway/secondary/entry) "vjG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/library) "vjJ" = ( /obj/structure/chair/wood, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron{ @@ -85218,13 +84779,13 @@ }, /area/chapel/main) "vjX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -85237,7 +84798,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -85256,8 +84817,8 @@ icon_state = "1-8" }, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -85284,8 +84845,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/bot, @@ -85296,10 +84857,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -85313,10 +84874,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "vlq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -85386,6 +84947,13 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) +"vmH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "vmK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -85395,10 +84963,10 @@ /area/science/test_area) "vmM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -85460,10 +85028,7 @@ /turf/open/floor/iron, /area/storage/tools) "vnz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -85473,20 +85038,20 @@ /area/maintenance/port/aft) "vnI" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) "vnV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -85503,8 +85068,8 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -85529,19 +85094,19 @@ /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "voM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/smooth, /area/security/main) "voT" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -85555,7 +85120,7 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "vpd" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -85579,10 +85144,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -85593,7 +85158,7 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup, @@ -85658,10 +85223,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "vqO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -85683,7 +85248,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -85692,11 +85257,10 @@ }, /area/security/main) "vrg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron/dark/corner{ @@ -85739,10 +85303,10 @@ icon_state = "4-8" }, /mob/living/basic/cockroach, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -85762,8 +85326,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -85811,8 +85375,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -85833,8 +85397,8 @@ name = "Medical Cell"; req_one_access_txt = "1;30" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/science/research) @@ -85843,8 +85407,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/space, /area/space/nearstation) "vtr" = ( @@ -85861,16 +85425,16 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "vtt" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/airalarm/directional/west, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "vtI" = ( @@ -85907,8 +85471,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "vus" = ( @@ -85943,12 +85507,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "vuL" = ( @@ -85958,8 +85516,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/wrap{ dir = 2 }, @@ -85984,8 +85542,8 @@ /area/hydroponics) "vvf" = ( /obj/effect/landmark/start/botanist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -85993,13 +85551,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -86041,10 +85599,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -86074,11 +85632,13 @@ /area/medical/genetics/cloning) "vwj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "vwz" = ( @@ -86094,16 +85654,16 @@ name = "Curator's Study"; req_access_txt = "37" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library) "vwF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ @@ -86127,8 +85687,8 @@ "vxk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -86138,8 +85698,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) "vxY" = ( @@ -86157,10 +85717,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -86174,8 +85734,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -86192,10 +85752,10 @@ icon_state = "1-2" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -86237,10 +85797,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -86249,17 +85809,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "vyT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -86279,8 +85836,8 @@ /turf/open/floor/iron/dark, /area/security/main) "vzn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -86289,7 +85846,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "vzs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -86330,19 +85887,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/main) "vAt" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) "vAM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -86350,11 +85907,11 @@ /turf/open/floor/iron, /area/quartermaster/miningoffice) "vAR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -86376,10 +85933,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -86422,11 +85979,11 @@ /area/medical/virology) "vBR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -86447,7 +86004,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "vCv" = ( /obj/effect/decal/cleanable/dirt, @@ -86481,8 +86040,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port/aft) @@ -86543,8 +86102,8 @@ c_tag = "Central Hallway - Center Starboard"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -86615,19 +86174,16 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "vGb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -86639,7 +86195,7 @@ /turf/open/floor/iron/dark, /area/security/main) "vGv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/grid/steel, @@ -86656,10 +86212,10 @@ /area/engine/gravity_generator) "vGN" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -86668,21 +86224,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor, /area/engine/transit_tube) "vGU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -86733,10 +86290,10 @@ /area/security/detectives_office) "vIc" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -86767,10 +86324,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/wood, @@ -86824,10 +86381,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -86868,10 +86425,10 @@ /area/crew_quarters/kitchen) "vKj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -86884,15 +86441,15 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 1 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "vKB" = ( @@ -86906,14 +86463,14 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "vKI" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "vKL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) @@ -86928,11 +86485,11 @@ /turf/open/floor/iron, /area/security/checkpoint/customs) "vLa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, -/obj/machinery/meter/atmos/distro_loop, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/meter/monitored/distro_loop, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -86965,10 +86522,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -86981,8 +86538,8 @@ /area/maintenance/aft) "vLI" = ( /obj/structure/girder, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -86995,8 +86552,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "vMa" = ( @@ -87015,11 +86572,11 @@ /turf/open/floor/iron, /area/engine/atmos) "vME" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "vMN" = ( @@ -87033,10 +86590,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -87056,8 +86613,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "vNg" = ( @@ -87073,8 +86630,8 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "vNo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -87117,10 +86674,10 @@ /obj/machinery/computer/crew{ req_one_access = list(5,4) }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -87179,20 +86736,17 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/port/fore) "vPR" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -87202,8 +86756,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -87216,7 +86770,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/machinery/newscaster{ @@ -87227,7 +86781,7 @@ /area/medical/patients_rooms) "vQV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -87236,8 +86790,8 @@ /turf/open/floor/iron/dark, /area/medical/morgue) "vQW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "vRk" = ( @@ -87269,10 +86823,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -87285,23 +86839,19 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "vSH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/construction/mining/aux_base) "vSP" = ( @@ -87311,7 +86861,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -87337,10 +86887,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -87354,7 +86904,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -87365,7 +86915,7 @@ /turf/open/floor/iron, /area/hydroponics) "vTs" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/machinery/light/small{ @@ -87385,8 +86935,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "vTy" = ( @@ -87395,15 +86945,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/maintenance/solars/starboard/fore) "vTF" = ( @@ -87411,10 +86952,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -87426,8 +86967,8 @@ /turf/open/floor/carpet/grimy, /area/library) "vTR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 6 @@ -87441,7 +86982,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "vUh" = ( @@ -87471,8 +87012,8 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -87480,10 +87021,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -87511,20 +87052,20 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) "vVc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -87534,7 +87075,7 @@ /turf/open/floor/iron, /area/science/lab) "vVf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -87549,8 +87090,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/library/flip{ dir = 4 }, @@ -87623,7 +87164,6 @@ /obj/structure/sign/warning/vacuum{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/transit_tube) @@ -87639,20 +87179,20 @@ icon_state = "1-4" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, /area/maintenance/starboard/fore) "vWE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron{ dir = 1; icon_state = "chapel" @@ -87666,10 +87206,10 @@ /area/library) "vWO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -87683,7 +87223,7 @@ }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -87728,10 +87268,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -87776,10 +87316,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -87791,7 +87331,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -87817,9 +87357,6 @@ /turf/open/space, /area/space/nearstation) "vZo" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 6 - }, /obj/machinery/door/airlock/command/glass{ name = "Server Access"; req_one_access_txt = "30;70" @@ -87830,8 +87367,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/iron/dark, /area/science/server) "vZx" = ( @@ -87841,10 +87378,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -87861,10 +87398,10 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -87873,10 +87410,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -87893,7 +87430,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -87910,15 +87447,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) "wbb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -87957,10 +87494,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -88015,10 +87552,12 @@ icon_state = "0-8" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "wcs" = ( @@ -88028,14 +87567,11 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 8 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "wcJ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -88101,17 +87637,17 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "wdC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "wdK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -88180,10 +87716,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -88227,10 +87763,10 @@ /area/quartermaster/miningoffice) "wft" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/lobby) "wfv" = ( @@ -88258,8 +87794,8 @@ /turf/open/floor/iron, /area/quartermaster/exploration_prep) "wgc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -88291,8 +87827,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/aft) @@ -88302,7 +87838,7 @@ req_access_txt = "5" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -88311,7 +87847,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/medical/storage) "wgI" = ( @@ -88347,8 +87883,8 @@ /turf/open/floor/iron, /area/security/checkpoint/escape) "whm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -88402,10 +87938,10 @@ /area/security/main) "whV" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -88425,8 +87961,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "win" = ( @@ -88448,8 +87984,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage_shared) "wiQ" = ( @@ -88474,6 +88010,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/security/main) +"wjf" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "wjC" = ( /obj/structure/chair{ dir = 8; @@ -88492,10 +88034,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -88516,8 +88058,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/black/filled/line{ dir = 4 }, @@ -88541,8 +88083,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -88578,10 +88120,10 @@ /turf/open/floor/iron/white, /area/security/brig/medbay) "wkV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -88603,10 +88145,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/prison/dark, @@ -88615,14 +88157,21 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/medical/surgery) +"wlt" = ( +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/shuttledock) "wlz" = ( /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -88675,8 +88224,8 @@ pixel_x = 28 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -88698,10 +88247,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -88726,8 +88275,8 @@ /turf/open/floor/grass/no_border, /area/security/prison) "wmH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -88760,7 +88309,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/fore) "wno" = ( @@ -88793,10 +88342,10 @@ /area/engine/transit_tube) "wnz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -88805,18 +88354,18 @@ /turf/open/floor/iron, /area/medical/medbay/lobby) "wnG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/science/shuttledock) "wnU" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/surgery) "woa" = ( @@ -88829,8 +88378,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/engineering, /turf/open/floor/iron, /area/engine/engineering) @@ -88838,20 +88387,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison, /area/security/prison) "wom" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -88891,21 +88440,16 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/dorms) "wpj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/advanced_airlock_controller/directional/west, /obj/machinery/light/small{ dir = 8 }, @@ -88939,7 +88483,7 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "wqb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -89011,10 +88555,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/surgery) "wqS" = ( @@ -89034,10 +88578,10 @@ c_tag = "Central Hallway - Bridge Starboard"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -89051,10 +88595,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -89062,10 +88606,10 @@ "wrO" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -89075,17 +88619,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/storage) "wrU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -89112,12 +88656,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -89129,19 +88667,19 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) "wsH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -89161,7 +88699,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 8 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "wsU" = ( /obj/structure/disposalpipe/segment{ @@ -89176,7 +88714,7 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -89185,10 +88723,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -89196,6 +88734,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"wtx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "wtP" = ( /obj/machinery/door/airlock/public/glass{ name = "Courtroom"; @@ -89204,8 +88751,8 @@ /obj/effect/turf_decal/bot, /obj/effect/landmark/event_spawn, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -89255,7 +88802,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -89324,10 +88871,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -89357,7 +88904,7 @@ /obj/effect/turf_decal/trimline/dark/warning{ dir = 1 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "wuY" = ( /obj/effect/decal/cleanable/dirt, @@ -89377,8 +88924,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron, /area/science/research) @@ -89402,10 +88949,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral, @@ -89456,11 +89003,13 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "wwe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/purple{ @@ -89470,7 +89019,7 @@ /area/science/research) "wwj" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /turf/open/floor/plating, @@ -89498,8 +89047,8 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "wwL" = ( @@ -89549,8 +89098,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/atmos) "wyn" = ( @@ -89596,10 +89145,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -89628,7 +89177,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -89644,16 +89193,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "wyX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/security/detectives_office) @@ -89671,10 +89220,10 @@ /turf/open/floor/iron/dark, /area/security/detectives_office) "wzr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -89722,10 +89271,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -89748,8 +89297,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "wAv" = ( @@ -89835,10 +89384,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/catwalk_floor/flat_white, /area/science/mixing) @@ -89846,8 +89395,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -89881,15 +89430,15 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/construction/mining/aux_base) "wDe" = ( /obj/effect/turf_decal/tile/white{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -89898,11 +89447,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/white, @@ -89958,7 +89507,7 @@ /turf/open/floor/iron, /area/engine/storage_shared) "wEL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -90017,10 +89566,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -90057,10 +89606,10 @@ /turf/open/floor/iron/white, /area/medical/virology) "wGa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/teleporter) @@ -90126,10 +89675,10 @@ dir = 8 }, /obj/machinery/door/window/northleft, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -90157,10 +89706,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -90169,10 +89718,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -90187,8 +89736,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -90231,8 +89780,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "wIq" = ( @@ -90243,10 +89792,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -90269,10 +89818,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -90285,10 +89834,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -90296,15 +89845,15 @@ /area/ai_monitored/turret_protected/aisat_interior) "wIN" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) "wJq" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -90329,8 +89878,8 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -90352,10 +89901,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -90365,8 +89914,8 @@ id_tag = "Dorm3"; name = "Cabin 3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) "wKg" = ( @@ -90387,7 +89936,7 @@ /obj/effect/turf_decal/tile/techfloor{ dir = 8 }, -/turf/open/floor/iron/smooth, +/turf/open/floor/iron/telecomms, /area/tcommsat/server) "wKx" = ( /obj/effect/turf_decal/tile/purple, @@ -90431,8 +89980,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -90441,10 +89990,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -90455,19 +90004,26 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) +"wLn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "wLp" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -90488,10 +90044,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -90500,11 +90056,11 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -90542,7 +90098,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -90560,10 +90116,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -90590,8 +90146,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) "wMq" = ( @@ -90681,10 +90237,10 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -90695,10 +90251,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -90711,8 +90267,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -90725,7 +90281,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_edge, @@ -90737,8 +90293,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -90763,10 +90319,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -90787,8 +90343,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "wPa" = ( @@ -90830,10 +90386,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -90908,8 +90464,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 6 @@ -90920,8 +90476,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/aft) "wRw" = ( @@ -90939,10 +90495,10 @@ /area/maintenance/port/fore) "wRU" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/space, @@ -90958,10 +90514,10 @@ pixel_y = -2; prison_radio = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -90980,7 +90536,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -90997,10 +90553,10 @@ name = "MiniSat Space Access Airlock"; req_one_access_txt = "32;19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91016,8 +90572,6 @@ req_access_txt = "61" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/tcommsat/server) "wSx" = ( @@ -91031,8 +90585,8 @@ /area/ai_monitored/storage/eva) "wTc" = ( /obj/machinery/modular_computer/console/preset/curator, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "wTB" = ( @@ -91042,10 +90596,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -91081,8 +90635,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -91096,10 +90650,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -91156,7 +90710,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -91191,10 +90745,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -91211,8 +90765,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "wWn" = ( @@ -91243,7 +90797,7 @@ /turf/open/floor/carpet/grimy, /area/bridge/showroom/corporate) "wXT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91274,10 +90828,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -91289,18 +90843,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/white, /area/crew_quarters/cryopods) "wYu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -91402,8 +90956,8 @@ /area/science/research) "xcs" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "xcA" = ( @@ -91428,7 +90982,7 @@ icon_state = "1-2" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/checkpoint/science/research) @@ -91445,10 +90999,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -91476,8 +91030,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -91509,10 +91063,10 @@ c_tag = "Central Hallway - Center Port"; name = "hallway camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -91585,7 +91139,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -91605,18 +91159,18 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port) "xeR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -91628,8 +91182,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -91641,10 +91195,10 @@ "xfl" = ( /obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "xfo" = ( @@ -91664,8 +91218,8 @@ /area/chapel/main) "xfu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91688,22 +91242,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engineering) "xfF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91731,8 +91279,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -91743,10 +91291,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -91832,10 +91380,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -91871,10 +91419,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -91904,10 +91452,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91933,10 +91481,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91950,10 +91498,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -91967,8 +91515,8 @@ pixel_y = -26 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/bridge/meeting_room/council) "xjY" = ( @@ -91983,8 +91531,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "xkf" = ( @@ -92013,10 +91561,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -92026,10 +91574,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -92053,7 +91598,7 @@ /area/crew_quarters/dorms) "xli" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -92076,10 +91621,7 @@ }, /obj/item/flashlight, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -92109,13 +91651,13 @@ /turf/open/floor/iron, /area/science/mixing) "xmW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -92146,10 +91688,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -92164,10 +91706,6 @@ /turf/open/floor/plating, /area/security/prison) "xod" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/fans/tiny/invisible, /obj/docking_port/stationary{ dwidth = 1; @@ -92176,12 +91714,8 @@ width = 3; dir = 4 }, -/turf/open/floor/plating{ - initial_gas_mix = "o2=0.01;n2=0.01;TEMP=2.7"; - initial_temperature = 2.7; - luminosity = 2 - }, -/area/security/main) +/turf/open/space/basic, +/area/space) "xov" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom{ @@ -92210,8 +91744,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/office) @@ -92224,7 +91758,7 @@ "xpk" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -92240,8 +91774,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/aft) "xpP" = ( @@ -92268,10 +91802,10 @@ /turf/open/floor/iron, /area/medical/chemistry) "xpQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -92284,8 +91818,8 @@ /area/science/lab) "xpR" = ( /obj/machinery/door/window/southleft, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) @@ -92324,10 +91858,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -92415,8 +91949,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -92426,8 +91960,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "xsJ" = ( @@ -92439,10 +91973,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -92461,16 +91995,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "xtg" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /obj/effect/landmark/event_spawn, @@ -92495,8 +92023,8 @@ c_tag = "Science - Aft Center"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) @@ -92512,16 +92040,13 @@ "xvc" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "xvk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -92570,10 +92095,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -92595,10 +92120,10 @@ /area/vacant_room/commissary) "xvN" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) @@ -92613,8 +92138,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "xwt" = ( @@ -92664,10 +92189,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -92680,10 +92205,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -92720,10 +92245,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -92759,17 +92284,17 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) "xxM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -92830,10 +92355,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -92844,8 +92369,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -92860,10 +92385,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -92937,8 +92462,8 @@ /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmospherics_engine) "xAY" = ( @@ -92968,8 +92493,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/ai_monitored/turret_protected/aisat_interior) "xBz" = ( @@ -92979,8 +92504,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -93019,8 +92544,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -93029,7 +92554,7 @@ /turf/open/floor/prison, /area/security/prison) "xCe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -93044,16 +92569,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "xCA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/atmospherics/components/binary/valve{ dir = 4; name = "SM Coolant Loop" @@ -93087,10 +92612,10 @@ c_tag = "Arrivals - Center Port"; name = "arrivals camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -93109,10 +92634,10 @@ }, /area/hallway/secondary/entry) "xDg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -93125,10 +92650,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -93150,10 +92675,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -93168,7 +92693,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -93255,10 +92780,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "xEQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -93289,10 +92814,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -93301,8 +92826,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) @@ -93325,7 +92850,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -93348,10 +92873,10 @@ /area/hallway/primary/port) "xHr" = ( /obj/effect/landmark/start/detective, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -93378,7 +92903,7 @@ icon_state = "1-2" }, /obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -93405,10 +92930,10 @@ }, /obj/machinery/holopad, /obj/effect/landmark/start/cyborg, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -93417,10 +92942,7 @@ "xIn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -93437,7 +92959,7 @@ name = "Interrogation"; req_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -93449,8 +92971,8 @@ /area/security/main) "xIB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -93460,10 +92982,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -93473,8 +92995,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "xJj" = ( @@ -93582,10 +93104,10 @@ /turf/open/floor/iron, /area/quartermaster/miningoffice) "xKs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "xKK" = ( @@ -93600,19 +93122,19 @@ /area/crew_quarters/locker) "xKU" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/starboard/aft) "xLk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/firealarm/directional/north, @@ -93627,10 +93149,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -93655,10 +93177,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -93674,11 +93196,15 @@ /turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "xMk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -93686,10 +93212,10 @@ "xMt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -93705,10 +93231,10 @@ name = "Command Chair"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -93730,8 +93256,8 @@ dir = 8 }, /obj/machinery/door/window/southright, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -93741,10 +93267,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -93757,10 +93283,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -93772,7 +93298,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -93831,9 +93357,11 @@ icon_state = "0-8" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) @@ -93843,8 +93371,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "xOJ" = ( @@ -93869,10 +93397,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -93898,7 +93426,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -93938,8 +93466,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "xPU" = ( @@ -93974,10 +93502,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/catwalk_floor/iron, @@ -93985,8 +93513,8 @@ "xQo" = ( /obj/structure/chair/wood/normal, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron{ dir = 1; icon_state = "chapel" @@ -94014,15 +93542,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/aft) "xQx" = ( @@ -94052,10 +93578,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -94073,7 +93599,7 @@ /turf/open/floor/iron/dark, /area/security/main) "xQR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -94086,10 +93612,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -94102,8 +93628,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) @@ -94192,10 +93718,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -94225,10 +93751,10 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "xUh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -94237,8 +93763,8 @@ /turf/open/floor/plating, /area/maintenance/starboard) "xUn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -94253,8 +93779,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/locker) @@ -94272,8 +93798,8 @@ /turf/open/floor/iron/dark, /area/bridge) "xVS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -94286,10 +93812,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -94301,8 +93827,8 @@ pixel_y = 26 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -94322,8 +93848,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/fore) "xVZ" = ( @@ -94363,7 +93889,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "xWi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ @@ -94377,10 +93903,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -94409,15 +93935,15 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/port/aft) "xXe" = ( @@ -94460,7 +93986,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/lawoffice) "xXF" = ( @@ -94482,10 +94008,10 @@ pixel_x = -26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -94524,10 +94050,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -94556,8 +94082,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -94580,22 +94106,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/hallway/secondary/entry) "xZE" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/tcommsat/server) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "xZM" = ( /obj/structure/fans/tiny/invisible, /turf/open/space/basic, @@ -94644,10 +94169,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -94658,8 +94183,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "yau" = ( @@ -94683,8 +94208,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "yaH" = ( @@ -94699,7 +94225,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -94707,7 +94233,7 @@ /turf/open/floor/iron, /area/gateway) "yaT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -94719,10 +94245,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -94760,7 +94286,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -94778,12 +94304,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "ycA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -94794,8 +94320,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/port) @@ -94890,10 +94416,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -94911,7 +94437,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -94924,8 +94450,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/starboard) @@ -94984,8 +94510,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/engineering) @@ -95020,7 +94546,7 @@ "yfJ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/security/warden) @@ -95031,18 +94557,18 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) "ygc" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -95122,10 +94648,10 @@ /turf/open/floor/iron/dark, /area/storage/tech) "yho" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -95144,8 +94670,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "yhJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -95189,10 +94715,10 @@ /turf/open/floor/iron, /area/science/research) "yiH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -95221,10 +94747,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -95239,7 +94765,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark/smooth_corner{ @@ -95264,8 +94790,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "yjE" = ( @@ -95282,10 +94806,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -95314,10 +94838,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "ykO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -95328,10 +94852,10 @@ /area/hallway/primary/central) "yld" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -95344,12 +94868,12 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/service) "ylv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -107314,7 +106838,7 @@ aad wiQ qYo gyB -lWt +pGG fyj tMj dpf @@ -115824,7 +115348,7 @@ ckw cFH cHc cnI -ovX +eOe oQn caE caE @@ -116022,9 +115546,9 @@ eSj gXZ aPy aNS -aPy +aAR gXZ -afB +aSQ aRF aRF aRF @@ -116281,7 +115805,7 @@ aMw vKl aPz gXZ -hFo +aSR aRF aWt aXV @@ -116536,7 +116060,7 @@ aJH gXZ aMv aie -aPy +aAR gXZ aSQ aRF @@ -116595,7 +116119,7 @@ ckw cFJ wiQ cnI -ovX +eOe oQn caE cea @@ -118351,7 +117875,7 @@ biX bkK kso aMB -bpS +bmS brX rhR ffT @@ -118908,7 +118432,7 @@ cfC eLp cHh car -ovX +eOe kfN caE cea @@ -119165,7 +118689,7 @@ car xfy cbV car -ovX +eOe lUX caE cea @@ -119352,7 +118876,7 @@ awc axs ayG azP -aAR +azP aCh aDm aEl @@ -119364,12 +118888,12 @@ aFr aRF sqz dVY -aRw +bpS fKN sVV jfg vKI -tGN +tVp wMv tVp vKI @@ -119401,7 +118925,7 @@ sKi bPW oRI cbW -mit +dji cfD chw cjg @@ -120172,7 +119696,7 @@ bWn bTZ cau cbZ -jKr +wsA cfG trb cjj @@ -120190,7 +119714,7 @@ okT tTE ehv cDZ -bFF +wsA cHl cIq icI @@ -120476,7 +120000,7 @@ amU saw dPQ sif -wNF +wlt eaf eaf eaf @@ -120686,7 +120210,7 @@ bHV bHV bSl cca -jKr +wsA cfH chw chw @@ -121150,7 +120674,7 @@ avb awh axz ayK -axz +bJB aAW axz uYS @@ -121936,7 +121460,7 @@ uhB aPS aRv cfI -xQR +biO xtg sVr kuO @@ -122196,7 +121720,7 @@ aTd aUW aWO aYo -aWO +tGN bbK bbK beH @@ -122946,7 +122470,7 @@ alT niu atZ avi -awl +awe awe awe azX @@ -123203,7 +122727,7 @@ alT cVY vhp fMS -fMS +hFo sDW snl xQg @@ -123460,7 +122984,7 @@ alT alT alT avk -avk +afB alT alT rSv @@ -123829,7 +123353,7 @@ dJJ ovQ crK dLY -fqT +dOb dOM dOM dOM @@ -123943,18 +123467,18 @@ abZ abC abC acX -abC hOz -lzA abC +sjf abC abC -sjf abC -adt -lzA hOz abC +adt +sjf +abC +abC acX abC abC @@ -124200,17 +123724,17 @@ jwJ pPW pPW cCm -pPW tLY +pPW pLV pPW pPW pPW -oNu +tLY pPW pPW -pLV -tLY +oNu +pPW pPW kJv pPW @@ -125128,7 +124652,7 @@ dYu dYu dYu anT -dYu +hHr xQu dOM dYu @@ -126399,7 +125923,7 @@ gSi gSi eXQ cip -dLW +wLn grG dOM dYu @@ -127179,7 +126703,7 @@ dOM eXQ dYu eXQ -dYu +bLp eXQ dYu dYu @@ -127797,14 +127321,14 @@ hOz abZ abC abC -rWG -abC +acX +sjf abC abC abC abC abC -sjf +hOz abC adt knk @@ -128055,13 +127579,13 @@ jwJ pPW pPW kpc +oNu pPW pPW pPW pPW pPW -pPW -oNu +qiF pPW pPW nTX @@ -129869,7 +129393,7 @@ aaa aaa aid aiA -pZr +aeb yjz sCi voB @@ -131655,14 +131179,14 @@ abC acX adt abC -lzA +sjf abC abC abC abC abC abC -lzA +sjf abC abC acX @@ -131908,26 +131432,26 @@ abF abP acb cmn -cmn -cmn -eHV +smP +lRr +lRr +lRr +rKz uZO -mZS -cmn -cmn -cmn -cmn -cmn -cmn -mZS +bJU +qxM +nBe uZO -eHV -cmn -cmn -cmn -aiT -abZ -fxq +uZO +bJf +uZO +bJU +qxM +nBe +aop +wjf +eZR +gHK xSF akE akE @@ -132167,23 +131691,23 @@ mPH abD abD acY +abD +abD +kaE +abD hTQ -jxz -uUh -pPW -pPW -pPW -pPW -pPW -pPW -uUh -oNu +wtx +rPh +abD +abD +kaE +abD miw yaG -pPW -pPW -biC -jwJ +rPh +abD +bmw +abZ xMk dsQ akF @@ -132318,18 +131842,18 @@ dNL dNL dTE vpZ -bkl +cST mKO vpZ vpZ +fHV +gbe +gbe +gbe +pTO vpZ vpZ -vpZ -vpZ -vpZ -vpZ -vpZ -vpZ +nFT sOR edZ oJc @@ -132575,7 +132099,7 @@ eWx dNL dTE vpZ -bkl +xZE lsO gEI oBJ @@ -132583,10 +132107,10 @@ dYD oBJ gEI gEI -oBJ +bGf dYD oBJ -gEI +hjc edz eea wvg @@ -132683,14 +132207,14 @@ aaa aad aaa abf -fSE +fYO aaO aaO aaO aaO aaO abf -fSE +fYO aaO aaa aad @@ -132832,7 +132356,7 @@ obz fWI dTF vpZ -bkl +xZE mKO vpZ dXL @@ -132840,10 +132364,10 @@ dYE dZo vpZ vpZ -dXL +kKB dYE dZo -vpZ +bFn sOR eeb rOk @@ -132940,7 +132464,7 @@ aad aad aad aaO -uHG +eUz aaO aad aaa @@ -133089,7 +132613,7 @@ rsP dSN dTF vpZ -bkl +xZE mKO vpZ dXM @@ -133100,7 +132624,7 @@ vpZ ebl dYF ecG -vpZ +bFn sOR eec jBn @@ -133354,10 +132878,10 @@ dYG dZo tJb sqL -dXL +kKB dYG dZo -vpZ +bFn sOR egG whg @@ -133868,10 +133392,10 @@ dYE dZo gjn myu -dXL +kKB dYE dZo -sYX +vGb edB edY eek @@ -134043,10 +133567,10 @@ grk bKH hca oLg -cST +pMI sQH bUI -coe +bUI bUI vCq hGZ @@ -134054,7 +133578,7 @@ qDD cSI cSI bUI -coe +bUI wwj ejl hVx @@ -134124,8 +133648,8 @@ dXM dYF dZq vpZ -nFT -dXL +vpZ +kKB dYF ecG vGb @@ -134303,7 +133827,7 @@ xke hLc aKc wSs -xZE +nbB qUN fWG ccI @@ -134381,8 +133905,8 @@ dXL dYG dZo vpZ -fHV -dXL +vpZ +kKB dYG dZo vGb @@ -134556,7 +134080,7 @@ bHf jpx bKH pMI -pMI +fms rca sQH bUI @@ -134636,13 +134160,13 @@ kdu sPK hyz tAW -hyz +rTH tAW jpy -hyz +iIJ mpj hyz -jpy +qUd ghY pvO tMu @@ -134813,7 +134337,7 @@ jPE kOp bKH nAG -pMI +jbk pMI kiV bUI @@ -134892,9 +134416,9 @@ dUA dUA dUA dUA -rTH +sYX dUA -rTH +sYX dUA dUA dUA @@ -135149,15 +134673,15 @@ dVl dVl dVl dVl -bLp +rPy dVl -bLp +rPy dVl dVl dVl dVl dVl -bLp +rPy eeh omQ gAy @@ -136024,7 +135548,7 @@ aaO abf ads aaO -nsW +iDE aaO afb afz @@ -136281,14 +135805,14 @@ abC adb abC abC -lzA +sjf abC abC abC abC abC abC -lzA +sjf abC abC ahW @@ -136537,20 +136061,20 @@ cmn cmn cmn eHV -uZO -mZS cmn +vmH cmn cmn cmn cmn cmn -mZS -uZO -eHV +cmn +vmH cmn cmn cmn +mlT +cmn aiT abZ fxq @@ -136795,16 +136319,16 @@ xJj adc hTQ jxz -pLV +lwP pPW pPW pPW pPW pPW pPW -pLV oNu -miw +uUh +sdI fPi hby pPW @@ -137564,7 +137088,7 @@ iev reW thP qFh -udX +voY dxf wCU tyK @@ -139675,7 +139199,7 @@ aEh bcB bed jBL -qug +ttg vBR ukd lnY @@ -140189,7 +139713,7 @@ aQQ bcC bee sgR -qkd +bgO vwj tfL qBi @@ -140684,9 +140208,9 @@ ayC azF drU vIH -uOp +vIH kuZ -pOB +ocD vIH rPw ocD @@ -140941,9 +140465,9 @@ ayD ayD ayD hdH -tuk +azD aEg -tuk +azD kam aHV aHV @@ -140960,7 +140484,7 @@ aQQ bcE iYy bfE -vBR +seT ceQ xKe qTf @@ -141455,7 +140979,7 @@ aad abj aAJ aCc -tZn +tWh axn tWh aGE @@ -146889,7 +146413,7 @@ dmg eJB pQe cZJ -rPy +sdY sdY nbL sdY @@ -147707,7 +147231,7 @@ cIW cIW cHW vdx -mIs +bFF dkO cIX hKE @@ -147964,7 +147488,7 @@ qGo qGo lbV iqY -qGo +dzj ssL iEs syK @@ -148443,7 +147967,7 @@ eIo bhd wdw llz -mWn +ver erU wMt uHy @@ -151245,7 +150769,7 @@ aaa aaa tMO ukD -ldQ +dXJ eZl snQ dUH @@ -151761,8 +151285,8 @@ aaa aad wSb oZs -lPz -cuB +osE +kSW gaz bnG maz @@ -152541,7 +152065,7 @@ hUb jzY bnG txu -rbE +mQm mQm bLs nix @@ -152789,7 +152313,7 @@ aaa aad bhe gKq -lPz +osE cuB qfY mnz @@ -153561,7 +153085,7 @@ beh jhp bhd dNg -gbe +rTO edI bnG ydf @@ -153818,7 +153342,7 @@ aad aad bhd asw -nxk +rTO edI bnG ehS @@ -154332,7 +153856,7 @@ aaa aaa beh hgY -xod +hgY ooz beh aaa @@ -154588,9 +154112,9 @@ wiQ aad aad beh -aaa -aaa -aaa +xZM +xod +xZM beh aad aad diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 7d918b94e284b..1a506cb26e8c4 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -12,10 +12,7 @@ /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) "aay" = ( -/obj/machinery/atmospherics/miner/station/oxygen, -/obj/machinery/atmospherics/pipe/manifold/yellow/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output, /turf/open/floor/engine/o2, /area/engine/atmos) "aaz" = ( @@ -85,7 +82,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/tech/grid, @@ -167,7 +164,9 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "adv" = ( /obj/structure/chair/stool{ @@ -197,7 +196,7 @@ /turf/open/floor/iron/dark, /area/science/server) "aew" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "aeG" = ( @@ -216,22 +215,22 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface/grass) "aeQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) "aeZ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "afw" = ( @@ -258,7 +257,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "agO" = ( @@ -281,10 +281,10 @@ pixel_y = 22 }, /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, -/area/science/mixing/chamber) +/area/science/mixing) "ahg" = ( /obj/machinery/computer/operating, /turf/open/floor/iron/white, @@ -300,7 +300,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "ais" = ( @@ -385,7 +386,7 @@ uses = 10 }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -445,10 +446,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -587,6 +588,10 @@ /turf/open/floor/circuit/telecomms/server, /area/science/server) "amR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4; + hide = 0 + }, /turf/open/floor/iron/textured_edge{ dir = 1 }, @@ -601,7 +606,7 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "amV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/science/mixing/chamber) @@ -613,8 +618,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "anP" = ( @@ -676,23 +681,19 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) "aoJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/lattice/catwalk/over, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, /area/science/mixing) "aoM" = ( /obj/effect/spawner/structure/window/reinforced, @@ -703,12 +704,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/circuit/telecomms/server, /area/science/server) "aoY" = ( /obj/structure/lattice/catwalk/over, -/turf/open/openspace, +/turf/open/openspace{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "apg" = ( /obj/machinery/light{ @@ -742,7 +745,7 @@ dir = 10 }, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "apH" = ( /obj/structure/railing, /obj/effect/turf_decal/tile/blue/half{ @@ -752,10 +755,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/start/chief_medical_officer, @@ -861,10 +864,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -882,8 +885,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/bridge) @@ -914,7 +917,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/camera/directional/north, @@ -934,10 +937,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -976,7 +979,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/engine, @@ -1010,10 +1013,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -1037,7 +1040,7 @@ /turf/open/floor/iron, /area/security/prison) "aua" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input, /obj/machinery/sparker/toxmix{ name = "chamber igniter"; pixel_x = -16 @@ -1051,7 +1054,7 @@ /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -1060,10 +1063,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -1078,7 +1081,9 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "auE" = ( /turf/closed/wall/r_wall, @@ -1099,7 +1104,7 @@ /area/asteroid/paradise/surface/grass) "avD" = ( /obj/effect/turf_decal/delivery, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/disposal) "avP" = ( /obj/effect/landmark/start/head_of_personnel, @@ -1133,10 +1138,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -1172,10 +1177,13 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "ayf" = ( @@ -1195,10 +1203,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -1303,7 +1311,7 @@ /turf/open/floor/iron/white, /area/medical/storage) "aBF" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, +/obj/machinery/air_sensor/toxins_burn_chamber, /obj/effect/decal/cleanable/blood/old, /obj/machinery/igniter/incinerator_toxmix, /turf/open/floor/engine/vacuum, @@ -1358,10 +1366,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -1402,20 +1410,21 @@ /turf/open/floor/plating/ice/smooth/planetary, /area/asteroid/paradise/surface/water) "aCZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Atmos to Engine" }, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) @@ -1567,7 +1576,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/ai_slipper{ @@ -1615,10 +1624,10 @@ /obj/machinery/atmospherics/components/unary/portables_connector/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -1693,7 +1702,7 @@ /area/science/lab) "aJy" = ( /obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_y = 26 }, /obj/effect/turf_decal/stripes/line{ @@ -1703,7 +1712,7 @@ dir = 4 }, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "aJD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/north{ @@ -1719,10 +1728,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -1765,10 +1774,10 @@ /turf/open/floor/iron/dark, /area/science/mixing) "aJT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/railing{ @@ -1830,7 +1839,7 @@ /turf/open/openspace, /area/science/lab) "aLc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -1850,17 +1859,17 @@ /area/science/mixing/chamber) "aLl" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) "aLo" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light, @@ -1964,10 +1973,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -2008,10 +2017,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -2065,10 +2074,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -2088,10 +2097,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -2115,13 +2124,15 @@ "aRf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "aRi" = ( /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/science/mixing/chamber) "aRk" = ( @@ -2215,7 +2226,7 @@ /turf/open/floor/iron, /area/bridge) "aTx" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "aTZ" = ( @@ -2236,8 +2247,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "aUN" = ( @@ -2380,10 +2391,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -2533,7 +2544,7 @@ /obj/machinery/hydroponics/soil{ alpha = 200 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "baI" = ( /obj/structure/closet/radiation, @@ -2585,10 +2596,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -2610,7 +2621,7 @@ /area/hallway/primary/aft) "bbJ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/red, @@ -2626,7 +2637,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "bdh" = ( @@ -2652,10 +2664,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -2690,10 +2702,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/evac, @@ -2728,10 +2740,10 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "bfH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -2770,11 +2782,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/catwalk_floor/iron_dark, /area/tcommsat/computer) "bgu" = ( @@ -2797,7 +2809,9 @@ /area/security/prison/shielded) "bgV" = ( /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bhc" = ( /obj/machinery/computer/security/hos, @@ -2876,7 +2890,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/cafeteria) @@ -2897,7 +2910,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bkn" = ( /obj/structure/table/reinforced, @@ -2953,7 +2968,9 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bkW" = ( /obj/effect/turf_decal/stripes/line{ @@ -2994,7 +3011,7 @@ icon_state = "0-4" }, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/plating, @@ -3019,15 +3036,15 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface/sand) "bmU" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/textured_large, /area/engine/engineering) "bnh" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -3036,7 +3053,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -3124,7 +3141,7 @@ /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) "boA" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light{ dir = 4 }, @@ -3310,7 +3327,9 @@ /obj/structure/frame/computer{ anchored = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "btK" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -3326,10 +3345,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -3380,8 +3399,8 @@ pixel_y = 5; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "bvw" = ( @@ -3397,10 +3416,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -3438,8 +3457,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail{ dir = 1; name = "disposals"; @@ -3458,10 +3477,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -3500,7 +3519,7 @@ }, /obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3560,7 +3579,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bzE" = ( /obj/structure/cable{ @@ -3570,7 +3591,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine{ @@ -3588,7 +3609,9 @@ /area/maintenance/department/security/brig) "bAw" = ( /obj/effect/turf_decal/weather/snow, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface/sand) "bAN" = ( /obj/structure/disposalpipe/segment, @@ -3618,7 +3641,6 @@ /obj/machinery/door/airlock/engineering/glass{ name = "Construction Area" }, -/obj/machinery/door/firedoor, /turf/open/floor/wood, /area/library/abandoned) "bBz" = ( @@ -3641,17 +3663,19 @@ dir = 5 }, /obj/structure/railing/corner, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bBQ" = ( /obj/structure/flora/rock/icy, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) "bBT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -3682,13 +3706,13 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "bCQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "bCT" = ( @@ -3708,11 +3732,13 @@ /turf/closed/wall, /area/hydroponics) "bDG" = ( -/obj/machinery/computer/atmos_control/tank/nitrous_tank, -/obj/item/book/manual/wiki/atmospherics, /obj/effect/turf_decal/box/corners{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, /turf/open/floor/iron/smooth_large, /area/engine/atmos) "bDI" = ( @@ -3738,10 +3764,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -3762,10 +3788,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) "bEx" = ( @@ -3800,10 +3826,10 @@ /area/crew_quarters/kitchen/coldroom) "bEU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/poddoor{ @@ -3820,9 +3846,8 @@ /turf/open/floor/plating/asteroid/basalt/planetary, /area/engine/engineering) "bFY" = ( -/obj/machinery/atmospherics/miner/station/n2o, -/obj/machinery/atmospherics/pipe/simple/green/hidden, -/turf/open/floor/engine/n2o, +/obj/machinery/atmospherics/miner/station/carbon_dioxide, +/turf/open/floor/engine/co2, /area/engine/atmos) "bGl" = ( /obj/machinery/power/compressor{ @@ -3862,7 +3887,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/iron/solarpanel, +/turf/open/floor/iron/solarpanel/cold, /area/asteroid/paradise/surface) "bHi" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -3880,10 +3905,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating/asteroid/planetary, @@ -3892,10 +3917,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -3944,10 +3969,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"bJq" = ( -/obj/structure/flora/rock/pile/icy, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) "bJr" = ( /obj/structure/closet/firecloset/full, /obj/effect/turf_decal/tile/red{ @@ -3974,16 +3995,13 @@ name = "Emergancy Escape Shutters"; pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/engine, /area/science/mixing/chamber) "bKc" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, -/obj/machinery/atmospherics/pipe/manifold/yellow/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output, /turf/open/floor/engine/n2, /area/engine/atmos) "bKw" = ( @@ -4044,7 +4062,7 @@ pixel_x = -4; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, @@ -4056,10 +4074,10 @@ light_range = 9 }, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "bMd" = ( /obj/effect/decal/cleanable/shreds, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "bMh" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -4076,10 +4094,10 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -4090,7 +4108,7 @@ }, /obj/structure/flora/ausbushes/lavendergrass, /obj/machinery/airalarm/directional/north, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "bMW" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -4104,10 +4122,10 @@ dir = 8 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/ai_slipper{ @@ -4153,10 +4171,10 @@ "bPb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -4179,7 +4197,9 @@ /obj/structure/fence/door{ req_one_access_txt = "32" }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bPY" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -4215,10 +4235,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment, @@ -4232,7 +4252,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile/icy, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bRn" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -4246,7 +4268,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "bSh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -4255,7 +4279,7 @@ /turf/open/floor/iron/dark, /area/bridge) "bSl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -4269,10 +4293,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -4331,14 +4355,19 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/large, /area/hydroponics) "bUA" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/cafeteria) "bUC" = ( @@ -4352,7 +4381,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /turf/open/floor/plating, @@ -4429,7 +4458,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -4493,7 +4522,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -4505,7 +4534,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -4529,10 +4558,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/purple, @@ -4548,10 +4577,10 @@ /area/science/mixing/chamber) "cag" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -4574,8 +4603,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -4642,8 +4671,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "ccl" = ( @@ -4658,10 +4687,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -4679,7 +4708,7 @@ /obj/structure/window/plasma/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /obj/structure/cable{ @@ -4804,16 +4833,16 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, /area/science/lab) "cgS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 8 }, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -4852,10 +4881,10 @@ /turf/closed/wall, /area/storage/primary) "ciU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -4870,7 +4899,7 @@ alpha = 100; dir = 8 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "cjH" = ( /obj/effect/spawner/lootdrop/maintenance/two, @@ -4882,17 +4911,18 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "cjY" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/half, @@ -4901,10 +4931,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -4929,10 +4959,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/half, @@ -4942,10 +4972,10 @@ /turf/open/floor/plating/ice/smooth/planetary, /area/asteroid/paradise/surface/water) "ckM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -5015,10 +5045,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, @@ -5031,8 +5061,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/pipedispenser, -/turf/open/floor/iron/techmaint/planetary, +/obj/machinery/pipe_dispenser, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "cmN" = ( /turf/open/floor/glass/reinforced/plasma, @@ -5060,10 +5092,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -5184,7 +5216,7 @@ "cpg" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -5198,10 +5230,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -5244,17 +5276,19 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "cqp" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 }, -/turf/open/floor/plating/asteroid/basalt/planetary, +/turf/open/floor/plating/asteroid/basalt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/engine/engineering) "cqs" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/red, @@ -5293,14 +5327,18 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "crW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "csf" = ( /obj/structure/railing{ @@ -5336,8 +5374,8 @@ /area/bridge) "cto" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/science/central) @@ -5345,7 +5383,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/carpet/red, @@ -5407,20 +5445,20 @@ pixel_x = -32 }, /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer_2, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "cwz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -5428,7 +5466,8 @@ "cwW" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "cxe" = ( @@ -5472,8 +5511,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/science/central) @@ -5499,10 +5538,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -5511,7 +5550,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -5521,10 +5560,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -5583,7 +5622,8 @@ dir = 5 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "cBs" = ( @@ -5667,13 +5707,13 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -5684,8 +5724,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, @@ -5701,10 +5741,10 @@ /area/bridge/meeting_room) "cDD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/rack, @@ -5721,10 +5761,10 @@ /area/security/brig) "cDM" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -5761,7 +5801,7 @@ /area/crew_quarters/cafeteria) "cEL" = ( /obj/structure/flora/junglebush/c, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /obj/machinery/button/door{ @@ -5846,8 +5886,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "cIr" = ( @@ -5856,10 +5896,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -5896,8 +5936,8 @@ /area/security/warden) "cJf" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -5915,7 +5955,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -5980,7 +6020,7 @@ "cKQ" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "cKT" = ( /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/hallway/primary/fore) @@ -6003,7 +6043,7 @@ "cNa" = ( /obj/structure/flora/ash/tall_shroom, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "cNm" = ( /obj/structure/cable{ icon_state = "1-4" @@ -6014,7 +6054,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "cNL" = ( /obj/machinery/door/airlock/security{ @@ -6035,7 +6077,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6062,7 +6104,9 @@ /obj/structure/fence/corner{ dir = 1 }, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "cPr" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -6123,10 +6167,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -6208,8 +6252,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -6289,7 +6333,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "cXj" = ( @@ -6301,10 +6346,10 @@ "cXy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -6316,7 +6361,8 @@ }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "cXD" = ( @@ -6364,13 +6410,13 @@ "cXQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "cYx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -6419,14 +6465,19 @@ dir = 4 }, /obj/structure/sign/warning/fire, -/turf/open/floor/plating/asteroid/snow/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "cZv" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/components/binary/pump{ + name = "N2 to Pure" + }, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/layer2/flipped/inverse{ + dir = 8 + }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "cZy" = ( /obj/structure/table/reinforced, @@ -6454,7 +6505,7 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface) "daZ" = ( -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -6463,7 +6514,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "dbe" = ( @@ -6503,20 +6554,8 @@ /turf/open/floor/iron, /area/teleporter) "dbG" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2/layer4{ - dir = 8 - }, -/turf/open/floor/iron/smooth_half, +/obj/machinery/air_sensor/mix_tank, +/turf/open/floor/engine/airless, /area/engine/atmos) "dbP" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -6529,10 +6568,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/camera/directional/west, @@ -6573,10 +6612,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "ddW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/reagent_dispensers/fueltank, @@ -6621,8 +6660,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/window/northleft{ @@ -6641,8 +6680,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -6682,13 +6721,13 @@ /area/quartermaster/qm) "dfx" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) "dfX" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/lootdrop/grille_or_trash, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -6739,15 +6778,20 @@ /turf/open/floor/iron/large, /area/engine/engineering) "dgF" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters"; name = "chemistry Shutters" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/apothecary) "dgG" = ( @@ -6776,10 +6820,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -6795,8 +6839,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) @@ -6867,7 +6911,7 @@ alpha = 100; dir = 4 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "diS" = ( /obj/structure/closet, @@ -6879,7 +6923,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -6922,7 +6966,9 @@ dir = 8 }, /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "dkh" = ( /obj/machinery/computer/security/qm{ @@ -6997,10 +7043,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -7008,6 +7054,10 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) +"dlR" = ( +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron, +/area/hallway/primary/fore) "dmw" = ( /obj/machinery/camera/directional/north, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -7043,7 +7093,7 @@ /turf/closed/wall/r_wall, /area/security/warden) "dnm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 1 }, /turf/open/floor/engine/airless, @@ -7091,8 +7141,9 @@ /turf/open/floor/plating, /area/engine/supermatter) "dpe" = ( -/obj/machinery/ai_slipper{ - uses = 10 +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 }, /turf/open/floor/iron/smooth_half{ dir = 1 @@ -7169,10 +7220,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/grille/broken, @@ -7216,7 +7267,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/multiz{ @@ -7264,10 +7315,10 @@ /turf/open/floor/plating/asteroid/frozengrass, /area/asteroid/paradise/surface) "dvV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -7299,7 +7350,7 @@ /area/security/brig) "dxs" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -7354,7 +7405,7 @@ /area/maintenance/department/security/brig) "dzp" = ( /obj/structure/flora/grass/jungle/b, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating/asteroid/planetary, @@ -7385,10 +7436,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -7396,10 +7447,6 @@ "dzW" = ( /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"dAb" = ( -/obj/effect/turf_decal/weather/snow, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface/grass) "dAf" = ( /obj/structure/chair/fancy/bench/corporate{ dir = 1 @@ -7438,7 +7485,7 @@ alpha = 100; dir = 6 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "dBm" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7500,7 +7547,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "dCG" = ( @@ -7579,10 +7627,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 2 @@ -7653,17 +7701,18 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "dGh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -7679,11 +7728,11 @@ /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) "dGG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 9 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Pure to Mix"; + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "dGK" = ( /obj/structure/closet/crate, @@ -7761,10 +7810,10 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/window/reinforced/tinted{ @@ -7786,7 +7835,7 @@ /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) "dIK" = ( -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "dJr" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7838,10 +7887,8 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "dKP" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/paper_bin{ @@ -7901,13 +7948,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -7917,6 +7964,16 @@ /area/security/brig) "dML" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 4; + name = "Distro to Waste" + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron/textured_large, /area/engine/atmos) "dMS" = ( @@ -7955,12 +8012,15 @@ "dNK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "dNX" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "dOa" = ( @@ -8027,13 +8087,12 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "dPG" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/test_area) "dPH" = ( @@ -8050,8 +8109,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/landmark/start/scientist, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 @@ -8102,11 +8161,11 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/iron/dark/telecomms{ @@ -8121,25 +8180,20 @@ /turf/open/floor/plating/ice/smooth/planetary, /area/asteroid/paradise/surface/water) "dQA" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/obj/machinery/computer/atmos_control/tank/plasma_tank{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/smooth_half{ dir = 1 }, /area/engine/atmos) "dQC" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -8182,10 +8236,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/porta_turret/ai{ @@ -8254,7 +8308,9 @@ pixel_x = 2; pixel_y = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "dTL" = ( /obj/structure/railing{ @@ -8330,10 +8386,10 @@ "dVS" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 6 }, /turf/open/floor/plating/asteroid/planetary, @@ -8373,10 +8429,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/digital_clock/directional/north, @@ -8407,13 +8463,13 @@ /obj/effect/turf_decal/siding/white/end{ alpha = 100 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "dYY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/ai_slipper{ @@ -8422,10 +8478,12 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "dZF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/research/abandoned) +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE" + }, +/turf/open/floor/plating/rust, +/area/science/test_area) "eaA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -8439,8 +8497,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_one_access_txt = "7;29;12" @@ -8454,7 +8512,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /obj/machinery/power/rad_collector/anchored, @@ -8531,7 +8589,6 @@ /area/hallway/primary/central) "edK" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/pet/hamster/vector{ pixel_x = 1; pixel_y = 10 @@ -8571,8 +8628,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -8609,10 +8666,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/flora/ausbushes/sparsegrass, @@ -8630,10 +8687,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -8660,19 +8717,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 }, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible/layer4, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "eiT" = ( /obj/structure/cable/yellow{ @@ -8748,7 +8800,7 @@ /area/asteroid/paradise/surface/sand) "eni" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -8788,10 +8840,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/ai_slipper{ @@ -8800,7 +8849,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/tech, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron, /area/science/mixing) "eoF" = ( /obj/machinery/conveyor{ @@ -8836,10 +8891,8 @@ /turf/open/floor/plating, /area/maintenance/disposal) "eoL" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 8 - }, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/engine/air, /area/engine/atmos) "eoS" = ( /turf/open/floor/plating/ice/smooth/planetary, @@ -8871,7 +8924,7 @@ /area/ai_monitored/turret_protected/aisat/foyer) "epN" = ( /obj/structure/reflector/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/box/white, /turf/open/floor/iron/textured_large, /area/engine/engineering) @@ -8918,8 +8971,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -8947,7 +9000,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /turf/open/floor/iron/smooth_corner, @@ -9023,8 +9076,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/chapel) @@ -9049,7 +9102,9 @@ name = "Tom" }, /obj/structure/closet/crate/critter, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface/grass) "eug" = ( /obj/structure/table/wood, @@ -9200,10 +9255,10 @@ alpha = 100; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -9233,7 +9288,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitory" }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/dorms) "eyu" = ( @@ -9257,15 +9311,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/wood, /area/chapel/main) "ezz" = ( @@ -9281,7 +9335,9 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "ezN" = ( -/turf/open/floor/iron/stairs, +/turf/open/floor/iron/stairs{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "ezT" = ( /obj/item/kirbyplants/random, @@ -9339,26 +9395,26 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "eBm" = ( /obj/structure/railing/corner, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/atmos/glass{ @@ -9368,9 +9424,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "eBu" = ( @@ -9383,14 +9436,14 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180; dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "eBA" = ( @@ -9403,7 +9456,7 @@ /turf/open/floor/iron, /area/engine/atmos) "eBB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -9416,8 +9469,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "eBP" = ( @@ -9469,7 +9522,7 @@ pixel_x = 1; pixel_y = 26 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "eDk" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -9491,7 +9544,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "eEc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -9508,12 +9561,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/security/prison) +"eEm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron/large, +/area/hydroponics) "eEo" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -9522,10 +9584,10 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -9544,8 +9606,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -9601,10 +9663,10 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "eHd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -9619,8 +9681,8 @@ /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -9709,11 +9771,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "eKt" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "eKX" = ( /turf/closed/wall, @@ -9790,7 +9855,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "eNn" = ( /obj/item/radio/intercom{ @@ -9803,7 +9870,7 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "eNy" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input/layer4, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input, /turf/open/floor/engine/n2, /area/engine/atmos) "eNz" = ( @@ -9811,8 +9878,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "eND" = ( @@ -9826,7 +9893,9 @@ /obj/structure/window/reinforced/survival_pod{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "eNV" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -9840,7 +9909,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "eOr" = ( /obj/structure/lattice/catwalk/over, @@ -9851,10 +9922,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -9891,10 +9962,10 @@ /area/ai_monitored/turret_protected/ai) "ePw" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -9915,7 +9986,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "ePW" = ( @@ -9991,10 +10063,6 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, /turf/open/floor/iron/tech, /area/science/mixing) "eQM" = ( @@ -10045,17 +10113,17 @@ /area/asteroid/paradise/surface) "eST" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "eTf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 9 }, /obj/structure/table, @@ -10106,7 +10174,7 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "eUg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -10121,7 +10189,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) "eUm" = ( @@ -10184,7 +10252,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "eVr" = ( @@ -10223,8 +10292,8 @@ /turf/open/floor/iron/white, /area/science/robotics) "eWk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -10240,13 +10309,15 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "eWv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/ladder, @@ -10262,8 +10333,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "eWS" = ( @@ -10301,7 +10372,7 @@ }, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/cable, -/turf/open/floor/iron/solarpanel, +/turf/open/floor/iron/solarpanel/cold, /area/asteroid/paradise/surface) "eXZ" = ( /obj/machinery/computer/atmos_control{ @@ -10382,9 +10453,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_x = 8; pixel_y = 24 @@ -10392,6 +10460,9 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "eZt" = ( @@ -10419,7 +10490,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "eZH" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -10469,8 +10542,10 @@ /turf/open/floor/plating/ice/smooth/planetary, /area/asteroid/paradise/surface/water) "faZ" = ( -/turf/closed/wall/r_wall, -/area/quartermaster/warehouse) +/obj/structure/flora/rock/pile/icy, +/obj/item/circuitboard/machine/circulator, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "fbe" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -10498,10 +10573,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -10514,8 +10589,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail{ dir = 8; sortType = 14 @@ -10557,7 +10632,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "fcz" = ( @@ -10570,7 +10646,7 @@ dir = 10 }, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "fcP" = ( /obj/structure/chair/office{ dir = 8 @@ -10677,7 +10753,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/plating/snowed/colder, +/turf/open/floor/iron, /area/hallway/primary/fore) "ffv" = ( /obj/effect/turf_decal/siding/wideplating/terracotta{ @@ -10694,21 +10770,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/lab) "ffZ" = ( /obj/structure/window/plasma/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/co2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -10724,10 +10800,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -10744,7 +10820,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/large, @@ -10794,10 +10870,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/junction, @@ -10845,7 +10921,7 @@ pixel_x = 4; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/item/toy/plush/nukeplushie{ @@ -10880,10 +10956,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10922,7 +10998,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "fkW" = ( @@ -10949,7 +11026,7 @@ /turf/open/floor/iron/sepia, /area/quartermaster/storage) "fmE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output, /turf/open/floor/engine/air, /area/engine/atmos) "fmH" = ( @@ -10960,10 +11037,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/grille/broken, @@ -10973,10 +11050,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -11042,8 +11119,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -11058,10 +11135,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ @@ -11126,31 +11203,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"fqt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "External Gas to Loop" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/smooth_half{ - dir = 1 - }, -/area/engine/engineering) "fqC" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -11173,7 +11233,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "fsb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -11182,9 +11242,12 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "fsp" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/weather/snow, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise/surface) "fti" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 @@ -11214,12 +11277,9 @@ /obj/structure/window/plasma/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/components/trinary/mixer/airmix/layer2/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "ftp" = ( @@ -11306,10 +11366,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -11377,7 +11437,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine{ @@ -11416,7 +11476,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "fzr" = ( @@ -11480,13 +11541,13 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = 38; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /turf/open/floor/engine, @@ -11546,10 +11607,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -11589,7 +11650,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "fEV" = ( @@ -11600,8 +11662,8 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "fFd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -11646,22 +11708,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 10 }, /turf/open/floor/iron/grid/steel, /area/science/mixing) @@ -11677,7 +11729,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/oil/slippery, @@ -11692,10 +11744,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -11708,7 +11760,7 @@ /turf/open/floor/plating, /area/engineering/hallway) "fHS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /obj/machinery/button/door{ @@ -11728,7 +11780,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "fHW" = ( /obj/structure/reagent_dispensers/watertank, @@ -11744,10 +11796,10 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "fIy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/railing{ @@ -11759,10 +11811,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -11788,10 +11840,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -11806,10 +11858,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -11839,10 +11891,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -11852,7 +11904,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "fKr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/large, /area/engine/engineering) "fKu" = ( @@ -11898,7 +11950,9 @@ /obj/structure/fence/corner{ dir = 8 }, -/turf/open/floor/plating/asteroid/frozengrass, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "fMh" = ( /obj/structure/ladder, @@ -11918,8 +11972,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -11934,10 +11988,10 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -12019,7 +12073,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -12067,16 +12121,16 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, /area/science/lab) "fPb" = ( /obj/effect/decal/cleanable/generic, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "fPc" = ( /obj/structure/flora/junglebush/c, @@ -12090,8 +12144,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/structure/table_frame, -/obj/item/stack/rods/five, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "fPV" = ( @@ -12104,10 +12156,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/ai_slipper{ uses = 10 }, @@ -12115,7 +12167,7 @@ /area/crew_quarters/cafeteria) "fQo" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/railing/corner{ @@ -12166,8 +12218,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -12181,10 +12233,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/closet/cardboard, @@ -12212,10 +12264,11 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "fRJ" = ( @@ -12264,7 +12317,7 @@ /obj/machinery/door/airlock/research/glass{ req_one_access_txt = "7;29" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -12314,7 +12367,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/test_area) "fUh" = ( /obj/effect/spawner/structure/window/reinforced, @@ -12419,7 +12472,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "fVM" = ( /obj/effect/turf_decal/stripes/line{ @@ -12437,12 +12492,11 @@ /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "fWU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/weather/snow, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, -/obj/structure/fence, -/turf/open/floor/plating/asteroid/snow/planetary, -/area/asteroid/paradise/surface) +/area/asteroid/paradise/surface/grass) "fXL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12470,8 +12524,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/security/brig) "fYN" = ( @@ -12511,10 +12565,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -12524,8 +12578,8 @@ alpha = 180 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -12558,7 +12612,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "gcq" = ( /obj/machinery/light_switch{ @@ -12587,7 +12643,7 @@ /turf/open/floor/prison/dark, /area/security/prison) "gdz" = ( -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -12621,8 +12677,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ dir = 4 }, @@ -12722,10 +12778,10 @@ /area/storage/primary) "gfQ" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -12736,11 +12792,13 @@ }, /area/science/research) "ggb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/asteroid/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/engine/engineering) "ggi" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/color_adapter{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -12774,14 +12832,11 @@ "ghR" = ( /obj/item/pipe_dispenser, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "ghT" = ( -/obj/machinery/air_sensor/atmos/sm_core, +/obj/machinery/air_sensor/engine_chamber, /turf/open/floor/engine, /area/engine/supermatter) -"gid" = ( -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) "gij" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -12833,8 +12888,9 @@ /turf/open/openspace, /area/engineering/hallway) "giS" = ( -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/plating/asteroid, +/area/asteroid/paradise) "giU" = ( /obj/structure/chair/stool/bar/directional/west, /obj/structure/disposalpipe/segment{ @@ -12886,7 +12942,6 @@ /area/crew_quarters/heads/hor) "gjo" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -12922,17 +12977,17 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) "gjT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -12954,6 +13009,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/circuit/telecomms/server, /area/science/server) "gkC" = ( @@ -12991,8 +13047,11 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "glK" = ( -/turf/open/floor/plating/snowed/colder, -/area/hallway/primary/fore) +/obj/effect/turf_decal/weather/snow, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise/surface) "glQ" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -13061,7 +13120,7 @@ /turf/open/floor/iron, /area/science/lab) "gms" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -13106,10 +13165,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -13184,10 +13243,10 @@ /turf/open/floor/plating, /area/engine/engineering) "gra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/grass/no_border, @@ -13210,14 +13269,14 @@ /turf/open/floor/pod/dark, /area/bridge/meeting_room) "grx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) "grQ" = ( -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -13227,10 +13286,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -13298,10 +13357,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -13319,10 +13378,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/sepia, @@ -13445,9 +13504,9 @@ /turf/open/floor/wood, /area/library/abandoned) "gxI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/large, /area/engine/engineering) "gxN" = ( @@ -13559,10 +13618,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -13588,10 +13647,10 @@ /turf/open/floor/engine, /area/science/xenobiology) "gBy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/science/test_area) +/turf/open/openspace{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise) "gBH" = ( /obj/item/kirbyplants/random{ pixel_y = 22 @@ -13668,7 +13727,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/test_area) "gDY" = ( /turf/closed/wall/r_wall, @@ -13699,10 +13758,10 @@ "gEU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/power/apc/auto_name/directional/north{ @@ -13713,11 +13772,6 @@ }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"gFd" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/engine/plasma, -/area/engine/atmos) "gFg" = ( /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; @@ -13737,20 +13791,6 @@ }, /turf/open/floor/iron, /area/medical/genetics/cloning) -"gFA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8; - name = "Loop to Gas Output" - }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/smooth_half{ - dir = 1 - }, -/area/engine/engineering) "gFM" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -13760,7 +13800,7 @@ /obj/machinery/door/airlock/research/glass{ req_one_access_txt = "7;29" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -13807,7 +13847,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -13827,10 +13867,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/numbers{ @@ -13946,8 +13986,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) +/turf/open/floor/plating/asteroid, +/area/asteroid/paradise) "gKl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -13975,10 +14015,10 @@ "gLd" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -13989,7 +14029,7 @@ /area/storage/primary) "gLH" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output/layer2, +/obj/machinery/atmospherics/miner/station/oxygen, /turf/open/floor/engine/o2, /area/engine/atmos) "gLR" = ( @@ -14009,14 +14049,16 @@ "gML" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/sandbags, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "gMP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /mob/living/simple_animal/bot/secbot/pingsky, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine, @@ -14029,7 +14071,9 @@ /obj/effect/turf_decal/evac/evac_big{ dir = 4 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "gND" = ( /obj/structure/table, @@ -14058,7 +14102,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/aft) "gOx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ name = "Fuel Pipe to Incinerator" @@ -14066,7 +14110,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/box/white, /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) @@ -14075,10 +14119,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -14112,8 +14156,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/destination/atmospherics, @@ -14181,7 +14225,8 @@ dir = 9 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "gRw" = ( @@ -14295,10 +14340,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -14428,13 +14473,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /turf/open/floor/iron/dark, @@ -14456,8 +14501,8 @@ /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) "gYg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -14472,7 +14517,7 @@ /area/maintenance/department/science/xenobiology) "gYZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -14597,7 +14642,7 @@ /area/engineering/hallway) "hcr" = ( /obj/effect/landmark/observer_start, -/turf/open/floor/plating/snowed/colder, +/turf/open/floor/iron, /area/hallway/primary/fore) "hcv" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -14614,7 +14659,7 @@ /area/crew_quarters/heads/cmo) "hcA" = ( /obj/structure/chair/stool/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, @@ -14639,7 +14684,9 @@ }, /obj/structure/fence/cut/large, /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "hdn" = ( /obj/effect/spawner/structure/window, @@ -14685,10 +14732,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -14702,16 +14749,16 @@ /turf/open/floor/plating, /area/maintenance/department/science/central) "hdU" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /obj/machinery/light, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer_4{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "hdY" = ( @@ -14719,10 +14766,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_white, @@ -14746,10 +14793,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -14780,7 +14827,8 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "hgB" = ( @@ -14895,10 +14943,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -14923,8 +14971,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -14957,10 +15005,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -14986,10 +15034,13 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/apothecary) "hny" = ( @@ -14997,7 +15048,7 @@ dir = 9 }, /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/test_area) "hnY" = ( /obj/structure/sign/departments/minsky/research/research, @@ -15030,7 +15081,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -15045,8 +15096,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -15058,16 +15109,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -15109,17 +15160,6 @@ /obj/structure/chair/fancy/plastic, /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface/sand) -"hpW" = ( -/obj/effect/turf_decal/box/white, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "server vent" - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "hqd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -15161,9 +15201,11 @@ "hrt" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/stripes/box, -/obj/structure/sign/painting/library{ - pixel_x = 1; - pixel_y = 29 +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/science/mixing/chamber" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, /turf/open/floor/iron, /area/science/mixing) @@ -15186,7 +15228,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/large, /area/hydroponics) "hse" = ( @@ -15199,10 +15242,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/numbers/two_nine{ @@ -15240,10 +15283,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -15293,8 +15336,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -15351,10 +15394,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -15389,7 +15432,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "hwE" = ( @@ -15409,7 +15453,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "hxu" = ( @@ -15439,7 +15483,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/iron/smooth_half{ @@ -15485,6 +15529,9 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/science/server) "hyQ" = ( @@ -15551,10 +15598,10 @@ /turf/open/floor/iron, /area/science/research) "hAx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -15566,11 +15613,11 @@ /obj/item/flashlight/lantern{ pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/wood, /area/chapel/main) @@ -15589,10 +15636,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/security/flip{ @@ -15631,8 +15678,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) "hBA" = ( @@ -15654,11 +15701,8 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "hBV" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "hCl" = ( /obj/structure/closet/emcloset/anchored, @@ -15702,6 +15746,9 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 5 + }, /turf/open/floor/iron/smooth_corner{ dir = 4 }, @@ -15739,10 +15786,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/research/glass{ @@ -15754,7 +15801,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1; initialize_directions = 1 }, @@ -15811,7 +15858,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -15866,7 +15913,7 @@ id = "atmos_incinerator_igniter"; pixel_x = -17 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 1 }, /turf/open/floor/engine/vacuum, @@ -15918,7 +15965,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine{ @@ -15985,8 +16032,8 @@ name = "Interrogation"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -16026,7 +16073,7 @@ /turf/open/floor/plating, /area/maintenance/department/chapel) "hLg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, @@ -16035,8 +16082,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "hLr" = ( @@ -16081,16 +16128,16 @@ /area/ai_monitored/turret_protected/ai) "hMu" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) "hMv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -16114,8 +16161,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/science/server) "hPk" = ( @@ -16172,10 +16219,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -16264,10 +16311,10 @@ /area/maintenance/department/crew_quarters/dorms) "hTi" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/power/apc/auto_name/directional/south{ @@ -16374,10 +16421,10 @@ dir = 10 }, /obj/effect/turf_decal/evac, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "hVN" = ( @@ -16409,13 +16456,13 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "hXM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -16434,16 +16481,16 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) "hYV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16470,7 +16517,9 @@ /area/engine/engineering) "ial" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "iao" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -16491,7 +16540,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/snowed/colder, +/turf/open/floor/iron, /area/hallway/primary/fore) "iaR" = ( /turf/closed/wall, @@ -16502,8 +16551,8 @@ /area/hallway/primary/central) "ibc" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16547,7 +16596,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -16570,17 +16619,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) @@ -16602,10 +16648,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -16656,7 +16702,7 @@ /area/quartermaster/storage) "ieX" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/ice, +/turf/closed/wall, /area/hallway/primary/fore) "ifj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -16695,7 +16741,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "ifQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /turf/closed/wall, @@ -16724,8 +16770,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 5 }, /turf/open/floor/iron/textured_large, /area/engine/atmos) @@ -16761,7 +16807,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -16787,10 +16833,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -16831,10 +16877,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -16857,8 +16903,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/destination/genetics{ dir = 8 }, @@ -16870,7 +16916,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "ill" = ( /obj/machinery/light{ @@ -16901,7 +16949,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/blue, @@ -16918,10 +16966,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -16934,8 +16982,8 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/bridge) @@ -16944,13 +16992,11 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "inB" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/textured_edge{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ + dir = 4 }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "inR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -16984,8 +17030,8 @@ /area/maintenance/department/science/central) "ioD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid/basalt/planetary, /area/engine/engineering) "ioR" = ( @@ -17012,7 +17058,7 @@ /turf/open/floor/iron, /area/medical/medbay/central) "ipv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 4 }, /turf/open/floor/plating/asteroid/planetary, @@ -17035,7 +17081,10 @@ /area/hallway/primary/aft) "ipP" = ( /obj/effect/landmark/start/cook, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "iry" = ( @@ -17153,10 +17202,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -17175,10 +17224,10 @@ /area/asteroid/paradise) "iwn" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -17235,10 +17284,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "iwI" = ( @@ -17271,10 +17325,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -17300,8 +17354,8 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "iyc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "iyS" = ( @@ -17342,7 +17396,7 @@ /obj/effect/turf_decal/siding/dark/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark/side{ @@ -17371,25 +17425,22 @@ /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "iBJ" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/railing, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "iBP" = ( @@ -17416,20 +17467,20 @@ pixel_x = 5; pixel_y = 4 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "iDs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/engine/engineering) "iDR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/firealarm/directional/north, @@ -17458,7 +17509,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "iEj" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /obj/structure/table, @@ -17494,7 +17545,6 @@ name = "Server Room"; req_access_txt = "61" }, -/obj/machinery/door/firedoor, /obj/structure/cable{ icon_state = "1-2" }, @@ -17506,8 +17556,8 @@ }, /obj/structure/fans/tiny, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -17548,7 +17598,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "iFw" = ( /obj/structure/table/reinforced, @@ -17694,10 +17746,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -17729,8 +17781,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -17761,7 +17813,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -17769,11 +17821,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"iKR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/science/research/abandoned) "iKU" = ( /obj/machinery/door/airlock/medical{ name = "Surgery Theatre"; @@ -17784,8 +17831,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/surgery) "iKX" = ( @@ -17796,10 +17843,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/railing/corner{ dir = 8 @@ -17852,16 +17899,16 @@ /area/quartermaster/storage) "iNk" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "iNv" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/multiz/down{ @@ -17883,10 +17930,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -17943,8 +17990,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/orange, /area/quartermaster/qm) "iQd" = ( @@ -18075,10 +18122,10 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "iUB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/light/small{ @@ -18104,12 +18151,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/railing/corner, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark/side{ @@ -18159,10 +18206,10 @@ }, /obj/machinery/camera/directional/south, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -18184,17 +18231,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "iYa" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - dir = 4 - }, /obj/structure/window/plasma/reinforced, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "iYl" = ( @@ -18233,11 +18282,26 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "iZP" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) +"iZS" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "iZV" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/aisat/foyer) @@ -18266,10 +18330,10 @@ /turf/open/floor/plating, /area/maintenance/department/chapel) "jbk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/railing{ dir = 4 }, @@ -18284,7 +18348,7 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "jct" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 1 }, /turf/open/floor/engine/plasma, @@ -18315,10 +18379,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light, @@ -18342,10 +18406,10 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "jeZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -18399,10 +18463,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/red, @@ -18421,10 +18485,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18473,8 +18537,8 @@ /turf/open/floor/wood, /area/library/abandoned) "jjc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -18505,7 +18569,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "jkj" = ( @@ -18542,13 +18607,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/wood, /area/chapel/main) "jkS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -18656,10 +18718,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/start/security_officer, @@ -18678,7 +18740,7 @@ /turf/open/floor/iron/dark, /area/engineering/hallway) "jnO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 4 }, /obj/effect/spawner/structure/window/depleteduranium, @@ -18691,7 +18753,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/sorting/mail/destination/cmo_office/flip{ @@ -18747,14 +18809,16 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "jpL" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, /turf/open/floor/iron/textured_edge, /area/engine/atmos) "jqc" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/siding/dark/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "jqp" = ( @@ -18784,10 +18848,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/toxins{ dir = 1 }, @@ -18830,8 +18894,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/primary) "jrH" = ( @@ -18934,10 +18998,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -18957,10 +19021,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/junction{ @@ -19033,12 +19097,10 @@ /turf/open/openspace, /area/medical/medbay/central) "jwO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/iron/textured_edge{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ + dir = 9 }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "jwW" = ( /obj/effect/turf_decal/siding/wood{ @@ -19060,7 +19122,9 @@ dir = 1 }, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "jxW" = ( /obj/effect/turf_decal/stripes/line{ @@ -19075,10 +19139,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -19132,10 +19196,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -19181,10 +19245,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -19220,7 +19284,6 @@ /area/crew_quarters/theatre/backstage) "jCG" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/rust, /area/science/test_area) @@ -19251,8 +19314,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/chapel) "jDC" = ( @@ -19268,8 +19331,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -19279,10 +19342,10 @@ /obj/machinery/door/morgue{ name = "Confession Booth" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -19321,17 +19384,16 @@ /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "jEN" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 +/obj/machinery/firealarm/directional/south, +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 1; - name = "Plasma to Pure" +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/window/plasma/reinforced, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/engine/atmos) +/obj/machinery/disposal/bin, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "jES" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19347,7 +19409,7 @@ "jEW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/start/assistant, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "jFp" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -19488,10 +19550,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -19515,13 +19577,11 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/structure/table, /obj/item/wallframe/extinguisher_cabinet{ pixel_x = -1; pixel_y = 31 }, -/obj/item/storage/toolbox/electrical, -/obj/item/clothing/gloves/color/yellow, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "jIM" = ( @@ -19563,7 +19623,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "jKk" = ( /obj/effect/turf_decal/bot{ @@ -19629,10 +19689,10 @@ /area/medical/medbay/central) "jLD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -19642,8 +19702,8 @@ /area/ai_monitored/turret_protected/aisat/maint) "jLI" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) "jLK" = ( @@ -19682,7 +19742,7 @@ dir = 4 }, /obj/structure/flora/ausbushes/fernybush, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "jLZ" = ( /obj/effect/turf_decal/bot, @@ -19784,15 +19844,15 @@ /turf/open/floor/iron/half, /area/engine/engineering) "jPs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -19815,10 +19875,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/brig) @@ -19829,8 +19889,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) @@ -19846,10 +19906,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface) -"jRB" = ( -/obj/structure/flora/grass/jungle, -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) "jRL" = ( /obj/structure/chair/office{ dir = 1 @@ -19934,6 +19990,11 @@ /obj/machinery/portable_thermomachine, /turf/open/floor/pod/dark, /area/maintenance/department/science/central) +"jUh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/iron, +/area/hallway/primary/fore) "jUp" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot{ @@ -20035,7 +20096,8 @@ /obj/structure/disposalpipe/multiz/down{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "jWU" = ( @@ -20107,10 +20169,10 @@ /turf/open/floor/iron, /area/bridge) "jYA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light/small{ @@ -20160,8 +20222,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -20173,7 +20235,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -20318,7 +20380,7 @@ /turf/open/floor/wood, /area/library/abandoned) "kcL" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron/smooth_half, @@ -20333,7 +20395,6 @@ /turf/open/openspace, /area/engineering/hallway) "kcP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, /obj/structure/window/plasma/reinforced{ dir = 1 }, @@ -20343,7 +20404,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer_4, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "kcX" = ( @@ -20381,7 +20445,7 @@ /area/security/prison) "kdz" = ( /obj/machinery/power/emitter/welded, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -20398,10 +20462,10 @@ /area/asteroid/paradise/surface) "kef" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -20441,8 +20505,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -20456,13 +20520,13 @@ /turf/open/floor/plating/ice/smooth/planetary, /area/asteroid/paradise/surface) "kgz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/decal/cleanable/dirt/dust, @@ -20484,7 +20548,9 @@ "khr" = ( /obj/item/sbeacondrop/exploration, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "khs" = ( /turf/closed/wall/rust, @@ -20500,13 +20566,15 @@ /turf/open/floor/iron/large, /area/engine/engineering) "khH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/large, /area/engine/engineering) "kiz" = ( /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface/grass) "kiB" = ( /obj/effect/spawner/structure/window/reinforced, @@ -20514,8 +20582,8 @@ /area/maintenance/department/engine/atmos) "kiM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/smooth_large, @@ -20555,7 +20623,7 @@ /obj/effect/landmark/start/botanist, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hydroponics) "kkA" = ( @@ -20656,7 +20724,8 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "kme" = ( @@ -20664,8 +20733,8 @@ /turf/closed/wall, /area/hallway/primary/aft) "kmg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -20691,10 +20760,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/crew_quarters/cafeteria) "kmO" = ( @@ -20704,7 +20773,7 @@ /area/asteroid/paradise) "kmS" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -20784,19 +20853,19 @@ /turf/open/floor/plating, /area/library/abandoned) "koJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "koT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/smooth_large, @@ -20807,10 +20876,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -20824,10 +20893,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -20840,10 +20909,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -20877,10 +20946,6 @@ /area/crew_quarters/heads/cmo) "kqG" = ( /obj/machinery/atmospherics/miner/station/nitrogen, -/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/yellow/hidden/layer2{ - dir = 6 - }, /turf/open/floor/engine/n2, /area/engine/atmos) "kqK" = ( @@ -20917,10 +20982,8 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface) "kro" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "krw" = ( /obj/machinery/light/small{ @@ -20952,10 +21015,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -20969,10 +21032,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -20994,7 +21057,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, @@ -21026,10 +21089,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -21079,13 +21142,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/iron/dark/telecomms{ @@ -21126,10 +21189,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -21179,9 +21242,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"kxS" = ( -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface/grass) "kxZ" = ( /obj/structure/sign/directions/science{ dir = 4; @@ -21228,7 +21288,8 @@ dir = 9 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "kyC" = ( @@ -21257,10 +21318,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "kzi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "kzj" = ( @@ -21296,7 +21357,7 @@ /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "kAp" = ( -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/disposal) "kBm" = ( /obj/machinery/computer/aifixer{ @@ -21318,7 +21379,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "kBI" = ( /obj/structure/statue/snow/snowman, @@ -21344,10 +21407,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/medbay/flip{ @@ -21360,10 +21423,10 @@ dir = 8 }, /obj/effect/decal/cleanable/robot_debris, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -21391,10 +21454,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -21407,7 +21470,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/hidden{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -21471,8 +21534,11 @@ /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "kFc" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "kFh" = ( /obj/structure/fence/cut/large, @@ -21486,7 +21552,9 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "kFx" = ( /obj/effect/turf_decal/weather/snow/corner{ @@ -21495,14 +21563,14 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/glass/reinforced, +/turf/open/floor/glass/reinforced{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "kFJ" = ( -/obj/machinery/atmospherics/miner/station/carbon_dioxide, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ - dir = 8 +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ + dir = 4 }, -/obj/machinery/camera/directional/north, /turf/open/floor/engine/co2, /area/engine/atmos) "kFW" = ( @@ -21519,8 +21587,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -21651,8 +21719,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -21693,10 +21761,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -21712,10 +21780,21 @@ /turf/open/floor/iron/white, /area/medical/storage) "kKG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/t_scanner{ + pixel_x = 4; + pixel_y = 5 }, -/obj/machinery/portable_atmospherics/canister, +/obj/item/t_scanner{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/clothing/gloves/color/black{ + pixel_x = -3 + }, +/obj/item/t_scanner, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron/textured_edge, /area/engine/atmos) "kKY" = ( @@ -21732,7 +21811,9 @@ /turf/open/floor/plating, /area/tcommsat/server) "kLl" = ( -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "kLU" = ( /turf/open/floor/iron, @@ -21754,9 +21835,9 @@ /turf/closed/wall/r_wall/rust, /area/science/mixing) "kNb" = ( -/obj/effect/turf_decal/weather/snow, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) +/obj/structure/girder, +/turf/open/floor/plating, +/area/engine/atmos) "kNj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -21774,10 +21855,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -21832,8 +21913,8 @@ "kOu" = ( /obj/effect/turf_decal/siding/wood, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) "kOC" = ( @@ -21896,7 +21977,9 @@ /obj/structure/fence{ dir = 1 }, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "kQv" = ( /obj/structure/lattice/catwalk/over, @@ -21925,31 +22008,40 @@ /turf/open/floor/iron, /area/security/brig) "kRm" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/structure/table, +/obj/item/clothing/suit/hazardvest{ + pixel_x = -5; + pixel_y = -2 }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 4 +/obj/item/clothing/suit/hazardvest{ + pixel_x = 5; + pixel_y = 6 }, -/turf/open/floor/iron/textured_edge{ - dir = 1 +/obj/item/clothing/suit/hazardvest{ + pixel_x = -7; + pixel_y = 7 }, -/area/engine/atmos) -"kRI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 +/obj/item/clothing/suit/hazardvest{ + pixel_x = 8; + pixel_y = -3 }, -/obj/structure/table, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black{ - pixel_x = 3; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, +/turf/open/floor/iron/textured_edge, +/area/engine/atmos) +"kRI" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/computer/atmos_control/plasma_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "kRL" = ( @@ -22034,10 +22126,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -22049,10 +22141,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -22115,10 +22207,10 @@ /turf/open/openspace, /area/maintenance/department/security/brig) "kWe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22147,10 +22239,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -22179,8 +22271,8 @@ /turf/open/floor/grass/no_border, /area/hallway/primary/aft) "kXZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -22245,7 +22337,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "laI" = ( /obj/machinery/conveyor/inverted{ @@ -22321,10 +22415,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -22363,13 +22457,13 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "ldm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22450,10 +22544,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -22462,7 +22556,7 @@ /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "lfw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -22484,10 +22578,10 @@ pixel_x = -30; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/corner{ @@ -22496,9 +22590,7 @@ /area/hallway/primary/central) "lfV" = ( /obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/circuit/telecomms/server, /area/science/server) "lgt" = ( @@ -22528,10 +22620,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"lho" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating, -/area/engine/atmos) "lhu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -22570,10 +22658,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -22582,9 +22670,6 @@ /area/bridge) "lhR" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /turf/open/floor/circuit/telecomms/server, /area/science/server) "lii" = ( @@ -22606,10 +22691,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) "liG" = ( @@ -22756,24 +22841,24 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "llS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "lmt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "lmF" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) @@ -22782,7 +22867,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/snowed/colder, +/turf/open/floor/iron, /area/hallway/primary/fore) "lnp" = ( /obj/structure/table/wood, @@ -22815,7 +22900,9 @@ /obj/structure/railing{ dir = 10 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "lnK" = ( /obj/structure/filingcabinet/chestdrawer{ @@ -22851,7 +22938,7 @@ }, /obj/structure/cable/yellow, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "lob" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -22947,16 +23034,16 @@ /turf/open/openspace, /area/engineering/hallway) "lqy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/binary/pump{ dir = 8 }, /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible, /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) "lqI" = ( @@ -23034,10 +23121,10 @@ /area/science/robotics) "ltd" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -23086,10 +23173,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -23147,10 +23234,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -23211,10 +23298,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -23224,10 +23311,11 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "lzi" = ( @@ -23270,8 +23358,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison, @@ -23303,8 +23391,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/bridge) "lCc" = ( @@ -23394,10 +23482,10 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/railing, /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -23428,7 +23516,8 @@ dir = 9 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "lFO" = ( @@ -23442,7 +23531,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/ai_slipper{ @@ -23482,7 +23571,7 @@ anchored = 1; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, @@ -23492,10 +23581,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -23505,8 +23594,13 @@ /turf/open/floor/plating/ice/smooth/planetary, /area/asteroid/paradise/surface/sand) "lHZ" = ( -/obj/structure/flora/rock/pile/icy, -/turf/open/floor/plating/asteroid/frozengrass, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2{ + dir = 8 + }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "lIf" = ( /obj/machinery/firealarm/directional/west, @@ -23518,7 +23612,7 @@ /obj/machinery/hydroponics/soil{ alpha = 200 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "lIu" = ( /obj/effect/turf_decal/siding/dark{ @@ -23556,10 +23650,10 @@ /area/maintenance/department/science/xenobiology) "lIQ" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -23595,13 +23689,18 @@ /area/maintenance/department/engine) "lKm" = ( /obj/structure/disposalpipe/junction, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "lKU" = ( @@ -23609,23 +23708,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/department/chapel) "lLa" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "lMj" = ( @@ -23635,9 +23734,8 @@ /turf/open/floor/plating/asteroid/frozengrass, /area/asteroid/paradise/surface/grass) "lMw" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 8; - initialize_directions = 8 +/obj/machinery/cryo_cell{ + dir = 8 }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) @@ -23681,7 +23779,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -23877,10 +23975,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -23895,10 +23993,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -23964,10 +24062,10 @@ "lUo" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -23979,6 +24077,9 @@ /turf/open/floor/iron/white, /area/medical/storage) "lUq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/wood, /area/chapel/main) "lUz" = ( @@ -23996,10 +24097,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -24009,10 +24110,11 @@ /turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) "lVl" = ( -/obj/machinery/atmospherics/components/trinary/mixer/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Plasma to Pure" }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "lVq" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -24028,10 +24130,10 @@ /turf/open/openspace, /area/medical/medbay/central) "lVB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/grass/no_border, @@ -24050,10 +24152,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -24071,10 +24173,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -24116,10 +24218,10 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/engine, @@ -24130,7 +24232,7 @@ color = "#666666"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/purple, @@ -24197,17 +24299,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "maU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -24225,7 +24327,9 @@ /obj/machinery/door/airlock/external/glass{ autoclose = 0.1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "mbu" = ( /obj/structure/cable{ @@ -24237,10 +24341,10 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Atmos to Loop" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/box/white, @@ -24252,7 +24356,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "mbE" = ( @@ -24280,8 +24385,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/bridge) @@ -24404,10 +24509,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -24423,7 +24528,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hydroponics) "mgu" = ( @@ -24431,13 +24537,10 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface/grass) "mgw" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix to Ports" +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "mgX" = ( /obj/machinery/cryopod{ @@ -24463,7 +24566,7 @@ pixel_x = 1; pixel_y = -31 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "mhe" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -24475,10 +24578,10 @@ /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "mht" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/numbers/two_nine, @@ -24501,11 +24604,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/tech/grid, @@ -24521,7 +24624,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "mjt" = ( @@ -24595,7 +24699,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -24608,8 +24712,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -24656,8 +24760,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison/dark, @@ -24717,7 +24821,7 @@ /area/hallway/primary/aft) "mnV" = ( /obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "moh" = ( /obj/machinery/firealarm/directional/east, @@ -24727,11 +24831,13 @@ "mon" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "moz" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "moU" = ( /obj/effect/turf_decal/stripes/line{ @@ -24810,7 +24916,9 @@ /area/science/research) "msF" = ( /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "msV" = ( /obj/effect/turf_decal/stripes/line{ @@ -24819,7 +24927,9 @@ /obj/structure/fence{ dir = 8 }, -/turf/open/floor/plating/asteroid/snow/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "mta" = ( /obj/structure/cable/yellow{ @@ -24886,11 +24996,16 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/newscaster/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "muU" = ( @@ -24901,7 +25016,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "mvf" = ( /obj/machinery/cryopod{ @@ -24921,7 +25038,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red{ @@ -24937,7 +25054,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -24980,10 +25097,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -25054,7 +25171,7 @@ pixel_x = 6; pixel_y = 10 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/iron/smooth_large, @@ -25088,10 +25205,10 @@ name = "Brig"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -25107,7 +25224,7 @@ alpha = 100; dir = 8 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "myX" = ( /obj/structure/table/optable, @@ -25150,8 +25267,8 @@ /turf/open/floor/plating, /area/engine/engineering) "mAt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; @@ -25194,16 +25311,13 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "mBs" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /obj/structure/window/plasma/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2/layer4{ +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ dir = 8 }, /turf/open/floor/iron/smooth_half, @@ -25221,17 +25335,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, /area/maintenance/department/chapel) "mCk" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ + dir = 1 + }, /turf/open/floor/engine/n2o, /area/engine/atmos) "mCw" = ( @@ -25241,10 +25356,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -25330,10 +25445,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -25396,13 +25511,18 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/apothecary) "mFI" = ( @@ -25428,10 +25548,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -25464,10 +25584,10 @@ /turf/closed/wall, /area/library/abandoned) "mHT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/sign/painting/library{ @@ -25477,13 +25597,10 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "mHX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/open/openspace{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/rust, -/area/science/test_area) +/area/maintenance/department/science/central) "mIh" = ( /obj/structure/lattice, /turf/open/openspace, @@ -25495,10 +25612,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -25559,8 +25676,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "mJs" = ( @@ -25656,12 +25773,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/airalarm/mixingchamber{ - dir = 4; - pixel_x = 22 +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "mNk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line{ @@ -25672,7 +25791,8 @@ dir = 9 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "mNm" = ( @@ -25697,7 +25817,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "mNH" = ( @@ -25710,8 +25831,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -25724,7 +25845,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) "mOm" = ( @@ -25734,8 +25854,8 @@ /obj/effect/turf_decal/siding/dark/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -25781,10 +25901,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -25845,8 +25965,8 @@ /turf/open/floor/pod/dark, /area/hallway/primary/aft) "mRZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -25886,8 +26006,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison/dark, @@ -25963,10 +26083,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -25986,18 +26106,17 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) +/turf/open/floor/plating/asteroid, +/area/asteroid/paradise) "mVN" = ( /obj/structure/lattice, /obj/structure/railing/corner, /turf/open/openspace, /area/hallway/primary/fore) "mVW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/tech, -/area/science/mixing) +/obj/machinery/air_sensor/plasma_tank, +/turf/open/floor/engine/plasma, +/area/engine/atmos) "mWc" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -26013,7 +26132,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "mWD" = ( @@ -26024,7 +26144,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "mWS" = ( @@ -26038,7 +26159,7 @@ /turf/open/floor/plating, /area/medical/genetics/cloning) "mWX" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 1 }, /turf/open/floor/engine/plasma, @@ -26049,9 +26170,7 @@ /turf/open/floor/iron, /area/maintenance/department/medical/central) "mXn" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ - dir = 4 - }, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, /area/engine/atmos) "mXB" = ( @@ -26094,13 +26213,15 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "mYH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/flora/tree/jungle/small, @@ -26177,10 +26298,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/ai_slipper{ @@ -26193,10 +26314,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/landmark/start/medical_doctor, @@ -26255,8 +26376,8 @@ /area/maintenance/department/eva) "nbG" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics) "nbS" = ( @@ -26268,7 +26389,8 @@ dir = 5 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "ncd" = ( @@ -26287,8 +26409,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/science/central) "ncK" = ( @@ -26319,7 +26441,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -26391,26 +26513,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "nhd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/numbers/two_nine{ @@ -26429,16 +26546,16 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "nhC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/medical/medbay/central) "nhY" = ( @@ -26447,10 +26564,10 @@ desc = "A festive mothroach"; name = "Erster" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -26495,10 +26612,8 @@ /turf/open/openspace, /area/hallway/primary/fore) "nlB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ - dir = 1 - }, /obj/machinery/camera/directional/south, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/engine/atmos) "nlE" = ( @@ -26558,10 +26673,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -26639,8 +26754,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "nnG" = ( @@ -26693,7 +26808,8 @@ }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "npn" = ( @@ -26732,7 +26848,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "nrr" = ( @@ -26797,10 +26914,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -26822,10 +26939,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -26914,21 +27031,17 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "nxm" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, -/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/yellow/hidden/layer2{ - dir = 10 - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input, /turf/open/floor/engine/o2, /area/engine/atmos) "nxp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/iron/textured_large, @@ -27012,10 +27125,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -27034,10 +27147,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -27046,7 +27159,7 @@ /turf/open/floor/iron, /area/security/brig) "nyW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/engine/engineering) "nyZ" = ( @@ -27146,13 +27259,15 @@ "nBs" = ( /obj/structure/marker_beacon, /obj/item/ammo_casing/spent, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nBT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -27168,11 +27283,9 @@ /turf/open/floor/iron/textured_edge, /area/engine/atmos) "nCN" = ( -/obj/machinery/atmospherics/components/binary/circulator/cold{ - dir = 1 - }, +/obj/structure/frame/machine, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "nCT" = ( /obj/structure/railing/corner{ dir = 4 @@ -27208,7 +27321,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -27217,10 +27330,10 @@ /turf/open/floor/iron, /area/maintenance/department/chapel) "nEw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -27244,7 +27357,7 @@ /turf/open/floor/pod/dark, /area/maintenance/department/engine/atmos) "nEO" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /obj/structure/table, @@ -27286,10 +27399,10 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -27302,7 +27415,7 @@ icon_state = "0-8" }, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /turf/open/floor/plating, @@ -27315,7 +27428,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/turf_decal/siding/white/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -27361,8 +27474,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "nHd" = ( @@ -27380,7 +27493,9 @@ /obj/structure/railing{ dir = 5 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nHv" = ( /obj/structure/cable/yellow{ @@ -27394,7 +27509,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "nHL" = ( @@ -27436,14 +27551,16 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "nHR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /obj/machinery/light, +/obj/machinery/computer/atmos_control/nitrous_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "nIi" = ( @@ -27455,7 +27572,9 @@ /area/hydroponics) "nIp" = ( /obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nIr" = ( /obj/effect/turf_decal/stripes/end{ @@ -27481,11 +27600,8 @@ }, /area/hallway/primary/central) "nIy" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, -/obj/machinery/atmospherics/pipe/simple/yellow/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/engine/co2, +/obj/machinery/air_sensor/air_tank, +/turf/open/floor/engine/air, /area/engine/atmos) "nIB" = ( /obj/structure/railing{ @@ -27512,10 +27628,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) @@ -27526,7 +27642,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -27554,7 +27670,7 @@ /turf/open/floor/iron/dark, /area/science/robotics) "nKk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/textured_half, @@ -27571,7 +27687,7 @@ icon_state = "0-4" }, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/plating, @@ -27581,7 +27697,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "nKV" = ( @@ -27596,7 +27713,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "nKW" = ( /obj/structure/closet/firecloset/full, @@ -27622,11 +27739,11 @@ req_access_txt = "29"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/science/central) @@ -27667,7 +27784,9 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nOn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -27722,25 +27841,19 @@ "nPk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile/icy, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nPw" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4; - name = "Port to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "Air to Ports" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 + hide = 0 }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_edge, /area/engine/atmos) "nPW" = ( /obj/item/kirbyplants{ @@ -27762,7 +27875,9 @@ /area/bridge) "nQC" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nQI" = ( /obj/structure/fence{ @@ -27798,10 +27913,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -27823,10 +27938,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/sepia, @@ -27881,7 +27996,9 @@ "nVI" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/weather/snow/corner, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "nWb" = ( /turf/closed/wall/r_wall, @@ -27906,10 +28023,10 @@ /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) "nXm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, @@ -27982,7 +28099,7 @@ pixel_x = 4; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/purple, @@ -27995,8 +28112,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/camera/directional/south, @@ -28023,10 +28140,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -28055,11 +28172,11 @@ alpha = 100; dir = 5 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "oby" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/engineering) "obz" = ( @@ -28085,10 +28202,12 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "ocx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/closed/wall, @@ -28121,7 +28240,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/turf/open/floor/glass/reinforced, +/turf/open/floor/glass/reinforced{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "oeP" = ( /obj/machinery/door/airlock/research/glass{ @@ -28132,8 +28253,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -28144,7 +28265,9 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "ofE" = ( /obj/structure/railing, @@ -28152,16 +28275,19 @@ /turf/open/floor/plating/snowed/smoothed/planetary, /area/asteroid/paradise/surface) "ogE" = ( -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 - }, /obj/machinery/light/small, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "Gas to Filter" }, /obj/effect/turf_decal/delivery, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, /area/engine/supermatter) "ogI" = ( @@ -28234,10 +28360,13 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "ohC" = ( @@ -28280,10 +28409,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail{ dir = 1; sortType = 12 @@ -28306,7 +28435,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "ojC" = ( @@ -28314,10 +28444,10 @@ /turf/open/floor/plating/snowed/smoothed/planetary, /area/asteroid/paradise/surface) "ojX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/multiz/down{ @@ -28340,13 +28470,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -28422,8 +28552,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "omk" = ( @@ -28434,10 +28564,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -28507,7 +28637,7 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "ooV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /turf/open/floor/iron/textured_half, @@ -28532,10 +28662,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -28647,8 +28777,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) @@ -28658,10 +28788,10 @@ "orO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "orX" = ( /turf/closed/wall, @@ -28676,10 +28806,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/junction{ @@ -28690,10 +28820,10 @@ }, /area/hallway/primary/fore) "osA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -28772,9 +28902,9 @@ /turf/open/floor/iron/techmaint/planetary, /area/hallway/primary/fore) "ouk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + name = "Air to Distro"; + target_pressure = 500 }, /turf/open/floor/iron/textured_large, /area/engine/atmos) @@ -28807,7 +28937,7 @@ name = "map - level 3"; pixel_x = 32 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "ouO" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -28831,8 +28961,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/lab) @@ -28846,8 +28976,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison/dark, @@ -28863,14 +28993,17 @@ pixel_x = 25 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth_half{ - dir = 1 - }, +/obj/structure/table, +/obj/item/storage/toolbox/electrical, +/obj/item/clothing/gloves/color/yellow, +/obj/item/book/manual/wiki/atmospherics, +/turf/open/floor/iron/smooth_half, /area/engine/atmos) "ovD" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "ovJ" = ( @@ -28974,10 +29107,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/dormitories{ @@ -29018,10 +29151,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -29049,10 +29182,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/poddoor/shutters{ @@ -29127,10 +29260,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -29152,10 +29285,10 @@ /area/science/lab) "oEg" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -29169,10 +29302,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/numbers/two_nine, @@ -29254,7 +29387,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, @@ -29310,20 +29443,11 @@ /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/maintenance/department/security/brig) -"oFV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) "oGq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/digital_clock/directional/east, @@ -29344,21 +29468,18 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/binary/pump/on/layer4{ - dir = 8; - name = "Waste to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/components/binary/pump{ dir = 4; - name = "Air to Distro"; - target_pressure = 500 + name = "Pure to Ports" }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "oHM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -29373,10 +29494,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -29394,8 +29515,8 @@ /turf/open/floor/iron/smooth_large, /area/engine/engineering) "oJd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/railing/corner{ dir = 4 }, @@ -29484,10 +29605,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -29500,8 +29621,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ dir = 4 }, @@ -29511,8 +29632,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -29566,10 +29687,10 @@ dir = 8 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -29588,8 +29709,8 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side{ dir = 6 }, @@ -29599,8 +29720,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -29621,10 +29742,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -29647,7 +29768,8 @@ dir = 5 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "oNh" = ( @@ -29663,13 +29785,13 @@ alpha = 100 }, /obj/structure/flora/rock/pile/icy, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "oNs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -29694,10 +29816,10 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "oOz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -29716,12 +29838,15 @@ /area/library/abandoned) "oPC" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "oPI" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -29735,7 +29860,7 @@ /area/crew_quarters/fitness/recreation) "oPT" = ( /obj/effect/spawner/structure/window/depleteduranium, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, /turf/open/floor/plating, @@ -29790,13 +29915,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -29852,10 +29974,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -29878,10 +30000,10 @@ /area/maintenance/department/science/central) "oTE" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -29890,16 +30012,13 @@ /obj/structure/window/plasma/reinforced{ dir = 8 }, -/obj/machinery/computer/atmos_control/tank/carbon_tank{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -29931,7 +30050,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -29959,7 +30078,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/trunk{ @@ -30048,7 +30167,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/item/radio, @@ -30136,10 +30255,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) "oYY" = ( @@ -30156,7 +30275,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/airalarm/directional/south, @@ -30181,10 +30300,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -30196,10 +30315,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "pac" = ( @@ -30230,10 +30349,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -30246,7 +30365,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface/grass) "pcn" = ( /obj/effect/decal/cleanable/dirt, @@ -30273,10 +30394,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -30348,10 +30469,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -30370,7 +30491,7 @@ /obj/effect/turf_decal/siding/dark/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/corner{ @@ -30408,19 +30529,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"pgG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) "pgR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -30565,7 +30682,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "pll" = ( @@ -30610,7 +30727,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -30619,7 +30736,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -30646,10 +30763,10 @@ name = "Maintenance Hatch"; req_one_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -30659,17 +30776,17 @@ /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "pnv" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - name = "O2 to Pure" - }, /obj/structure/window/plasma/reinforced{ dir = 1 }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron_smooth, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, +/turf/open/floor/iron/smooth_half, /area/engine/atmos) "pnX" = ( /turf/closed/wall, @@ -30703,8 +30820,8 @@ /turf/open/floor/iron/smooth_large, /area/engine/engineering) "poA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, @@ -30730,10 +30847,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) @@ -30768,11 +30885,12 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "prO" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -30833,8 +30951,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science/central) @@ -30952,10 +31070,10 @@ /area/hallway/primary/fore) "pyw" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -30968,7 +31086,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/red, @@ -30993,7 +31111,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "pyW" = ( /obj/structure/sign/warning/fire, @@ -31041,7 +31161,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "pAJ" = ( /obj/structure/window/reinforced{ @@ -31075,8 +31197,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/bridge) "pBE" = ( @@ -31085,7 +31207,7 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/camera/directional/west, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "pBJ" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -31115,10 +31237,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -31135,10 +31257,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -31206,10 +31328,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "pEf" = ( @@ -31232,7 +31354,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/engine, @@ -31245,10 +31367,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -31267,12 +31389,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/primary/central) -"pGd" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) "pGn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -31311,10 +31427,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -31344,13 +31460,13 @@ /area/maintenance/department/crew_quarters/bar) "pIB" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/supermatter) "pIN" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /obj/structure/sign/warning/securearea{ pixel_y = 30 @@ -31388,13 +31504,15 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "pLd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -31509,16 +31627,10 @@ /turf/open/floor/carpet/green, /area/chapel/main) "pMT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 4; - name = "Pure to Ports" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_edge, /area/engine/atmos) "pMW" = ( /turf/closed/wall/r_wall/rust, @@ -31556,10 +31668,10 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/research/glass{ @@ -31577,7 +31689,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "pOW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /obj/machinery/door/poddoor/incinerator_toxmix{ @@ -31611,7 +31723,9 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "pQk" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -31619,7 +31733,7 @@ /area/maintenance/department/engine/atmos) "pRa" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 6 }, /turf/open/floor/plating/asteroid/planetary, @@ -31670,8 +31784,8 @@ /turf/open/floor/iron/smooth_large, /area/engine/engineering) "pSH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/atmos{ @@ -31679,7 +31793,7 @@ req_access_txt = "11" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31744,10 +31858,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -31761,8 +31875,8 @@ /obj/machinery/door/airlock/medical{ name = "Observation" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -31789,8 +31903,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/engine/atmos) "pUf" = ( @@ -31865,10 +31979,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -31914,10 +32028,10 @@ /area/engine/engineering) "pWj" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -31952,10 +32066,10 @@ "pWN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -32014,10 +32128,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -32037,10 +32151,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -32075,7 +32189,7 @@ /turf/open/floor/plating/asteroid/frozengrass, /area/asteroid/paradise/surface/grass) "qaO" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/iron/smooth_half{ @@ -32104,10 +32218,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32138,15 +32252,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "qcV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -32218,10 +32332,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -32234,10 +32348,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/closet/crate, @@ -32308,8 +32422,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -32374,7 +32488,9 @@ dir = 1 }, /obj/structure/frame, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "qjK" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -32410,16 +32526,16 @@ alpha = 100; dir = 6 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "qkv" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/holopad, @@ -32467,7 +32583,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "qlj" = ( @@ -32503,8 +32620,9 @@ /turf/open/floor/plating, /area/science/mixing) "qmz" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/server) "qns" = ( @@ -32580,6 +32698,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "qqB" = ( @@ -32643,10 +32762,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/pod/dark, @@ -32690,8 +32809,8 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "qtv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "qtw" = ( @@ -32704,7 +32823,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, -/turf/open/floor/glass/reinforced, +/turf/open/floor/glass/reinforced{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "qtI" = ( /turf/open/openspace, @@ -32780,11 +32901,13 @@ dir = 1 }, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "qwi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -32799,10 +32922,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -32872,7 +32995,7 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "qzs" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/machinery/meter, @@ -32885,17 +33008,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "qzt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -32917,8 +33040,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_white, @@ -32977,16 +33100,18 @@ /turf/open/floor/wood, /area/library/abandoned) "qCg" = ( -/turf/open/floor/plating/beach/deep_water, +/turf/open/floor/plating/beach/deep_water/cold, /area/asteroid/paradise/surface/water) "qCi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plating/asteroid/basalt/planetary, +/turf/open/floor/plating/asteroid/basalt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/engine/engineering) "qCv" = ( /turf/open/floor/iron, @@ -33069,10 +33194,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) "qGN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -33129,7 +33254,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "qJf" = ( @@ -33237,9 +33363,10 @@ /turf/open/floor/engine/light, /area/holodeck/small) "qMR" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2, -/turf/open/floor/engine/air, +/obj/machinery/portable_atmospherics/canister{ + valve_open = 1 + }, +/turf/open/floor/engine/airless, /area/engine/atmos) "qNq" = ( /obj/machinery/computer/cargo/request{ @@ -33263,24 +33390,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/rust, /area/science/test_area) -"qOE" = ( -/obj/structure/stairs, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/pod/dark, -/area/science/mixing) "qOI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable{ @@ -33292,7 +33406,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 10 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -33375,7 +33489,9 @@ dir = 6 }, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "qSb" = ( /obj/structure/table/reinforced, @@ -33423,7 +33539,9 @@ /obj/structure/fence/cut/medium{ dir = 8 }, -/turf/open/floor/plating/asteroid/snow/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "qSK" = ( /obj/structure/weightmachine, @@ -33437,7 +33555,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "qSU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail/destination/bar{ dir = 1 }, @@ -33536,13 +33654,13 @@ /turf/open/floor/iron, /area/medical/genetics/cloning) "qUU" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - dir = 4 - }, /obj/structure/window/plasma/reinforced, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "qUZ" = ( @@ -33560,7 +33678,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/red, @@ -33580,10 +33698,10 @@ /turf/closed/wall/r_wall/rust, /area/engine/atmos) "qVN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/numbers{ dir = 1 }, @@ -33663,9 +33781,10 @@ }, /area/hallway/primary/aft) "qXs" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) +/obj/structure/table_frame, +/obj/item/stack/rods/five, +/turf/open/floor/plating/asteroid, +/area/asteroid/paradise) "qXt" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -33673,10 +33792,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -33705,10 +33824,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "qXK" = ( @@ -33728,7 +33847,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "qXX" = ( @@ -33741,10 +33860,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/numbers/two_nine{ @@ -33757,8 +33876,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/plating/asteroid/planetary, -/area/engine/atmos) +/turf/open/floor/plating/asteroid, +/area/asteroid/paradise) "qYu" = ( /obj/item/storage/fancy/donut_box{ name = "Holy donut box"; @@ -33788,10 +33907,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/north{ @@ -33904,7 +34023,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "rck" = ( @@ -33970,6 +34090,13 @@ /obj/structure/grille/broken, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) +"rdC" = ( +/obj/structure/stairs, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/science/mixing) "rdU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -34010,10 +34137,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -34044,10 +34171,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment, @@ -34073,10 +34200,10 @@ "rgj" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -34169,10 +34296,10 @@ /area/maintenance/department/crew_quarters/dorms) "rhv" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -34196,10 +34323,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -34208,7 +34335,7 @@ /obj/structure/railing, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -34222,7 +34349,7 @@ pixel_x = 1; pixel_y = 12 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /obj/machinery/light_switch/directional/west, @@ -34276,12 +34403,14 @@ "rjR" = ( /obj/structure/flora/ash/stem_shroom, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "rjV" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste/layer4{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer4{ dir = 4 }, -/turf/open/floor/plating/asteroid/basalt/planetary, +/turf/open/floor/plating/asteroid/basalt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/engine/engineering) "rjX" = ( /obj/machinery/holopad, @@ -34304,7 +34433,7 @@ /area/security/execution/education) "rks" = ( /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/mixing) "rkK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34324,7 +34453,7 @@ dir = 1 }, /obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/circuit/telecomms/server, /area/science/server) "rlr" = ( @@ -34338,10 +34467,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -34394,10 +34523,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/newscaster{ @@ -34526,7 +34655,7 @@ /turf/open/floor/iron/dark, /area/security/nuke_storage) "roj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/effect/turf_decal/trimline/dark_red/filled/warning, @@ -34550,7 +34679,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron/smooth_half{ @@ -34643,10 +34772,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) "rsH" = ( @@ -34665,10 +34794,10 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) "rtF" = ( @@ -34718,34 +34847,21 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/primary) "rui" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 4 - }, -/obj/structure/table, -/obj/item/storage/belt/utility, /obj/item/radio/intercom{ pixel_y = 29 }, -/obj/item/t_scanner{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/item/t_scanner{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/item/clothing/gloves/color/black{ - pixel_x = -3 - }, -/obj/item/t_scanner, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/computer/atmos_control/oxygen_tank, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "ruO" = ( @@ -34765,7 +34881,7 @@ "ruV" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/smooth_half, @@ -34781,7 +34897,8 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "rvh" = ( @@ -34792,13 +34909,13 @@ /turf/open/floor/plating, /area/maintenance/department/medical/central) "rvJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) "rvW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -34828,7 +34945,7 @@ dir = 5 }, /obj/item/chair, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/test_area) "rwG" = ( /obj/effect/turf_decal/stripes/line, @@ -34841,14 +34958,18 @@ /obj/structure/cable/yellow{ icon_state = "4-32" }, -/turf/open/openspace, +/turf/open/floor/plating{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "rxd" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "rxi" = ( -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "rxQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -34950,10 +35071,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/research/glass{ @@ -35010,10 +35131,10 @@ "rBt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 9 }, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -35051,10 +35172,15 @@ dir = 4 }, /obj/effect/landmark/start/chemist, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "rDD" = ( @@ -35085,7 +35211,7 @@ /area/science/research) "rDX" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -35100,11 +35226,11 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/airalarm/engine{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -35120,13 +35246,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -35155,10 +35281,10 @@ /turf/open/floor/iron, /area/maintenance/department/chapel) "rEV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -35187,10 +35313,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "rGh" = ( @@ -35275,28 +35401,26 @@ }, /area/hallway/primary/fore) "rIf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "rIj" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/department/chapel) "rIE" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/structure/window/plasma/reinforced, -/turf/open/floor/catwalk_floor/iron_smooth, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, +/turf/open/floor/iron/smooth_half, /area/engine/atmos) "rJc" = ( /obj/effect/decal/cleanable/generic, @@ -35313,10 +35437,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -35346,7 +35470,7 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "rKj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid/planetary, /area/engine/engineering) "rKk" = ( @@ -35399,10 +35523,10 @@ pixel_x = -30; pixel_y = 31 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -35426,7 +35550,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/light, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "rNb" = ( /turf/open/floor/iron, @@ -35457,7 +35581,7 @@ /obj/machinery/hydroponics/soil{ alpha = 200 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "rOG" = ( /obj/structure/ladder, @@ -35471,7 +35595,9 @@ /obj/structure/fence/post{ dir = 8 }, -/turf/open/floor/plating/ice/smooth/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "rPi" = ( /obj/machinery/camera/directional/south, @@ -35508,8 +35634,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/detective_office{ @@ -35562,7 +35688,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "rRc" = ( @@ -35575,11 +35702,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"rRm" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "rRt" = ( /obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -35597,9 +35719,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/department/bridge) -"rRV" = ( -/turf/open/lava/smooth, -/area/engine/atmos) "rRY" = ( /obj/effect/turf_decal/siding/yellow, /obj/effect/turf_decal/trimline/yellow/warning, @@ -35615,7 +35734,7 @@ /turf/open/openspace, /area/security/brig) "rSp" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /turf/open/floor/iron/smooth_half, @@ -35630,8 +35749,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "rTp" = ( @@ -35639,10 +35758,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/destination/cargo_bay/flip{ @@ -35674,7 +35793,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "rUl" = ( /obj/machinery/portable_thermomachine, @@ -35710,6 +35831,7 @@ pixel_x = -31; pixel_y = -3 }, +/obj/structure/window/reinforced/spawner/west, /turf/open/floor/iron, /area/hallway/primary/fore) "rWp" = ( @@ -35727,7 +35849,7 @@ "rXb" = ( /obj/structure/flora/junglebush/c, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, @@ -35780,7 +35902,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "rXS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/camera/directional/west, /obj/machinery/status_display/evac{ pixel_x = -32 @@ -35788,7 +35910,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/large, @@ -35874,8 +35996,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "rZM" = ( @@ -35908,7 +36030,7 @@ pixel_x = -30; pixel_y = -1 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/disposal) "saC" = ( /obj/machinery/light_switch{ @@ -35943,7 +36065,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -36010,8 +36132,8 @@ "scw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -36024,10 +36146,10 @@ /area/engine/atmos) "sdl" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/closet/secure_closet/genpop{ @@ -36071,16 +36193,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) "sdX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -36096,13 +36218,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -36127,14 +36249,17 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "sex" = ( -/turf/open/floor/iron/textured_corner, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron/textured_edge, /area/engine/atmos) "seV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -36185,8 +36310,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai) "sfR" = ( @@ -36211,10 +36336,10 @@ /turf/open/floor/iron/dark, /area/security/warden) "shn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -36272,10 +36397,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/item/toy/plush/lizard_plushie{ @@ -36297,10 +36422,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -36320,7 +36445,7 @@ alpha = 100; dir = 4 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "skF" = ( /obj/machinery/newscaster{ @@ -36342,7 +36467,7 @@ pixel_x = 3; pixel_y = -2 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "sls" = ( /turf/closed/wall/r_wall, @@ -36396,7 +36521,7 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "smt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/large, /area/engine/engineering) "smw" = ( @@ -36413,8 +36538,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -36449,10 +36574,10 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "snY" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "sol" = ( /obj/machinery/power/solar{ @@ -36462,7 +36587,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/iron/solarpanel, +/turf/open/floor/iron/solarpanel/cold, /area/asteroid/paradise/surface) "sow" = ( /obj/effect/spawner/structure/window/reinforced, @@ -36502,10 +36627,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -36527,10 +36652,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/light/small{ @@ -36545,10 +36670,10 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/railing, /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -36600,8 +36725,8 @@ pixel_x = -1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/multiz/down{ dir = 8 }, @@ -36648,13 +36773,13 @@ /turf/open/floor/iron/dark, /area/bridge) "ssf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/shower{ dir = 8; name = "emergency shower" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light{ dir = 4 }, @@ -36667,8 +36792,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/bridge) "ssu" = ( @@ -36792,10 +36917,10 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -36818,7 +36943,7 @@ }, /area/hallway/primary/central) "sys" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -36966,8 +37091,8 @@ /turf/closed/wall, /area/maintenance/disposal) "sDH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/wood, /area/crew_quarters/cafeteria) @@ -36978,7 +37103,7 @@ }, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "sEp" = ( /obj/structure/stairs, @@ -36995,10 +37120,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -37067,10 +37192,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -37107,10 +37232,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -37122,10 +37247,10 @@ /obj/structure/chair/wood/normal{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wood, @@ -37141,10 +37266,10 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -37154,7 +37279,7 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "sJZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/ai_slipper{ @@ -37174,7 +37299,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -37184,7 +37309,7 @@ /area/chapel/office) "sKr" = ( /obj/effect/mapping_helpers/dead_body_placer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -37216,7 +37341,8 @@ "sLb" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "sLd" = ( @@ -37228,7 +37354,9 @@ "sLn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/newscaster/directional/west, -/turf/open/floor/plating/snowed/colder, +/obj/structure/window/reinforced/spawner/west, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron, /area/hallway/primary/fore) "sLu" = ( /turf/open/openspace, @@ -37245,8 +37373,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) @@ -37338,27 +37466,22 @@ /area/maintenance/department/engine/atmos) "sNW" = ( /obj/machinery/atmospherics/components/binary/pump{ - name = "Ports to Dirty" - }, -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4{ - dir = 1 + dir = 1; + name = "N2O to Pure" }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "sOh" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/window/plasma/reinforced{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "sOB" = ( @@ -37373,9 +37496,10 @@ /turf/open/floor/iron, /area/engine/atmos) "sPS" = ( -/obj/machinery/air_sensor/atmos/air_tank, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/engine/air, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/textured_edge, /area/engine/atmos) "sQp" = ( /obj/effect/turf_decal/bot, @@ -37448,10 +37572,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -37471,7 +37595,9 @@ "sTa" = ( /obj/effect/turf_decal/siding/wood, /obj/item/hatchet, -/turf/open/floor/wood, +/turf/open/floor/wood{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "sTd" = ( /obj/effect/turf_decal/stripes/line{ @@ -37510,7 +37636,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "sUC" = ( @@ -37532,7 +37659,9 @@ }, /obj/item/encryptionkey/headset_expteam, /obj/item/encryptionkey/headset_expteam, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "sUW" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -37610,7 +37739,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "sXB" = ( /turf/closed/wall/r_wall, @@ -37623,10 +37754,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -37655,10 +37786,10 @@ /obj/effect/turf_decal/siding/dark/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark/side{ @@ -37691,10 +37822,10 @@ req_access_txt = "12"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -37732,10 +37863,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/prison, @@ -37784,12 +37915,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/surgery) "tbf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "tbm" = ( @@ -37826,8 +37957,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/evac/evac_big, /turf/open/floor/iron, /area/maintenance/department/science/central) @@ -37955,7 +38086,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "tfl" = ( @@ -37963,16 +38095,18 @@ dir = 8 }, /obj/structure/fence, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "tgg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -37982,7 +38116,7 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "tgo" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/machinery/meter, @@ -37997,11 +38131,13 @@ dir = 4 }, /turf/open/floor/iron/tech, -/area/science/mixing/chamber) +/area/science/mixing) "tgt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/fancy/plastic, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "tgH" = ( /obj/machinery/holopad, @@ -38111,10 +38247,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -38133,7 +38269,7 @@ /area/crew_quarters/cafeteria) "tkw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -38142,8 +38278,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) "tkD" = ( @@ -38216,8 +38352,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -38226,10 +38362,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "tlw" = ( @@ -38246,7 +38382,7 @@ /turf/open/floor/plating, /area/maintenance/department/medical/central) "tmh" = ( -/obj/structure/girder, +/obj/structure/girder/displaced, /turf/open/floor/plating, /area/engine/atmos) "tmi" = ( @@ -38292,19 +38428,19 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/security/prison) "tmp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/railing/corner{ @@ -38324,11 +38460,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ + dir = 1 }, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) @@ -38336,8 +38469,8 @@ /turf/closed/wall/r_wall, /area/chapel/office) "tmX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -38362,12 +38495,8 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface/grass) "toh" = ( -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "N2 to Pure" - }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron, +/obj/machinery/atmospherics/miner/station/n2o, +/turf/open/floor/engine/n2o, /area/engine/atmos) "top" = ( /obj/structure/stairs{ @@ -38466,10 +38595,12 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "tqq" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 1 }, /turf/open/floor/engine/airless, @@ -38503,7 +38634,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "trC" = ( /obj/structure/table, @@ -38554,10 +38687,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -38628,10 +38761,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/numbers/two_nine{ @@ -38671,11 +38804,6 @@ }, /turf/open/openspace, /area/engineering/hallway) -"tuV" = ( -/obj/machinery/atmospherics/miner/station/plasma, -/obj/machinery/atmospherics/pipe/simple/green/hidden, -/turf/open/floor/engine/plasma, -/area/engine/atmos) "tvj" = ( /obj/structure/fence/cut/medium{ dir = 8 @@ -38697,7 +38825,9 @@ icon_state = "0-8" }, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "tww" = ( /obj/machinery/light{ @@ -38751,10 +38881,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/multiz{ @@ -38766,7 +38896,9 @@ /obj/structure/fence/corner{ dir = 9 }, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "tyg" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -38800,8 +38932,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/department/science/central) "tzi" = ( @@ -38865,10 +38997,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/tech/grid, @@ -38897,10 +39029,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -38910,10 +39042,10 @@ /area/science/lab) "tAO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/large, @@ -38974,28 +39106,34 @@ /turf/open/floor/iron, /area/science/robotics) "tCm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/snowed/colder, -/area/hallway/primary/fore) +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise/surface/grass) "tCn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/bridge) "tCQ" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/apothecary) "tDp" = ( @@ -39061,8 +39199,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "tHj" = ( @@ -39126,13 +39264,13 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -39153,6 +39291,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/hallway/primary/fore) +"tJh" = ( +/obj/structure/fence/corner{ + dir = 5 + }, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise/surface) "tJk" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -39204,10 +39350,10 @@ id = "hopqueue"; name = "HoP Queue Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -39240,7 +39386,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "tJQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 4 }, /turf/open/floor/engine/co2, @@ -39288,10 +39434,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -39307,12 +39453,13 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "tLZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/railing{ dir = 4 }, @@ -39346,7 +39493,8 @@ dir = 5 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "tNh" = ( @@ -39367,10 +39515,10 @@ "tNX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -39426,13 +39574,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -39441,7 +39589,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input/layer4, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "tPA" = ( @@ -39497,8 +39645,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; @@ -39514,10 +39662,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -39566,10 +39714,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -39582,7 +39730,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/science/test_area) "tSb" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -39613,8 +39761,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "tSC" = ( @@ -39696,10 +39844,10 @@ /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "tUu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -39722,7 +39870,8 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "tUN" = ( @@ -39783,7 +39932,9 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "tWL" = ( /obj/effect/turf_decal/bot, @@ -39814,26 +39965,25 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/over, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, /area/science/mixing) "tXn" = ( /obj/item/beacon{ pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -39848,7 +39998,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -39860,7 +40010,7 @@ /turf/closed/wall, /area/janitor) "tYu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -39968,12 +40118,12 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "External Gas to Loop" }, /obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -39982,10 +40132,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/destination/qm_office/flip, @@ -40006,10 +40156,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -40033,7 +40183,7 @@ "ucF" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/red, @@ -40059,10 +40209,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -40074,8 +40224,8 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "uef" = ( @@ -40139,33 +40289,33 @@ }, /area/engine/engineering) "ufL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall, /area/maintenance/disposal/incinerator) "ufV" = ( /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/security/brig) "ugf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/engine/atmos) +/area/asteroid/paradise) "ugo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/science/central) @@ -40192,8 +40342,8 @@ dir = 8; name = "Loop to Gas Output" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -40229,10 +40379,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -40248,10 +40398,10 @@ }, /obj/structure/railing, /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white/corner{ @@ -40327,7 +40477,7 @@ /area/science/xenobiology) "ulR" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40340,15 +40490,16 @@ /turf/closed/mineral/random/air, /area/asteroid/paradise) "umI" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/machinery/airalarm/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/computer/atmos_control/carbon_tank{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/directional/west, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -40413,7 +40564,9 @@ pixel_x = -1; pixel_y = -1 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "unO" = ( /obj/structure/railing{ @@ -40429,7 +40582,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) @@ -40491,7 +40644,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "upK" = ( /obj/structure/window/reinforced{ @@ -40524,7 +40679,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "uqc" = ( @@ -40532,7 +40688,8 @@ dir = 4 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "uqA" = ( @@ -40540,8 +40697,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/bridge) @@ -40593,19 +40750,19 @@ /obj/structure/sign/warning/fire{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/on, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "usb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "usq" = ( @@ -40617,8 +40774,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) "utp" = ( @@ -40641,7 +40798,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron/smooth_half{ @@ -40689,16 +40846,16 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "uvt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -40711,14 +40868,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) "uvZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -40733,7 +40890,9 @@ "uwc" = ( /obj/structure/cable/yellow, /obj/effect/turf_decal/box, -/turf/open/floor/plating, +/turf/open/floor/plating{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "uwm" = ( /obj/effect/turf_decal/stripes/line{ @@ -40791,7 +40950,7 @@ }, /area/hallway/primary/central) "uyb" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 1 }, /turf/open/floor/engine/n2o, @@ -40843,7 +41002,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/large, @@ -40906,7 +41065,7 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/cafeteria) "uCc" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron/smooth_half{ @@ -40915,7 +41074,7 @@ /area/engine/engineering) "uCw" = ( /obj/effect/spawner/structure/window/depleteduranium, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /turf/open/floor/plating, @@ -40925,10 +41084,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/half, @@ -41001,10 +41160,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -41106,8 +41265,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -41155,10 +41314,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron, /area/hallway/primary/central) "uII" = ( @@ -41220,9 +41384,11 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "uIV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/turf/open/floor/plating/asteroid/basalt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/engine/engineering) "uIW" = ( /obj/effect/turf_decal/bot, @@ -41235,7 +41401,7 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "uJf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/structure/cable/yellow{ @@ -41271,7 +41437,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "uJX" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -41283,10 +41451,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -41324,7 +41492,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "uLf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -41346,10 +41514,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -41373,8 +41541,8 @@ /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) "uLi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side{ dir = 5 @@ -41393,8 +41561,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/department/medical/central) @@ -41429,14 +41597,15 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "uNE" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 1; - name = "N2O to Pure" - }, /obj/structure/window/plasma/reinforced, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron_smooth, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, +/turf/open/floor/iron/smooth_half, /area/engine/atmos) "uNJ" = ( /obj/machinery/hydroponics/constructable, @@ -41460,8 +41629,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -41583,21 +41752,24 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "uRd" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24; - cell_type = /obj/item/stock_parts/cell/hyper - }, /obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24; + cell_type = /obj/item/stock_parts/cell/hyper + }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "uRn" = ( @@ -41606,14 +41778,16 @@ dir = 4 }, /obj/structure/sign/warning/explosives/alt, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "uRz" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -41648,7 +41822,9 @@ width = 3 }, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "uSN" = ( /obj/machinery/door/airlock/command{ @@ -41670,10 +41846,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) "uSS" = ( @@ -41681,13 +41857,13 @@ pixel_y = -33 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/smooth_half, /area/engine/engineering) "uSY" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron/textured_large, @@ -41705,10 +41881,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/railing{ dir = 8 @@ -41728,10 +41904,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/digital_clock/directional/east, @@ -41743,10 +41919,10 @@ req_access_txt = "12"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -41777,10 +41953,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/power/apc/auto_name/directional/north{ @@ -41806,8 +41982,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/smooth_large, @@ -41835,10 +42011,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment, @@ -41875,8 +42051,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/evac, /turf/open/floor/iron, /area/hallway/primary/central) @@ -41897,10 +42073,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -41925,14 +42101,18 @@ }, /area/bridge) "uXr" = ( -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/obj/structure/flora/rock/pile/icy, +/turf/open/floor/plating/asteroid/basalt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/engine/engineering) "uXy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hydroponics) "uXI" = ( @@ -41959,30 +42139,19 @@ /turf/open/floor/plating, /area/maintenance/department/medical/central) "uYL" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 6 - }, /obj/structure/table, -/obj/item/clothing/suit/hazardvest{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = -7; +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black{ + pixel_x = 3; pixel_y = 7 }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 8; - pixel_y = -3 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron/smooth_corner, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 6 + }, +/turf/open/floor/iron/smooth_half, /area/engine/atmos) "uYV" = ( /obj/structure/rack, @@ -42026,10 +42195,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -42081,8 +42250,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/quartermaster/storage) "vbm" = ( @@ -42096,10 +42265,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/public/glass, @@ -42128,7 +42297,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/iron/tech, @@ -42151,10 +42320,10 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/airlock/research/glass{ @@ -42193,8 +42362,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/qm) "vcy" = ( @@ -42227,10 +42396,10 @@ /area/maintenance/department/medical/morgue) "vdv" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -42283,10 +42452,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -42308,8 +42477,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -42328,10 +42497,10 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/corner{ @@ -42350,10 +42519,10 @@ /area/maintenance/department/bridge) "vhz" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -42362,8 +42531,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 @@ -42383,10 +42552,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -42425,38 +42594,35 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/quartermaster/storage) "vjK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/structure/railing, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer5{ - dir = 4 - }, /turf/open/floor/catwalk_floor/iron_smooth, /area/engine/atmos) "vjT" = ( -/obj/machinery/meter{ - target_layer = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump{ + name = "O2 to Pure" }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "vjX" = ( /obj/item/trash/canned/beans, @@ -42472,10 +42638,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ @@ -42487,16 +42653,17 @@ /area/maintenance/department/bridge) "vkN" = ( /obj/structure/flora/junglebush/large, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/engine/engineering) "vkZ" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "CO2 to Pure" }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_edge{ + dir = 1 + }, /area/engine/atmos) "vlt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -42571,7 +42738,8 @@ dir = 6 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "vnd" = ( @@ -42595,8 +42763,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/science/server) "vnm" = ( @@ -42659,7 +42829,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/large, /area/hydroponics) "vnY" = ( @@ -42682,10 +42857,10 @@ /turf/open/openspace, /area/maintenance/department/security/brig) "voK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/multiz/down{ @@ -42729,8 +42904,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "vpU" = ( @@ -42774,10 +42949,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -42793,14 +42968,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "vry" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) @@ -42817,18 +42994,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron/grid/steel, /area/science/mixing) @@ -42841,13 +43008,15 @@ /turf/open/floor/prison/dark, /area/security/prison) "vsL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input/layer2, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input, /turf/open/floor/engine/air, /area/engine/atmos) "vsR" = ( -/obj/machinery/computer/atmos_control/tank/mix_tank, /obj/effect/turf_decal/box/corners, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4, +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_large, /area/engine/atmos) "vsS" = ( @@ -42897,12 +43066,13 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "vtn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42910,7 +43080,7 @@ /area/maintenance/department/science/central) "vtT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -42936,7 +43106,9 @@ /obj/machinery/atmospherics/components/unary/plasma_refiner{ dir = 8 }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "vvp" = ( /obj/structure/cable/yellow, @@ -42994,7 +43166,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "vyl" = ( /obj/effect/landmark/start/medical_doctor, @@ -43012,7 +43186,7 @@ pixel_y = 33; req_access_txt = "65" }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_red/filled/warning, @@ -43042,7 +43216,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/smooth_half{ dir = 1 }, @@ -43052,8 +43226,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/ai_slipper{ @@ -43093,12 +43267,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/effect/landmark/start/scientist, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/iron/grid/steel, /area/science/mixing) @@ -43106,7 +43277,9 @@ /obj/machinery/power/tracker, /obj/structure/cable, /obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "vBm" = ( /obj/machinery/door/airlock{ @@ -43128,8 +43301,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/turnstile{ @@ -43149,10 +43322,15 @@ /area/hallway/primary/aft) "vCZ" = ( /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -43184,19 +43362,15 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "vDC" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/computer/atmos_control/air_tank, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) @@ -43244,7 +43418,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "vFR" = ( /obj/structure/sign/warning/nosmoking/circle, @@ -43267,8 +43443,8 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "vHe" = ( @@ -43332,10 +43508,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -43381,14 +43557,12 @@ /turf/open/floor/iron/dark, /area/engineering/hallway) "vKr" = ( -/obj/machinery/computer/atmos_control/tank/air_tank{ - dir = 1 - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 6 +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, /turf/open/floor/iron/smooth_large, /area/engine/atmos) @@ -43407,8 +43581,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/ai_slipper{ @@ -43457,7 +43631,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "vMx" = ( @@ -43466,10 +43641,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/railing/corner{ @@ -43490,18 +43665,15 @@ "vNh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /obj/structure/holosign/barrier/atmos/robust, /turf/open/floor/plating, /area/engine/engineering) "vNl" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ - dir = 4 - }, /obj/effect/landmark/start/station_engineer, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "vNE" = ( /obj/structure/cable/yellow{ @@ -43510,8 +43682,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/junction, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -43523,7 +43695,8 @@ dir = 9 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "vPr" = ( @@ -43558,10 +43731,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -43583,7 +43756,7 @@ dir = 10 }, /obj/structure/flora/rock/pile/icy, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "vQN" = ( /turf/open/openspace, @@ -43596,7 +43769,7 @@ /turf/open/floor/plating, /area/engine/engineering) "vRk" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /turf/open/floor/plating/asteroid/frozengrass, @@ -43631,7 +43804,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/blue, @@ -43704,7 +43877,7 @@ "vSN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron/textured_large, @@ -43716,8 +43889,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -43736,8 +43909,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "vTE" = ( @@ -43757,10 +43930,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /mob/living/simple_animal/bot/secbot/beepsky{ @@ -43793,12 +43966,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"vVL" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, -/turf/open/floor/iron/textured_large, -/area/engine/atmos) "vVS" = ( /obj/structure/table/reinforced, /obj/item/storage/box{ @@ -43859,10 +44026,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -43897,7 +44064,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/ai_slipper{ @@ -43938,25 +44105,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/bridge) -"vZe" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/fence/post{ - dir = 8 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "vZw" = ( /obj/structure/flora/rock/pile/icy, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, @@ -43971,10 +44131,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -44004,7 +44164,7 @@ alpha = 100; dir = 4 }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "wbv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -44029,7 +44189,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine{ @@ -44080,7 +44240,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/smooth_corner{ dir = 1 }, @@ -44115,10 +44275,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -44146,8 +44306,8 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) @@ -44191,7 +44351,7 @@ /area/asteroid/paradise/surface) "wfM" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -44263,9 +44423,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/effect/mapping_helpers/atmos_auto_connect, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/atmospherics/components/unary/portables_connector, /turf/open/floor/iron/dark, /area/science/server) "wgZ" = ( @@ -44284,7 +44444,7 @@ dir = 9 }, /obj/machinery/firealarm/directional/south, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid, /area/crew_quarters/dorms) "whG" = ( /obj/effect/spawner/structure/window/reinforced, @@ -44300,17 +44460,19 @@ /obj/structure/fence/cut{ dir = 4 }, -/turf/open/floor/plating/asteroid/snow/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "whN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/quartermaster/warehouse) "wiC" = ( @@ -44324,22 +44486,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "wiE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/fence/cut{ - dir = 4 +/turf/open/floor/plating/asteroid/basalt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) +/area/engine/engineering) "wiI" = ( /obj/structure/lattice/catwalk/over, /obj/structure/railing{ @@ -44364,7 +44522,9 @@ dir = 9 }, /obj/effect/turf_decal/weather/snow, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "wjm" = ( /obj/structure/railing{ @@ -44376,10 +44536,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/camera/directional/north, @@ -44464,10 +44624,10 @@ "wmC" = ( /obj/item/trash/popcorn, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -44495,7 +44655,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -44532,10 +44692,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -44554,7 +44714,7 @@ /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "wqF" = ( @@ -44580,7 +44740,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron/smooth_half{ @@ -44649,7 +44809,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "wtQ" = ( @@ -44670,10 +44831,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -44747,7 +44908,8 @@ dir = 8 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "wxa" = ( @@ -44765,18 +44927,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/department/science/central) "wxd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/sorting/mail{ @@ -44823,7 +44985,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -44833,7 +44995,9 @@ /turf/open/floor/carpet/red, /area/security/detectives_office) "wyo" = ( -/turf/open/floor/glass/reinforced, +/turf/open/floor/glass/reinforced{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "wys" = ( /turf/closed/wall, @@ -44843,10 +45007,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -44888,10 +45052,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -44904,7 +45068,7 @@ anchored = 1; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating/asteroid/planetary, @@ -44929,8 +45093,8 @@ /turf/open/floor/iron, /area/security/prison) "wCG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 }, @@ -44963,8 +45127,8 @@ /area/hallway/primary/fore) "wDb" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45123,27 +45287,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) "wGy" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ - name = "Pure to Mix" +/obj/structure/window/plasma/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - name = "Air to Mix" - }, -/obj/structure/window/plasma/reinforced, -/obj/effect/turf_decal/box/white, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/iron/smooth_half, /area/engine/atmos) "wGC" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -45155,8 +45315,8 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/storage/primary) "wGS" = ( @@ -45269,10 +45429,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet/red, @@ -45282,10 +45442,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -45303,19 +45463,16 @@ /turf/open/floor/iron/dark, /area/quartermaster/qm) "wJm" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/computer/atmos_control/nitrogen_tank, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron/smooth_half, /area/engine/atmos) "wJp" = ( @@ -45347,12 +45504,13 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "wJS" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - dir = 1 - }, /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron/smooth_large, /area/engine/atmos) "wKa" = ( @@ -45362,7 +45520,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/iron/smooth_corner{ @@ -45428,8 +45586,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -45462,10 +45620,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -45579,10 +45737,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -45616,10 +45774,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -45645,7 +45803,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "wSz" = ( @@ -45713,10 +45871,13 @@ "wUl" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/apothecary) "wUU" = ( @@ -45778,7 +45939,8 @@ /area/asteroid/paradise/surface) "wWf" = ( /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "wWF" = ( @@ -45788,6 +45950,11 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/science/central) +"wXl" = ( +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise/surface) "wXo" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -45808,8 +45975,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -45836,7 +46003,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -45923,7 +46090,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/engine, @@ -45945,7 +46112,9 @@ pixel_x = -4; pixel_y = 7 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "xbu" = ( /obj/machinery/airalarm/directional/south, @@ -45969,10 +46138,10 @@ /area/hallway/primary/fore) "xct" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/grille/broken, @@ -46032,10 +46201,10 @@ /turf/open/floor/plating/asteroid/snow/planetary, /area/asteroid/paradise/surface) "xel" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/numbers{ dir = 1 }, @@ -46104,8 +46273,8 @@ /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "xge" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -46124,8 +46293,8 @@ alpha = 180 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/multiz{ dir = 1 @@ -46140,8 +46309,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) "xhX" = ( @@ -46167,12 +46336,12 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "xia" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/iron/smooth_large, /area/maintenance/disposal/incinerator) "xiu" = ( @@ -46200,8 +46369,8 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "xiD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -46220,10 +46389,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -46246,7 +46415,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "xjn" = ( @@ -46263,10 +46433,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) @@ -46324,10 +46494,10 @@ /turf/open/floor/iron/large, /area/engine/engineering) "xlu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 8 }, /turf/open/floor/plating/asteroid/planetary, @@ -46402,7 +46572,7 @@ name = "AI Upload"; req_access_txt = "16" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/tech/grid, @@ -46475,7 +46645,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/large, @@ -46497,11 +46667,12 @@ dir = 1 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "xpJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/sepia, @@ -46541,10 +46712,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -46553,14 +46724,16 @@ /area/science/research) "xqm" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "xqw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_one_access_txt = "12;28" @@ -46594,10 +46767,10 @@ /area/crew_quarters/heads/captain) "xsH" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -46624,15 +46797,15 @@ /turf/open/openspace, /area/maintenance/department/engine/atmos) "xtg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -46649,7 +46822,9 @@ icon_state = "0-2" }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "xty" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -46699,8 +46874,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/scientist, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -46809,10 +46984,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -46885,7 +47060,7 @@ /area/quartermaster/qm) "xyk" = ( /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output/layer2, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "xyB" = ( @@ -46913,7 +47088,7 @@ "xzm" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-2" }, @@ -46972,13 +47147,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/wood/broken, /area/library/abandoned) +"xAw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, +/area/asteroid/paradise/surface) "xAU" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/machinery/light/small, @@ -47001,8 +47182,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -47041,10 +47222,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) @@ -47060,7 +47241,9 @@ icon_state = "0-8" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "xCQ" = ( /obj/structure/railing{ @@ -47084,7 +47267,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 1 }, /turf/open/floor/engine/vacuum, @@ -47096,12 +47279,15 @@ /obj/structure/railing/corner{ dir = 8 }, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "xDF" = ( -/obj/machinery/air_sensor/atmos/mix_tank, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/engine/airless, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ + dir = 4 + }, +/turf/open/floor/iron/textured_large, /area/engine/atmos) "xDH" = ( /obj/effect/turf_decal/tile/purple{ @@ -47116,10 +47302,10 @@ }, /area/science/lab) "xDO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/disposal/bin, @@ -47147,18 +47333,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "xHy" = ( @@ -47166,10 +47352,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -47200,17 +47386,18 @@ /area/security/prison) "xHQ" = ( /obj/structure/fence/corner, -/turf/open/floor/plating/ice/smooth/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "xHX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/maintenance/department/engine) "xIg" = ( -/turf/open/floor/iron/textured_corner{ - dir = 8 - }, -/area/engine/atmos) +/obj/item/stack/cable_coil/red, +/turf/open/floor/plating/asteroid, +/area/asteroid/paradise) "xIl" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -47281,11 +47468,8 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "xIW" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/machinery/portable_atmospherics/canister{ - valve_open = 1 - }, -/turf/open/floor/engine/airless, +/obj/machinery/atmospherics/miner/station/plasma, +/turf/open/floor/engine/plasma, /area/engine/atmos) "xIX" = ( /obj/machinery/door/airlock/medical{ @@ -47295,7 +47479,9 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "xJx" = ( -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine/vacuum{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/science/mixing/chamber) "xJz" = ( /obj/effect/spawner/room/threexthree, @@ -47313,10 +47499,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "xJR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -47346,10 +47532,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -47385,16 +47571,16 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, /area/quartermaster/sorting) "xKV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -47447,10 +47633,10 @@ /area/security/brig) "xLT" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -47487,7 +47673,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -47536,10 +47722,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -47595,21 +47781,21 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/shower{ dir = 8; name = "emergency shower" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "xRp" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -47620,8 +47806,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/research{ id_tag = "ResearchExt"; @@ -47684,13 +47870,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "xTb" = ( @@ -47741,10 +47927,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -47834,7 +48020,8 @@ dir = 10 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "xVJ" = ( @@ -47895,10 +48082,15 @@ dir = 8 }, /obj/machinery/chem_dispenser, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/apothecary) "xXk" = ( @@ -47998,8 +48190,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science/central) @@ -48018,17 +48210,17 @@ }, /area/hallway/primary/central) "ybO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -48077,10 +48269,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -48088,14 +48280,16 @@ "ydE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/marker_beacon, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/iron/techmaint/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "ydF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood/broken, /area/library/abandoned) "ydG" = ( @@ -48117,10 +48311,10 @@ name = "Primary Tool Storage" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -48136,7 +48330,8 @@ dir = 9 }, /turf/open/floor/sepia/planetary{ - slowdown = 0 + slowdown = 0; + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" }, /area/asteroid/paradise/surface) "yeM" = ( @@ -48144,7 +48339,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "yeS" = ( /obj/structure/stairs{ @@ -48176,7 +48373,7 @@ name = "Port Solar Array" }, /obj/structure/cable, -/turf/open/floor/iron/solarpanel, +/turf/open/floor/iron/solarpanel/cold, /area/asteroid/paradise/surface) "yfW" = ( /obj/effect/turf_decal/tile/neutral, @@ -48188,7 +48385,7 @@ /obj/item/toy/plush/lizard_plushie{ name = "Swims-the-ocean" }, -/turf/open/floor/plating/beach/deep_water, +/turf/open/floor/plating/beach/deep_water/cold, /area/asteroid/paradise/surface/water) "ygK" = ( /obj/structure/extinguisher_cabinet{ @@ -48242,7 +48439,9 @@ /area/security/warden) "yjL" = ( /obj/structure/flora/rock/icy, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/plating/asteroid/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/engine/engineering) "yjV" = ( /obj/structure/cable/yellow{ @@ -48252,20 +48451,25 @@ /area/asteroid/paradise/surface) "yjX" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating, /area/engine/supermatter) "ykL" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "ykM" = ( @@ -48280,7 +48484,9 @@ dir = 1 }, /obj/structure/fence/door, -/turf/open/floor/plating/dirt/planetary, +/turf/open/floor/plating/dirt/planetary{ + initial_gas_mix = "o2=26;n2=97;TEMP=259.15" + }, /area/asteroid/paradise/surface) "ykT" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -55428,7 +55634,7 @@ jsp jsp uli mXn -tJQ +bFY uli vqI vqI @@ -55680,12 +55886,12 @@ iGq rrg iGq iGq -oJl +tHO uli qVs tHO kFJ -nIy +tJQ tHO vFR uli @@ -55937,7 +56143,7 @@ ltt oGy xqe iGq -vqI +jOo tHO uYL umI @@ -56193,14 +56399,14 @@ aRu kYy afy rXp -faZ +tHO uli uli rui rBg amR vkZ -vVL +rBg kRI uli uli @@ -56450,17 +56656,17 @@ xpJ kcv oTt sZb -faZ +tHO gLH aay pnv vjT kFc kro -pGd +rBg iYa -tuV mWX +xIW tHO vqI vqI @@ -56707,17 +56913,17 @@ whN iVv kCM wEs -vXr +uli tPx nxm mBs -toh +snY wJS bDG lVl -jEN -gFd +uNE jct +mVW uli vqI vqI @@ -56971,7 +57177,7 @@ wJm snY vKr vsR -fsp +rBg nHR vgG drz @@ -57222,20 +57428,20 @@ sxu iVv iVv tHO -eNy kqG -dbG +eNy +pnv cZv kRm kKG vNl qUU -bFY uyb +toh uli vqI -jOo -jOo +vqI +vqI vqI vqI vqI @@ -57482,7 +57688,7 @@ uli xyk bKc fto -rBg +xDF pMT jpL sNW @@ -57490,9 +57696,9 @@ uNE mCk nlB uli -jOo -jOo -jOo +vqI +vqI +vqI vqI vqI vqI @@ -57740,18 +57946,18 @@ drz vgG vDC inB -eoL -xIg +pMT +sex hBV hdU vgG drz tHO -jOo -jOo -jOo -jOo -jOo +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -57991,25 +58197,25 @@ lEu mht ehf sfR -jOo +vqI uli +eoL vsL -qMR sOh jwO nPw sex -oFV +rBg wGy -xIW tqq +qMR tHO -jOo -gid -jOo -rRV -jOo -jOo +vqI +sLz +vqI +bXA +vqI +vqI vqI vqI vqI @@ -58248,25 +58454,25 @@ oRv rhv gCM nWb -jOo +vqI uli +nIy fmE -sPS kcP ouk rIf mgw dGG rIE -xDF dnm +dbG uli -qXs -bJq -pgG -rRV -rRV -jOo +giS +xqU +mdK +bXA +bXA +vqI vqI vqI vqI @@ -58505,7 +58711,7 @@ lEu bnh qQW nWb -jOo +vqI tHO uli tHO @@ -58519,12 +58725,12 @@ tHO uli tHO cNa -gid -rRV -rRV -rRV -jOo -jOo +sLz +bXA +bXA +bXA +vqI +vqI vqI vqI vqI @@ -58762,12 +58968,12 @@ lEu bod vHR sfR -jOo -jOo -jRB +vqI +vqI +vqI vgG jIC -rBg +lHZ ngQ nCG rBg @@ -58775,13 +58981,13 @@ fPF tmh giS cKQ -giS +xIg ugf bLe -rRV -jOo -jOo -jOo +bXA +vqI +vqI +vqI vqI vqI vqI @@ -59019,26 +59225,26 @@ lEu dMS lEu aZV -jOo -giS -lHZ -lho +vqI +vqI +vqI +vgG eKo dML ehW -fru +sPS rBg qqo -tmh +kNb qXs ghR gKe nCN -bJq +faZ rjR -jOo -jOo -jOo +vqI +vqI +vqI vqI vqI vqI @@ -59276,9 +59482,9 @@ iOA pUm rmX ttw -jOo -jOo -jOo +vqI +vqI +vqI vgG qXA oPI @@ -59287,14 +59493,14 @@ dpe ovq bOk vgG -qXs +giS qYq mVu iZP -bJq -jOo -jOo -jOo +xqU +vqI +vqI +vqI vqI vqI vqI @@ -59814,9 +60020,9 @@ gGu lUG xBx xCJ -jmW +wiE rjV -eRe +ggb lCS jsp jsp @@ -60073,7 +60279,7 @@ ioD iDs uIV qCi -knG +uXr lCS jsp jsp @@ -60330,7 +60536,7 @@ fbW xCJ yjL cqp -jmW +wiE sXB jsp jsp @@ -62113,7 +62319,7 @@ kCg mbu erU uht -gFA +uht wqW utH rpd @@ -64168,7 +64374,7 @@ lty qOI eMG wKa -fqt +uaq uaq vyF mwd @@ -66209,7 +66415,7 @@ hNR vnh wgL gkj -hpW +aoV aoV dgd aEM @@ -66724,7 +66930,7 @@ aet aAh rlo lfV -rRm +lfV ssu aEM hzQ @@ -68526,7 +68732,7 @@ orX lYA lYA odf -iKR +bPY qIB lYA bPY @@ -68787,7 +68993,7 @@ odf lYA lYA odf -dZF +kHd odf exD lYA @@ -123508,7 +123714,7 @@ jKK kKx lTW kdJ -ohx +iZS vyl pvV bup @@ -124281,7 +124487,7 @@ mtn ill cbP abN -ohx +iZS epj xYT bGO @@ -124795,7 +125001,7 @@ vLz azd gHV brZ -ohx +iZS tFb xYT pfq @@ -125040,7 +125246,7 @@ cOp ncd dKS kjP -bTZ +eEm xmB bDD drs @@ -125350,9 +125556,9 @@ vqI vqI vqI oJl -bvw -bvw -bvw +gBy +gBy +gBy oJl vqI vqI @@ -125607,9 +125813,9 @@ vqI vqI vqI oJl -bvw -bvw -bvw +gBy +gBy +gBy oJl vqI vqI @@ -125864,9 +126070,9 @@ vqI vqI vqI oJl -bvw -bvw -bvw +gBy +gBy +gBy oJl vqI vqI @@ -133538,7 +133744,7 @@ aYd aAV aJn xGI -qOE +rdC tlw aqu qUB @@ -133796,7 +134002,7 @@ aAV aBR tWP fGQ -cYL +jEN aqu aqu eiT @@ -134310,7 +134516,7 @@ aAV hrt eoE vAX -mVW +acU eQG aqu wVx @@ -135335,7 +135541,7 @@ cae cae cae cae -cae +aqu ohh aqu aqu @@ -143047,7 +143253,7 @@ vqI sdD sdD hny -mHX +rUM gZy sdD sdD @@ -143305,7 +143511,7 @@ hfo tRJ jCG sBs -gBy +dPG gDJ hfo toz @@ -143817,9 +144023,9 @@ vqI hfo toz rwF -gBy +dPG wdl -gBy +dPG hUU toz toz @@ -144334,7 +144540,7 @@ dPp sdD qZN wKO -dPp +dZF jsp jsp jsp @@ -190886,9 +191092,9 @@ vqI vqI vqI oJl -bvw -bvw -bvw +gBy +gBy +gBy oJl vqI vqI @@ -191143,9 +191349,9 @@ vqI vqI vqI oJl -bvw -bvw -bvw +gBy +gBy +gBy oJl vqI vqI @@ -191400,9 +191606,9 @@ vqI vqI vqI oJl -bvw -bvw -bvw +gBy +gBy +gBy oJl vqI vqI @@ -200094,7 +200300,7 @@ rZM rZM rrr eSv -gXD +mHX eSv rZM rZM @@ -200351,7 +200557,7 @@ rZM rZM rZM eSv -gXD +mHX eSv rZM rZM @@ -200608,7 +200814,7 @@ rZM rZM rZM eSv -gXD +mHX eSv rZM rZM @@ -255369,7 +255575,7 @@ bog hgC dvm dvm -kNb +glK mUP sqh nNY @@ -255394,7 +255600,7 @@ yli yli yli yli -kxS +tCm yli yli bog @@ -255628,7 +255834,7 @@ coy wjA hFw xOo -kNb +glK dvm eKt qwe @@ -255651,10 +255857,10 @@ yli yli yli yli -dAb -dAb +fWU +fWU yli -kxS +tCm bog bog bog @@ -255907,12 +256113,12 @@ yli yli yli yli -kxS -kxS +tCm +tCm kiz -kxS -dAb -kxS +tCm +fWU +tCm bog bog bog @@ -256147,7 +256353,7 @@ eub dvm pcm vuq -kNb +bgV dvm fVK bgV @@ -256163,13 +256369,13 @@ yli yli yli yli -dAb +fWU fLX kQs jxA kQs joS -kxS +tCm bog bog bog @@ -256403,7 +256609,7 @@ sHG nQC yeM hFw -mon +fsp jqW dvm iFu @@ -256420,14 +256626,14 @@ yli yli yli yli -kxS +tCm qSH aoY aoY aoY vcy -dAb -kxS +fWU +tCm yli bog bog @@ -256676,15 +256882,15 @@ yli yli yli yli -kxS -kxS -vZe +tCm +tCm +rOI aoY aoY aoY ykS -kxS -kxS +tCm +tCm yli yli yli @@ -256933,15 +257139,15 @@ yli yli yli yli -kxS -dAb +tCm +fWU cZp aoY aoY aoY msV kiz -dAb +fWU yli yli yli @@ -257191,14 +257397,14 @@ yli yli yli yli -kxS -pdW +tCm +tJh +tfl tfl -fWU hcP qRZ -kxS -kxS +tCm +tCm yli yli yli @@ -257448,12 +257654,12 @@ wVV wVV wVV yli -kxS -kxS -dAb -dAb -kxS -kxS +tCm +tCm +fWU +fWU +tCm +tCm yli yli yli @@ -257709,9 +257915,9 @@ yli yli yli yli -dAb -dAb -kxS +fWU +fWU +tCm yli yli yli @@ -259235,7 +259441,7 @@ iSi iSi iSi iaH -tCm +tJf hWI tkk awG @@ -259492,7 +259698,7 @@ guE guE buU buG -glK +dlR wCS rTs ydE @@ -259500,10 +259706,10 @@ vfA bIK ofE xpq -uXr +wXl pAy -uXr -uXr +wXl +wXl msF wVV hHp @@ -260006,19 +260212,19 @@ aNl aNl eDp lmY -qCv +dlR rAm tWG nBs qKQ -ggb +xAw pAb ruX -uXr -uXr -uXr -uXr -uXr +wXl +wXl +wXl +wXl +wXl cXz hHp yli @@ -260263,7 +260469,7 @@ iSi iSi iSi feQ -tCm +tJf hWI yjV tkk @@ -260520,12 +260726,12 @@ iSi iSi iSi npg -tCm +jUh hWI gRw fdt jPI -uXr +wXl ngJ rqj hxu @@ -261038,7 +261244,7 @@ ksd rDZ saj rrT -ggb +xAw cnJ kqB bIK @@ -261809,7 +262015,7 @@ rDZ rDZ tqj hfK -ggb +xAw wUU nQI lnM @@ -262065,7 +262271,7 @@ xNL apP nAU bYf -ggb +xAw cnJ wUU lEc @@ -262579,7 +262785,7 @@ wVV dav cnJ rpV -ggb +xAw wUU lEc bIK @@ -262836,7 +263042,7 @@ uDA nnR kqB sXm -ggb +xAw xwt fuQ bIK @@ -263353,7 +263559,7 @@ ili bIK lEc tgt -uXr +wXl sol auy yfQ @@ -263826,10 +264032,10 @@ yli yli yli yli -uXr +wXl bgV bgV -uXr +wXl xDB lnG uDA @@ -263866,13 +264072,13 @@ wGC bYf lnM xzJ -uXr +wXl dNK -uXr +wXl uJN hfK -ggb -uXr +xAw +wXl uJN bIK sBX @@ -264083,8 +264289,8 @@ yli yli yli jtI -uXr -uXr +wXl +wXl bgV uSL crW @@ -264340,9 +264546,9 @@ yli yli yli yli -uXr -uXr -uXr +wXl +wXl +wXl bgV bBH tvm @@ -264382,7 +264588,7 @@ sBX xzJ eZG uJN -uXr +wXl trc lnM kqB @@ -264858,7 +265064,7 @@ yli yli yli yli -dAb +fWU uDA bAw eoS @@ -265114,9 +265320,9 @@ yli yli yli yli -kxS -dAb -kxS +tCm +fWU +tCm uDA dvc sNi @@ -265148,11 +265354,11 @@ gpg wVV wVV uDA -ggb +xAw wGC lEc xbj -uXr +wXl sol mYe yfQ @@ -265371,7 +265577,7 @@ sNi sNi sNi sNi -dAb +fWU tyc djK cPg @@ -265409,7 +265615,7 @@ hfK kqB lEc xXl -uXr +wXl sol mYe yfQ @@ -265631,7 +265837,7 @@ sNi sNi uRn aoY -wiE +whJ dvc dvc sNi @@ -265920,7 +266126,7 @@ wVV wGC nPk hfK -ggb +xAw cnJ nIF bIK @@ -266145,7 +266351,7 @@ sNi sNi kgt aoY -wiE +whJ dvc dvc sNi @@ -266433,7 +266639,7 @@ wVV enb uDA xqm -ggb +xAw kqB yli pdW @@ -268228,16 +268434,16 @@ yli mWD wWf wWf -ggb -ggb -uXr -uXr -uXr +xAw +xAw +wXl +wXl +wXl wwW wWf wWf wWf -uXr +wXl sLb fcm wVV @@ -268485,8 +268691,8 @@ yli mWD wWf cjJ -uXr -uXr +wXl +wXl mNA fku fku @@ -268494,7 +268700,7 @@ wWf wWf wWf cjJ -ggb +xAw mby wWf xjg @@ -268743,15 +268949,15 @@ eVo wWf rQE klM -uXr -uXr +wXl +wXl dCl wWf wWf wWf wWf wtw -uXr +wXl wWf wWf npi @@ -269001,14 +269207,14 @@ wWf rQE wWf cjJ -uXr -uXr +wXl +wXl nqZ wWf wWf wWf qlg -uXr +wXl mby wWf hfW @@ -269259,13 +269465,13 @@ rQE sLb ovD wWf -uXr -uXr +wXl +wXl uqc ovD mNA dNX -uXr +wXl sLb wWf tUC @@ -269514,15 +269720,15 @@ nbS miz rQE dNK -ggb -uXr -ggb -ggb +xAw +wXl +xAw +xAw uQK -uXr -ggb -ggb -uXr +wXl +xAw +xAw +wXl rQE wWf tUC diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 25b3fdcc85958..cf7c13c13a490 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -3,13 +3,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "aam" = ( @@ -43,7 +43,7 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -64,10 +64,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/end{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "abi" = ( @@ -130,7 +131,7 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -141,7 +142,9 @@ /area/chapel/main) "abJ" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/turf/open/floor/iron{ + initial_gas_mix = "TEMP=2.7" + }, /area/space/nearstation) "abN" = ( /turf/open/floor/plating/asteroid/airless, @@ -150,10 +153,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/airless, /area/space/nearstation) -"abZ" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating/airless, -/area/space/nearstation) "acb" = ( /obj/machinery/status_display/ai{ pixel_x = -32 @@ -164,7 +163,7 @@ /area/hallway/primary/aft) "acn" = ( /obj/structure/girder, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "aco" = ( /obj/structure/lattice, @@ -200,26 +199,28 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) "acB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/catwalk_floor/iron_smooth, /area/science/mixing) "acF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/chair/fancy/bench/pew{ @@ -239,10 +240,10 @@ /turf/open/space/basic, /area/space/nearstation) "acU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -274,7 +275,7 @@ /area/solar/port/fore) "adh" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -304,11 +305,15 @@ /turf/open/floor/iron/dark, /area/chapel/main) "adz" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/ameridiner, /area/engine/engine_room) "adF" = ( /obj/structure/cable/yellow{ @@ -392,10 +397,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -406,13 +411,13 @@ /area/hallway/primary/starboard) "afi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -473,10 +478,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -535,7 +540,7 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "ahp" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/techmaint, /area/maintenance/disposal/incinerator) "ahq" = ( @@ -575,10 +580,10 @@ "ahM" = ( /obj/effect/turf_decal/bot, /obj/structure/plasticflaps/opaque, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -657,7 +662,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "aiW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -707,17 +712,16 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "ajv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -725,6 +729,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs/right, /area/hallway/secondary/entry) "ajz" = ( @@ -852,8 +857,8 @@ name = "Security Post - Cargo"; req_one_access_txt = "1;57" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -888,11 +893,11 @@ name = "sink"; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/wood, @@ -900,7 +905,7 @@ "alr" = ( /obj/effect/landmark/start/brig_physician, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -967,26 +972,24 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "amH" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/flip, @@ -1014,10 +1017,10 @@ /turf/open/space/basic, /area/space) "amZ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "ana" = ( @@ -1083,7 +1086,9 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "aob" = ( -/turf/open/floor/plating/rust, +/turf/open/floor/plating/rust{ + initial_gas_mix = "TEMP=2.7" + }, /area/space/nearstation) "aod" = ( /obj/effect/decal/cleanable/dirt, @@ -1094,14 +1099,14 @@ /area/maintenance/port/central) "aoe" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) "aoh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -1133,7 +1138,9 @@ /area/hydroponics/garden) "aoW" = ( /obj/structure/girder, -/turf/open/floor/plating/foam, +/turf/open/floor/plating/foam{ + initial_gas_mix = "TEMP=2.7" + }, /area/space/nearstation) "ape" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -1165,10 +1172,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/techmaint, @@ -1180,15 +1187,18 @@ /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "apN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/hallway/secondary/entry) +/turf/open/floor/iron, +/area/quartermaster/office) "aqg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1213,7 +1223,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqL" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -1233,8 +1243,8 @@ req_access_txt = "25" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/crew_quarters/bar) "aqQ" = ( @@ -1256,9 +1266,10 @@ /area/solar/port/aft) "arf" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, -/turf/open/floor/iron, +/turf/open/floor/iron{ + initial_gas_mix = "TEMP=2.7" + }, /area/asteroid/nearstation) "arg" = ( /obj/structure/grille, @@ -1316,14 +1327,15 @@ /obj/effect/turf_decal/stripes/corner{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ask" = ( @@ -1368,10 +1380,10 @@ pixel_x = 6; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -1403,7 +1415,7 @@ }, /area/hallway/secondary/entry) "asQ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /obj/machinery/light, @@ -1441,10 +1453,10 @@ /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -1523,7 +1535,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -1534,7 +1546,7 @@ /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) "aua" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -1581,10 +1593,10 @@ "auG" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -1610,8 +1622,8 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple, /obj/effect/turf_decal/guideline/guideline_out/yellow, /obj/effect/turf_decal/guideline/guideline_in/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "avb" = ( @@ -1682,12 +1694,12 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/security/nuke_storage) "avS" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -1736,16 +1748,6 @@ "awm" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/techmaint, /area/maintenance/department/science) @@ -1762,7 +1764,9 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/iron, +/turf/open/floor/iron{ + initial_gas_mix = "TEMP=2.7" + }, /area/asteroid/nearstation) "awC" = ( /obj/machinery/power/solar{ @@ -1826,22 +1830,23 @@ /turf/open/floor/dock/drydock, /area/drydock/security) "axI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, -/area/bridge) +/area/hallway/primary/starboard) "axJ" = ( /obj/structure/railing{ dir = 8 }, -/turf/open/floor/plating/foam, +/turf/open/floor/plating/foam{ + initial_gas_mix = "TEMP=2.7" + }, /area/asteroid/nearstation) "axS" = ( /obj/machinery/power/apc/auto_name/directional/south, @@ -1852,10 +1857,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -1901,10 +1906,10 @@ icon_state = "1-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1930,7 +1935,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ dir = 8 }, /obj/structure/cable/orange{ @@ -1949,10 +1954,10 @@ /turf/open/floor/iron/dark, /area/medical/cryo) "azm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -1980,14 +1985,13 @@ /turf/open/floor/plating, /area/maintenance/port/central) "azE" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Research Server Room"; req_one_access_txt = "30;70" }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, /turf/open/floor/iron/techmaint, /area/science/server) "azF" = ( @@ -2006,12 +2010,7 @@ /turf/open/floor/plating, /area/security/prison) "azG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/maintenance/disposal) "azJ" = ( @@ -2027,12 +2026,6 @@ /turf/closed/wall/r_wall, /area/storage/art) "aAg" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -2040,6 +2033,12 @@ icon_state = "2-8" }, /obj/machinery/camera/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "aAl" = ( @@ -2066,7 +2065,7 @@ /turf/open/floor/iron/dark, /area/science/shuttle) "aAu" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -2094,7 +2093,9 @@ "aBk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/over, -/turf/open/floor/plating, +/turf/open/floor/plating{ + initial_gas_mix = "TEMP=2.7" + }, /area/asteroid/nearstation) "aBo" = ( /obj/effect/spawner/structure/window/reinforced/tinted, @@ -2110,8 +2111,8 @@ "aBw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2123,8 +2124,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/medical{ name = "Surgery Observation" }, @@ -2151,7 +2152,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -2174,7 +2175,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "aCb" = ( -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "aCf" = ( /turf/closed/wall/r_wall, @@ -2183,13 +2184,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -2202,14 +2203,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/engine/storage_shared) "aCG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -2223,7 +2223,7 @@ /turf/open/floor/iron, /area/medical/break_room) "aCI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2234,14 +2234,14 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "aCO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark/side{ dir = 8 }, /area/engine/atmos) "aDa" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /turf/open/floor/iron, @@ -2283,10 +2283,13 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "aDq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "aDz" = ( @@ -2312,7 +2315,9 @@ /turf/open/floor/iron/techmaint, /area/science/storage) "aDF" = ( -/turf/open/floor/plating/rust, +/turf/open/floor/plating/rust{ + initial_gas_mix = "TEMP=2.7" + }, /area/asteroid/nearstation) "aDZ" = ( /obj/structure/cable/yellow{ @@ -2321,19 +2326,21 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "aEp" = ( /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "aEt" = ( @@ -2354,12 +2361,15 @@ /turf/open/floor/iron/techmaint, /area/security/brig) "aEO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "aEP" = ( @@ -2415,7 +2425,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "aFA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -2439,12 +2449,6 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "aFL" = ( @@ -2454,7 +2458,7 @@ c_tag = "Science - Robotics Lab"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/rack, @@ -2530,17 +2534,16 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "aGh" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/hallway/secondary/entry) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/sepia, +/area/science/shuttle) "aGk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2649,7 +2652,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "aGS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/chair/fancy/plastic, @@ -2690,8 +2693,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "aHA" = ( @@ -2703,8 +2706,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "aHG" = ( @@ -2780,13 +2785,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/medical/virology) "aIF" = ( @@ -2817,10 +2820,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "aIN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -2843,10 +2846,10 @@ /turf/open/floor/noslip/standard, /area/crew_quarters/fitness/recreation) "aIX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -2990,7 +2993,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "aKb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/iron, @@ -3044,17 +3047,15 @@ /turf/open/floor/iron/techmaint, /area/science/shuttle) "aLc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/plating, -/area/science/shuttle) +/turf/open/floor/iron/white, +/area/medical/genetics) "aLj" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -3071,15 +3072,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/fore) "aLo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "aLs" = ( @@ -3113,8 +3119,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -3163,7 +3169,6 @@ req_access_txt = "10; 13" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port/fore) "aMK" = ( @@ -3175,10 +3180,10 @@ /area/maintenance/port/central) "aMN" = ( /obj/effect/landmark/start/depsec/supply, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -3206,8 +3211,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=6-Dorms"; @@ -3218,21 +3223,12 @@ "aNc" = ( /turf/open/floor/iron/dark, /area/gateway) -"aNs" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "aNA" = ( /obj/structure/falsewall, /turf/open/floor/plating, /area/maintenance/port/central) "aNF" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 8 }, /turf/open/floor/engine/vacuum/light, @@ -3242,8 +3238,8 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3260,12 +3256,17 @@ /obj/effect/turf_decal/stripes/white/end{ dir = 8 }, -/obj/machinery/airalarm/mixingchamber{ +/obj/machinery/airalarm{ dir = 4; pixel_x = 22 }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/techmaint, -/area/science/mixing/chamber) +/area/science/mixing) "aNW" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -3276,7 +3277,7 @@ name = "Genetics Lab Maintenance"; req_access_txt = "9" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) "aOa" = ( @@ -3297,11 +3298,11 @@ /turf/open/floor/grass, /area/hydroponics/garden) "aOi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "aOm" = ( @@ -3316,10 +3317,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -3342,19 +3343,19 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/central) "aOE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 10 + }, /turf/open/floor/engine, /area/engine/engine_room) "aOG" = ( @@ -3370,13 +3371,13 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/turf/open/floor/iron/dark/airless, +/turf/open/floor/iron/dark, /area/medical/surgery) "aOI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -3387,18 +3388,12 @@ "aOJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 26 - }, /obj/machinery/light/small{ dir = 8 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port/fore) "aOM" = ( @@ -3406,7 +3401,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ dir = 8 }, @@ -3422,8 +3417,8 @@ /turf/open/floor/plating, /area/medical/medbay/central) "aOU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -3467,10 +3462,15 @@ req_access_txt = "10; 13" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port/fore) +"aPF" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "aPH" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -3483,9 +3483,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/research{ name = "Toxins Launch Site"; @@ -3495,11 +3495,11 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/science) "aPK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/science/storage) "aPP" = ( @@ -3563,12 +3563,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -3606,7 +3600,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "aQK" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/engine_room) @@ -3616,8 +3610,8 @@ req_access_txt = "12" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/aft) @@ -3641,7 +3635,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "aRe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3673,15 +3667,16 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "aRi" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/central) +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/fore) "aRn" = ( /obj/machinery/flasher{ id = "monkeypen"; @@ -3694,12 +3689,12 @@ /area/medical/virology) "aRw" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/medical/glass{ name = "Psychologist" }, @@ -3723,12 +3718,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "aRL" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /turf/open/floor/iron/techmaint, /area/maintenance/port/central) "aRS" = ( @@ -3751,13 +3740,24 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 9 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"aSh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/secondary/entry) "aSk" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 @@ -3821,10 +3821,10 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "aTa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -3848,10 +3848,10 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "aTl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -3861,25 +3861,25 @@ /turf/open/floor/iron/dark, /area/bridge) "aTA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, /area/maintenance/port/central) "aTF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -3893,15 +3893,15 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "aTN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ + dir = 8 }, /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) @@ -3952,7 +3952,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "aUn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 1 }, /turf/open/floor/engine/n2/light, @@ -3972,8 +3972,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "aUw" = ( @@ -3993,8 +3991,11 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "aUQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "aUY" = ( @@ -4013,9 +4014,9 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aVi" = ( @@ -4035,12 +4036,7 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aVk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/port/central) "aVl" = ( @@ -4050,37 +4046,26 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/external{ req_access_txt = "13" }, /turf/open/floor/iron/techmaint, /area/maintenance/port/central) "aVq" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/techmaint, /area/maintenance/port/central) "aVr" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/maintenance/port/central) +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/port) "aVv" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -4105,11 +4090,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aVB" = ( @@ -4117,8 +4102,8 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -4270,8 +4255,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "aXj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating/rust, /area/maintenance/port/fore) "aXD" = ( @@ -4304,11 +4289,11 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/light/small, /obj/structure/sign/warning/fire{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "aXT" = ( @@ -4316,10 +4301,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/heads/cmo) "aYd" = ( @@ -4379,10 +4364,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "aYN" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -4409,18 +4397,12 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "aZh" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, /obj/machinery/light/small, /turf/open/floor/iron/techmaint, /area/science/shuttle) "aZm" = ( /obj/effect/turf_decal/bot, -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /turf/open/floor/iron/dark, /area/engine/atmos) "aZB" = ( @@ -4432,10 +4414,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -4450,14 +4432,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) "bai" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/chair/fancy/bench/pew{ @@ -4481,14 +4463,12 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "bar" = ( -/obj/effect/turf_decal/loading_area, -/obj/effect/turf_decal/stripes/corner{ - dir = 9 +/obj/effect/turf_decal/siding/yellow{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/hallway/secondary/exit/departure_lounge) "bau" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -4497,12 +4477,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/science/shuttle) "baI" = ( @@ -4516,9 +4494,15 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "baL" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "baT" = ( @@ -4570,15 +4554,26 @@ }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) +"bcm" = ( +/obj/effect/turf_decal/stripes/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/secondary/entry) "bcB" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 1 }, -/obj/machinery/meter, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "bcG" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -4591,19 +4586,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/dorms) "bcO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -4611,6 +4603,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "bcS" = ( @@ -4627,7 +4620,7 @@ /area/crew_quarters/toilet/restrooms) "bdd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -4636,10 +4629,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -4651,23 +4644,32 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "bdm" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "bdq" = ( @@ -4694,18 +4696,18 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port/central) "bdP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/item/beacon, /turf/open/floor/iron, /area/crew_quarters/locker) "bed" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/medical) "bef" = ( @@ -4756,8 +4758,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "bfc" = ( @@ -4767,8 +4769,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/central) "bfg" = ( @@ -4824,6 +4826,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bgk" = ( @@ -4840,16 +4844,16 @@ /obj/structure/chair/office/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/genetics) "bgM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -4863,7 +4867,7 @@ /turf/open/space, /area/space/nearstation) "bgQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet/purple, @@ -4887,15 +4891,13 @@ /area/science/robotics/mechbay) "bhg" = ( /obj/item/shard, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "bhp" = ( /turf/open/floor/plating/rust, /area/maintenance/department/medical) "bhz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "bhH" = ( @@ -4916,10 +4918,10 @@ name = "Quartermaster's Quarters"; req_access_txt = "41" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -4978,7 +4980,7 @@ /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = -10 @@ -5004,7 +5006,7 @@ /turf/open/floor/iron/dark, /area/chapel/office) "biA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -5013,9 +5015,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "biB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, @@ -5023,10 +5022,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "biF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -5053,7 +5052,7 @@ /area/maintenance/department/engine) "biR" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light/small, @@ -5076,10 +5075,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -5097,21 +5096,21 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "bjS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "bkd" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/genetics) @@ -5189,15 +5188,9 @@ /turf/open/floor/carpet/black, /area/chapel/office) "bkO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/sepia, -/area/science/shuttle) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet, +/area/crew_quarters/bar/atrium) "bkU" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -5210,7 +5203,7 @@ /turf/open/floor/iron/grid, /area/medical/virology) "blc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/chair{ dir = 8 }, @@ -5224,12 +5217,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -5246,7 +5233,7 @@ /turf/open/floor/carpet, /area/chapel/office) "blp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -5256,15 +5243,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/science/storage) "blx" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -5276,15 +5263,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "blH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line, @@ -5294,7 +5281,7 @@ /turf/open/floor/iron, /area/hydroponics) "blY" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/dark, @@ -5328,11 +5315,11 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "bmq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -5389,7 +5376,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -5426,10 +5413,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "bni" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/box, @@ -5438,14 +5425,11 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "bns" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttle) +/turf/open/floor/iron/dark, +/area/hallway/secondary/entry) "bnw" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /obj/structure/disposalpipe/segment, @@ -5508,8 +5492,8 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) "boV" = ( @@ -5547,8 +5531,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/central) "bpC" = ( @@ -5559,8 +5542,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ dir = 5 @@ -5580,24 +5563,23 @@ /area/maintenance/central/secondary) "bqi" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/iron/grid/steel, -/area/bridge) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "bqq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -5634,8 +5616,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -5667,7 +5649,7 @@ /turf/open/floor/iron/dark, /area/medical/storage) "bqN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/stairs/medium{ dir = 1 }, @@ -5696,10 +5678,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/chair/fancy/comfy{ @@ -5720,10 +5702,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -5737,7 +5719,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "brH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -5758,7 +5740,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -5793,7 +5775,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -5821,7 +5803,7 @@ /area/security/checkpoint) "bsI" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /obj/structure/cable/orange{ @@ -5858,10 +5840,10 @@ name = "Surgery Maintenance"; req_access_txt = "45" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -5884,8 +5866,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -5945,10 +5927,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/blue{ @@ -5970,10 +5952,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -6010,12 +5992,6 @@ }, /turf/open/floor/carpet, /area/chapel/main) -"bvo" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/turf/open/floor/plating, -/area/maintenance/port/fore) "bvs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6026,10 +6002,10 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -6056,7 +6032,7 @@ /turf/open/floor/iron, /area/maintenance/port/central) "bvG" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner, @@ -6070,6 +6046,7 @@ roundstart_template = /datum/map_template/shuttle/escape_pod/default; width = 3 }, +/obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) "bvZ" = ( @@ -6122,10 +6099,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -6213,7 +6190,7 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "byo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -6245,13 +6222,13 @@ /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "bzu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "bzv" = ( @@ -6259,8 +6236,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -6275,7 +6252,7 @@ /area/maintenance/aft) "bzK" = ( /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) "bzV" = ( @@ -6305,8 +6282,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, @@ -6324,7 +6301,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "bAF" = ( @@ -6405,8 +6382,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -6446,10 +6423,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -6458,10 +6435,10 @@ /turf/open/floor/iron, /area/engine/atmos) "bDq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -6473,10 +6450,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -6503,10 +6480,10 @@ /area/maintenance/port/central) "bDQ" = ( /obj/effect/turf_decal/trimline/red/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -6576,7 +6553,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -6625,10 +6602,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -6645,10 +6622,10 @@ /turf/open/floor/iron/techmaint, /area/science/robotics/lab) "bGF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -6666,10 +6643,10 @@ }, /area/maintenance/starboard/fore) "bGU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -6679,7 +6656,7 @@ name = "Betsy"; real_name = "Betsy" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -6705,7 +6682,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -6714,8 +6694,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ dir = 4 }, @@ -6738,21 +6718,21 @@ /turf/open/floor/iron, /area/storage/primary) "bHZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/iron, /area/engine/atmos) "bIe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/stairs{ dir = 4 }, /area/security/execution/transfer) "bIn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, @@ -6761,10 +6741,10 @@ /turf/open/floor/iron/white, /area/science/shuttledock) "bIt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -6781,10 +6761,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/aft) "bIy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/plating/rust, @@ -6802,14 +6779,14 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "bJo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "bJt" = ( @@ -6817,8 +6794,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/grunge{ name = "Morgue"; req_access_txt = "5" @@ -6831,13 +6808,13 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "bJJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/science/shuttle) "bJM" = ( @@ -6866,10 +6843,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6915,7 +6892,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/engine, @@ -6927,8 +6904,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "bLA" = ( @@ -6956,13 +6933,13 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/library/lounge) "bMv" = ( @@ -7003,10 +6980,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "bNq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -7023,15 +7000,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "bNA" = ( @@ -7054,10 +7029,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -7102,10 +7077,10 @@ name = "Break Room"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -7121,7 +7096,7 @@ "bOE" = ( /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /obj/machinery/light{ @@ -7146,10 +7121,13 @@ /obj/machinery/light_switch{ pixel_x = -24 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/research) "bOZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -7181,12 +7159,6 @@ name = "Transfer Cell"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -7200,7 +7172,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -7246,7 +7218,7 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -7254,15 +7226,6 @@ /area/engine/engine_room) "bPP" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/bridge) "bPS" = ( @@ -7274,8 +7237,8 @@ /area/ai_monitored/storage/eva) "bPZ" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -7359,19 +7322,13 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "bRc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -7380,7 +7337,7 @@ /turf/open/floor/iron, /area/security/checkpoint) "bRq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -7441,8 +7398,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -7487,13 +7444,13 @@ /turf/open/floor/carpet/green, /area/security/detectives_office) "bSS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "bST" = ( @@ -7530,7 +7487,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -7541,8 +7498,8 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/science) "bTl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -7555,11 +7512,9 @@ /turf/open/floor/iron/dark/side, /area/quartermaster/office) "bTo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/storage/primary) +/area/hallway/secondary/entry) "bTs" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 4 @@ -7585,7 +7540,7 @@ "bTW" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -7600,10 +7555,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_out_T/yellow, /obj/effect/turf_decal/guideline/guideline_mid/purple, /obj/structure/disposalpipe/segment, @@ -7613,10 +7568,10 @@ /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_mid/purple{ @@ -7650,10 +7605,10 @@ /turf/open/floor/iron/white, /area/medical/genetics) "bUp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -7672,12 +7627,6 @@ /turf/open/floor/iron, /area/hallway/primary/port) "bUG" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -7685,6 +7634,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "bUI" = ( @@ -7719,8 +7674,8 @@ /area/science/shuttledock) "bUN" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -7730,10 +7685,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "bVh" = ( @@ -7764,10 +7719,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/red, @@ -7782,7 +7737,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/ameridiner, @@ -7813,7 +7768,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -7862,7 +7817,7 @@ }, /area/engine/atmos) "bWK" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/grid/steel, @@ -7900,8 +7855,6 @@ pixel_x = 32 }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/port) "bXE" = ( @@ -7923,13 +7876,13 @@ /turf/open/floor/iron, /area/hallway/primary/port) "bXK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "bXO" = ( @@ -7967,7 +7920,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -8076,8 +8029,8 @@ /turf/open/floor/grass, /area/hallway/primary/starboard) "caF" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/engine, /area/engine/engine_room) "caZ" = ( @@ -8105,10 +8058,10 @@ /turf/open/floor/engine, /area/science/xenobiology) "cbS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -8130,18 +8083,18 @@ /turf/open/floor/plating, /area/chapel/office) "ccc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 +/obj/effect/turf_decal/trimline/purple/line{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/iron/grid/steel, +/area/science/research) "ccd" = ( /obj/machinery/computer/scan_consolenew{ dir = 8 @@ -8155,10 +8108,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -8197,13 +8150,13 @@ /turf/open/floor/plating, /area/maintenance/aft) "ccQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4 }, /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/science/mixing/chamber) "ccX" = ( /obj/effect/decal/cleanable/dirt, @@ -8231,7 +8184,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -8265,9 +8218,6 @@ /turf/open/floor/plating, /area/hallway/primary/aft) "ceq" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -8275,16 +8225,15 @@ name = "External Airlock"; req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /turf/open/floor/iron/techmaint, /area/maintenance/disposal) "cer" = ( -/turf/open/floor/plating/foam, +/turf/open/floor/plating/foam{ + initial_gas_mix = "TEMP=2.7" + }, /area/space/nearstation) "ceB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -8297,8 +8246,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_mid/darkblue{ dir = 1 }, @@ -8321,10 +8270,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -8337,7 +8286,7 @@ /turf/open/floor/iron, /area/maintenance/port/central) "cfB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -8346,9 +8295,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -8376,13 +8325,13 @@ /turf/open/space/basic, /area/space/nearstation) "cfY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_out/yellow{ @@ -8407,8 +8356,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8426,7 +8375,7 @@ /area/bridge/showroom/corporate) "cgI" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -8464,7 +8413,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -8478,8 +8427,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid, /area/medical/surgery) "chd" = ( @@ -8571,7 +8520,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -8621,6 +8570,12 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/gateway) "ciB" = ( @@ -8630,8 +8585,8 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "ciN" = ( @@ -8666,14 +8621,14 @@ /area/science/shuttle) "cjs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 + dir = 8 }, -/turf/open/floor/iron/sepia, -/area/science/shuttle) +/turf/open/floor/carpet/green, +/area/lawoffice) "cjO" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/shieldwallgen, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/engine, @@ -8698,7 +8653,9 @@ /area/chapel/office) "ckh" = ( /obj/structure/barricade/wooden/crude, -/obj/machinery/door/firedoor/closed, +/obj/machinery/door/firedoor/closed{ + alarm_type = null + }, /turf/open/floor/plating, /area/maintenance/port/central) "ckp" = ( @@ -8710,18 +8667,15 @@ }, /area/hallway/primary/port) "ckF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ckS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -8752,7 +8706,7 @@ /turf/open/floor/wood, /area/library/lounge) "clA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -8775,8 +8729,8 @@ "clW" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Quarters"; req_access_txt = "40" @@ -8790,10 +8744,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "cme" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -8843,10 +8797,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -8864,14 +8818,14 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/barricade/wooden/crude, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -8942,17 +8896,17 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "cof" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/medical/medbay/central) "com" = ( /obj/item/stack/sheet/rglass{ amount = 50 @@ -8971,16 +8925,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"cov" = ( -/turf/open/floor/plating{ - burnt = 1 - }, -/area/space/nearstation) "coA" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -9023,7 +8972,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -9078,16 +9027,17 @@ "cpO" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/start/roboticist, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/science/robotics/lab) "cpS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -9124,7 +9074,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/kitchen_cold_room{ +/obj/machinery/airalarm{ pixel_x = 22; dir = 4 }, @@ -9146,7 +9096,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -9167,7 +9116,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "crl" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /turf/open/floor/iron/ameridiner, @@ -9181,17 +9130,21 @@ /turf/open/floor/iron/techmaint, /area/maintenance/solars/port) "crA" = ( -/obj/structure/girder, -/turf/open/floor/plating{ - burnt = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/space/nearstation) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/turf/open/floor/iron/sepia, +/area/maintenance/department/engine) "crB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/sepia, /area/science/shuttle) "crD" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -9215,8 +9168,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -9234,10 +9187,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -9249,10 +9202,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "crQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -9292,7 +9245,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -9328,7 +9281,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "ctv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -9336,7 +9289,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "ctx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -9371,7 +9324,7 @@ /turf/open/floor/iron/dark, /area/chapel/main) "ctN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -9406,7 +9359,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -9453,16 +9406,14 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, /obj/item/pickaxe, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "cuR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison, @@ -9493,10 +9444,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -9505,7 +9456,7 @@ /turf/open/floor/iron/white, /area/science/lobby) "cvG" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /turf/open/floor/iron, @@ -9515,7 +9466,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/red, @@ -9544,9 +9495,6 @@ /turf/open/floor/iron, /area/medical/break_room) "cwc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/table/wood, /obj/machinery/fax/law, /turf/open/floor/wood, @@ -9610,8 +9558,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "cxh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/white/line, /obj/machinery/door/firedoor, @@ -9654,8 +9602,8 @@ /turf/open/floor/noslip/dark, /area/medical/cryo) "cxI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, @@ -9689,10 +9637,10 @@ /turf/open/floor/iron/ameridiner, /area/medical/genetics) "cyf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -9711,9 +9659,6 @@ /area/engine/atmos) "cyO" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/maintenance/port/fore) "cyQ" = ( @@ -9724,9 +9669,9 @@ name = "Port Bow Solar Access"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port/fore) "cza" = ( @@ -9737,10 +9682,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -9831,11 +9776,11 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -9849,10 +9794,10 @@ /turf/open/floor/carpet, /area/chapel/office) "cAt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -9866,7 +9811,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/machinery/meter, @@ -9878,10 +9823,10 @@ /turf/open/floor/plating, /area/science/shuttle) "cAL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/wood, @@ -9924,9 +9869,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -9937,7 +9882,7 @@ /area/maintenance/disposal) "cBZ" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron/dark/side, @@ -9965,10 +9910,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10004,7 +9949,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/meter, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -10072,11 +10017,18 @@ /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) "cDP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/sepia, -/area/science/shuttle) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "cEi" = ( /obj/effect/turf_decal/trimline/blue/line, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -10148,7 +10100,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "cGf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "cGp" = ( @@ -10162,10 +10114,10 @@ /turf/open/floor/wood, /area/bridge/meeting_room/council) "cGF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -10200,6 +10152,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/medical/break_room) "cHs" = ( @@ -10210,9 +10163,6 @@ pixel_x = 24; pixel_y = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/engine, /area/maintenance/department/engine) "cHt" = ( @@ -10257,6 +10207,20 @@ "cHU" = ( /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) +"cHX" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/aft) "cIg" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -10286,7 +10250,7 @@ pixel_y = 4 }, /obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, @@ -10317,14 +10281,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "cIO" = ( /obj/structure/table/wood, /obj/item/folder, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet, @@ -10346,17 +10310,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/library/lounge) "cIW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -10398,13 +10362,11 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "cJw" = ( @@ -10437,7 +10399,6 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, -/obj/machinery/air_sensor/atmos/sm_core, /turf/open/floor/engine, /area/engine/supermatter) "cKl" = ( @@ -10459,7 +10420,7 @@ /obj/vehicle/ridden/wheelchair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -10471,7 +10432,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -10480,10 +10441,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, @@ -10491,16 +10449,19 @@ pixel_x = 21; pixel_y = -21 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/execution/transfer) "cLe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "cLg" = ( @@ -10550,7 +10511,7 @@ /turf/open/floor/iron/dark, /area/medical/storage) "cLH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -10562,7 +10523,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/prisonspawn, @@ -10581,7 +10542,7 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "cLR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -10598,10 +10559,10 @@ /turf/open/floor/iron/tech, /area/bridge) "cLU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -10624,27 +10585,29 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/medical/virology) "cME" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "cMU" = ( @@ -10674,10 +10637,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -10694,10 +10657,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -10761,8 +10724,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -10814,7 +10777,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/effect/turf_decal/tile/yellow{ @@ -10850,7 +10813,7 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -10870,9 +10833,6 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, @@ -10908,7 +10868,7 @@ /turf/open/floor/iron/checker, /area/quartermaster/storage) "cQb" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron, @@ -10969,12 +10929,6 @@ /turf/open/floor/iron/techmaint, /area/science/nanite) "cQH" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -10987,13 +10941,16 @@ /obj/machinery/status_display/evac{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "cQI" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -11004,10 +10961,10 @@ name = "E.V.A. Storage"; req_access_txt = "18" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -11018,17 +10975,17 @@ /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) "cRo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "cRu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -11036,15 +10993,15 @@ /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "cRz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "cRA" = ( @@ -11076,6 +11033,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/docking/arrival) "cRG" = ( @@ -11162,9 +11120,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, /turf/open/floor/plating, /area/science/shuttle) "cSo" = ( @@ -11193,8 +11148,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -11258,7 +11213,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/spawner/structure/window/plasma/reinforced, @@ -11273,12 +11228,6 @@ /turf/open/floor/iron/techmaint, /area/science/research) "cTp" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -11298,12 +11247,12 @@ /area/hallway/primary/port) "cTE" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 6 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "cTG" = ( @@ -11369,7 +11318,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -11379,7 +11328,6 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "cUB" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -11390,6 +11338,13 @@ /obj/structure/railing/corner{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) "cUG" = ( @@ -11423,10 +11378,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -11435,8 +11390,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "cUR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -11444,6 +11398,7 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "cVg" = ( @@ -11470,8 +11425,8 @@ req_access_txt = "47" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -11489,11 +11444,10 @@ /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) "cVw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "server vent" - }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, /turf/open/floor/iron/techmaint, /area/science/server) "cVB" = ( @@ -11575,34 +11529,34 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) "cWI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, /area/medical/virology) "cWM" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/effect/spawner/structure/window/reinforced/tinted, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/plating, /area/engine/engine_room) "cWP" = ( /obj/effect/turf_decal/trimline/red/filled/warning, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -11705,14 +11659,23 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"cYI" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "cZb" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock{ id_tag = "stallfood"; name = "Food Commissary" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -11748,7 +11711,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -11756,13 +11719,13 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "cZJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_out/yellow{ @@ -11776,8 +11739,8 @@ /turf/open/space/basic, /area/space/nearstation) "cZZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -11792,7 +11755,7 @@ /turf/open/floor/iron/dark, /area/gateway) "dap" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/closed/wall, @@ -11801,7 +11764,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "dat" = ( @@ -11843,6 +11806,12 @@ /obj/item/radio, /turf/open/floor/iron, /area/security/checkpoint/science/research) +"daD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "daH" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 8 @@ -11905,7 +11874,7 @@ /turf/open/floor/iron/dark, /area/bridge) "dcd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -11914,20 +11883,16 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/white, /area/science/lobby) "dcT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -11938,10 +11903,7 @@ "dcZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/tech/grid, @@ -11953,7 +11915,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "ddf" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -11985,7 +11947,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/corner{ dir = 8 }, @@ -11994,10 +11956,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) "ddP" = ( @@ -12026,20 +11993,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "dep" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -12050,8 +12010,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/chapel/office) "deq" = ( @@ -12065,8 +12025,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -12076,12 +12036,12 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "dez" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -12126,10 +12086,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -12154,10 +12114,10 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -12196,8 +12156,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -12211,10 +12171,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -12229,8 +12189,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -12326,10 +12286,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -12342,8 +12302,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/valve/layer2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/valve/digital/on/layer2, /turf/open/floor/iron/techmaint, /area/science/xenobiology) "diI" = ( @@ -12379,10 +12339,10 @@ }, /area/hallway/secondary/exit/departure_lounge) "dju" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -12397,13 +12357,13 @@ /obj/structure/chair/fancy/bench/pew{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/chapel/main) "djK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -12430,8 +12390,8 @@ /area/chapel/office) "djN" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12449,7 +12409,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "dkb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/science/misc_lab) "dkc" = ( @@ -12478,16 +12438,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "dkF" = ( @@ -12502,18 +12456,18 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "dkJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/central) "dkR" = ( @@ -12528,8 +12482,6 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "dkZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12545,7 +12497,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "dls" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -12555,10 +12507,10 @@ /turf/open/floor/iron/grid/steel, /area/quartermaster/exploration_prep) "dlt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -12571,9 +12523,9 @@ name = "AI Antechamber"; req_one_access_txt = "32;19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12596,7 +12548,7 @@ /obj/effect/turf_decal/siding/dark_green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -12605,10 +12557,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -12644,35 +12596,25 @@ /turf/open/floor/grass, /area/medical/storage) "dmD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "dnd" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/iron/sepia, -/area/science/shuttle) +/turf/open/floor/iron, +/area/hallway/primary/fore) "dno" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/checker, -/area/quartermaster/storage) +/turf/open/floor/iron/sepia, +/area/science/shuttle) "dnu" = ( /mob/living/basic/cockroach, /obj/structure/railing/corner{ @@ -12794,11 +12736,11 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "dpE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/bridge/showroom/corporate) "dpH" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/engine{ @@ -12829,7 +12771,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/hallway/primary/starboard) @@ -12863,7 +12805,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -12874,6 +12816,15 @@ dir = 1 }, /area/quartermaster/sorting) +"dqK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "dqS" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 @@ -12887,7 +12838,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "drm" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -12969,7 +12920,7 @@ /turf/closed/wall/r_wall, /area/maintenance/solars/port/aft) "drV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/table, @@ -12985,7 +12936,7 @@ /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) "dsd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line, @@ -13015,15 +12966,15 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "dsL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -13083,8 +13034,8 @@ /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) "dtE" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -13122,7 +13073,12 @@ /turf/open/floor/plating, /area/science/xenobiology) "dtX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "due" = ( @@ -13139,10 +13095,10 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/engine, @@ -13165,7 +13121,7 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/port) "dut" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -13178,7 +13134,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -13209,10 +13165,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -13231,16 +13184,13 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/freezer, /area/medical/surgery) "dvJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -13276,24 +13226,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/lobby) "dws" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/maintenance/port/fore) "dwC" = ( @@ -13316,8 +13258,8 @@ req_access_txt = "12" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/port/fore) "dxl" = ( @@ -13409,7 +13351,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/checkpoint/customs) @@ -13438,8 +13380,8 @@ /obj/machinery/door/airlock/public/glass{ name = "Escape Pod" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -13486,8 +13428,8 @@ req_access_txt = "39" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13517,8 +13459,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/tech, @@ -13535,8 +13477,18 @@ }, /turf/open/floor/grass, /area/hydroponics) +"dBF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/research) "dBI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -13554,10 +13506,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/bridge) "dCe" = ( @@ -13582,8 +13534,8 @@ /turf/open/floor/glass/reinforced, /area/security/main) "dCJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -13599,12 +13551,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/maintenance/port/fore) "dCU" = ( @@ -13628,13 +13574,13 @@ }, /area/hallway/primary/central) "dDr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -13668,10 +13614,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -13694,9 +13640,6 @@ /area/maintenance/port/fore) "dEH" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -13743,10 +13686,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -13799,10 +13742,10 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "dGb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -13822,8 +13765,8 @@ /turf/open/floor/iron/dark, /area/bridge) "dGp" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ + dir = 1 }, /turf/open/floor/vault, /area/science/server) @@ -13832,11 +13775,8 @@ /turf/open/floor/carpet/grimy, /area/chapel/main) "dGu" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/iron/ameridiner, @@ -13860,10 +13800,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -13896,10 +13836,10 @@ /turf/open/floor/iron/techmaint, /area/security/execution/education) "dHi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -13931,9 +13871,7 @@ /obj/effect/turf_decal/stripes/openup{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -13953,11 +13891,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=23-Teleporter"; location = "22-ArrivalEntrance" @@ -14017,10 +13955,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -14060,9 +13998,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/construction) "dIV" = ( @@ -14070,9 +14011,6 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/port/central) "dJj" = ( @@ -14089,7 +14027,6 @@ /obj/machinery/light_switch{ pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light{ dir = 8 }, @@ -14100,8 +14037,8 @@ /turf/open/floor/plating, /area/maintenance/port/central) "dJC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -14151,10 +14088,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -14174,7 +14111,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -14183,8 +14120,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_out_arrow_con/blue{ @@ -14206,14 +14143,17 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "dKx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/dorms) "dKB" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -14267,7 +14207,7 @@ /turf/open/floor/carpet/royalblue, /area/bridge/meeting_room/council) "dLg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -14276,7 +14216,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction{ @@ -14339,7 +14279,7 @@ }, /area/docking/bridge) "dLy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/chair/fancy/comfy{ color = "#666666"; dir = 8 @@ -14359,10 +14299,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -14392,7 +14332,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/quartermaster/storage) "dLP" = ( @@ -14405,10 +14345,10 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dLR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -14427,8 +14367,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "dMr" = ( @@ -14436,10 +14376,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -14488,9 +14428,7 @@ /obj/machinery/light_switch{ pixel_x = -24 }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/drydock) "dNa" = ( /obj/structure/disposalpipe/segment{ @@ -14544,7 +14482,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Engineering Foyer" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -14554,7 +14492,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -14567,10 +14505,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -14648,8 +14586,8 @@ /turf/open/floor/plating, /area/bridge) "dOC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -14665,7 +14603,7 @@ pixel_y = -23 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -14674,7 +14612,7 @@ /turf/open/floor/iron/techmaint, /area/security/execution/education) "dOV" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 5 }, /turf/open/floor/iron/sepia, @@ -14747,10 +14685,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/disposal) @@ -14762,10 +14696,10 @@ /turf/open/floor/iron/dark, /area/library) "dQd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -14777,8 +14711,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -14786,8 +14720,8 @@ /turf/open/floor/plating, /area/vacant_room/commissary/commissaryRandom) "dQs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -14805,10 +14739,10 @@ /turf/open/floor/iron/dark, /area/maintenance/department/security/brig) "dQA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -14924,7 +14858,7 @@ name = "'Law Office RC"; pixel_y = -62 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/start/lawyer, @@ -14937,11 +14871,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "dTf" = ( @@ -15005,13 +14939,16 @@ /area/medical/storage) "dUl" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "dUG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -15035,11 +14972,11 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "dUK" = ( -/obj/structure/lattice, -/turf/open/floor/plating{ - broken = 1 +/obj/machinery/atmospherics/pipe/color_adapter{ + dir = 4 }, -/area/space/nearstation) +/turf/open/floor/iron, +/area/engine/atmos) "dVi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -15106,7 +15043,7 @@ /turf/open/floor/iron/techmaint, /area/security/brig) "dVK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -15116,7 +15053,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "dVN" = ( @@ -15128,14 +15065,16 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "dVO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/trimline/blue/line, +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "dWg" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 @@ -15209,9 +15148,6 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/maintenance/disposal) "dXj" = ( @@ -15269,21 +15205,25 @@ /area/science/breakroom) "dYM" = ( /obj/structure/girder, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "dYU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 9 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/catwalk_floor, -/area/drydock) +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "dZb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -15296,7 +15236,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "dZx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -15332,9 +15272,6 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "eah" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "eal" = ( @@ -15348,7 +15285,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "eap" = ( @@ -15373,10 +15309,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -15392,11 +15328,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) "eaL" = ( @@ -15444,10 +15385,10 @@ pixel_y = 24; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -15469,7 +15410,7 @@ /area/chapel/main) "ebC" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/closed/wall/r_wall, @@ -15492,10 +15433,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -15526,7 +15467,7 @@ /area/medical/medbay/central) "ecs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -15607,10 +15548,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -15628,6 +15569,9 @@ /turf/open/floor/iron/techmaint, /area/engine/engine_room) "edS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "eeg" = ( @@ -15643,13 +15587,13 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -15683,10 +15627,12 @@ /turf/open/floor/iron/grid/steel, /area/science/misc_lab) "eew" = ( -/turf/open/floor/plating{ - burnt = 1 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 8 }, -/area/asteroid/nearstation) +/turf/open/floor/iron, +/area/engine/atmos) "eeW" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet, @@ -15698,12 +15644,7 @@ /area/maintenance/solars/port/aft) "efo" = ( /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/drydock) "efp" = ( /obj/effect/turf_decal/guideline/guideline_out_arrow_con/blue{ @@ -15718,12 +15659,13 @@ /obj/machinery/status_display/ai{ pixel_y = 32 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "efu" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/library/lounge) "efM" = ( @@ -15734,10 +15676,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "egl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -15751,11 +15693,12 @@ "egw" = ( /obj/effect/turf_decal/stripes/full, /obj/effect/turf_decal/stripes/white/full, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/docking/arrival) "egK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -15788,10 +15731,10 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -15818,8 +15761,8 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/science) "ehN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -15832,8 +15775,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/turf_decal/loading_area{ dir = 1 }, @@ -15881,10 +15822,10 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/surgery) "eiN" = ( @@ -15939,7 +15880,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /turf/open/floor/iron/white, @@ -15963,10 +15904,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -16013,7 +15954,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; - filter_type = "n2"; + filter_type = list(/datum/gas/nitrogen); name = "nitrogen filter" }, /obj/structure/cable{ @@ -16039,10 +15980,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -16079,7 +16020,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/vault, @@ -16095,12 +16036,12 @@ /turf/closed/wall, /area/quartermaster/office) "ekV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/corner, @@ -16128,23 +16069,13 @@ "ely" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/light/small, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "elA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -16154,7 +16085,7 @@ /obj/effect/turf_decal/guideline/guideline_in_arrow/red{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -16187,7 +16118,7 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "elQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -16195,7 +16126,7 @@ "emc" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/freezer, @@ -16203,7 +16134,7 @@ "emd" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -16216,17 +16147,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "ems" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16276,10 +16207,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/newscaster{ @@ -16291,10 +16222,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/requests_console{ @@ -16307,20 +16238,20 @@ /turf/open/floor/iron/grid/steel, /area/bridge) "enG" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 4 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "enJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/engineering{ @@ -16330,7 +16261,7 @@ /turf/open/floor/iron/techmaint, /area/storage/tech) "enL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 }, @@ -16340,10 +16271,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -16386,8 +16317,7 @@ /turf/open/floor/wood, /area/library) "eoO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "eoR" = ( @@ -16398,12 +16328,13 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/atmospherics/components/unary/portables_connector, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/mapping_helpers/atmos_auto_connect, /turf/open/floor/vault, /area/science/server) "epc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/requests_console{ department = "Engineering"; name = "Engineering RC"; @@ -16413,7 +16344,7 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "epj" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/tcommsat/computer) @@ -16448,8 +16379,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -16501,10 +16432,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/science/xenobiology) "ere" = ( @@ -16514,7 +16445,7 @@ /turf/open/floor/iron/grid/steel, /area/science/misc_lab) "erf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/stripes/corner, @@ -16527,13 +16458,13 @@ /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "ero" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -16561,10 +16492,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -16582,7 +16513,7 @@ pixel_x = -22 }, /obj/structure/disposalpipe/junction/flip, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/library/lounge) "ese" = ( @@ -16647,10 +16578,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/navbeacon{ @@ -16703,10 +16634,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -16740,6 +16671,16 @@ burnt = 1 }, /area/maintenance/starboard/fore) +"euk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "eum" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -16785,22 +16726,22 @@ /turf/open/floor/vault, /area/crew_quarters/heads/hor) "evg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 6 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "evu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -16820,8 +16761,8 @@ pixel_x = -28; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -16867,11 +16808,11 @@ /turf/open/floor/wood, /area/bridge/meeting_room/council) "ewt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) @@ -16908,7 +16849,7 @@ /area/hallway/primary/port) "exg" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -16968,11 +16909,17 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/crew_quarters/heads/chief) +"exQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "eya" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -17006,17 +16953,14 @@ /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) "eyS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "ezv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/engine{ @@ -17061,13 +17005,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "eAe" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -17092,7 +17036,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/chapel/main) "eAy" = ( @@ -17106,13 +17050,10 @@ /turf/open/floor/iron, /area/quartermaster/office) "eAG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) "eAK" = ( @@ -17186,7 +17127,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -17217,20 +17158,12 @@ "eCe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 26 - }, /obj/machinery/light/small{ dir = 8 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port/aft) "eCp" = ( @@ -17272,13 +17205,13 @@ /obj/effect/turf_decal/trimline/purple/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/yjunction{ @@ -17300,18 +17233,18 @@ /turf/open/floor/iron/dark, /area/bridge) "eCS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/sign/warning/fire{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) "eCV" = ( @@ -17334,8 +17267,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command/glass{ name = "Bridge Dock"; req_access_txt = "19" @@ -17369,7 +17302,7 @@ /turf/open/floor/wood, /area/medical/exam_room) "eDw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -17413,7 +17346,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload_foyer) "eEJ" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "eEO" = ( @@ -17466,7 +17399,7 @@ /turf/open/floor/iron/tiled, /area/medical/virology) "eFD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -17542,7 +17475,7 @@ /turf/open/floor/plating/asteroid, /area/hallway/primary/starboard) "eGz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -17635,14 +17568,15 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/turf_decal/stripes/openup, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "eHl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 9 }, /turf/open/floor/catwalk_floor, /area/drydock/security) @@ -17657,7 +17591,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner, @@ -17667,7 +17601,7 @@ /obj/effect/turf_decal/trimline/purple/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -17705,8 +17639,8 @@ /obj/effect/turf_decal/guideline/guideline_mid_arrow/purple{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -17773,11 +17707,11 @@ /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) "eIC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "eIF" = ( @@ -17787,10 +17721,10 @@ /turf/open/floor/circuit/green, /area/science/xenobiology) "eIS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light, @@ -17812,10 +17746,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -17830,7 +17764,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -17862,7 +17796,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -17878,10 +17812,10 @@ pixel_x = 28; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -17896,7 +17830,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -17912,11 +17846,15 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "eJB" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "eJG" = ( @@ -17956,14 +17894,14 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "eJM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -17996,7 +17934,7 @@ name = "Xenobiology"; req_access_txt = "55" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18028,7 +17966,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -18049,7 +17987,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "eKv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ @@ -18065,7 +18003,7 @@ icon_state = "4-8" }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/item/storage/fancy/donut_box, @@ -18074,6 +18012,18 @@ }, /turf/open/floor/carpet/royalblue, /area/bridge/meeting_room/council) +"eKL" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/disposalpipe/segment, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/aft) "eKW" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair{ @@ -18085,24 +18035,19 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "eLh" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/area/medical/surgery) +/turf/open/floor/iron, +/area/storage/primary) "eLi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -18121,10 +18066,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -18137,7 +18082,7 @@ /area/bridge/meeting_room/council) "eLu" = ( /obj/effect/landmark/start/chief_engineer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/chair/office{ dir = 8 }, @@ -18188,8 +18133,8 @@ /turf/open/floor/iron/grid/steel, /area/bridge) "eMq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -18216,9 +18161,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "eMO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18227,13 +18169,14 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/apothecary) "eMQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/grid/steel, @@ -18260,8 +18203,8 @@ name = "Virology Ward"; req_access_txt = "39" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; @@ -18292,7 +18235,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/main) "eNv" = ( @@ -18305,10 +18248,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18321,31 +18264,39 @@ /obj/machinery/door/airlock/external{ name = "Shuttle Construction Yard" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "eNH" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/library/lounge) "eNJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "eNM" = ( @@ -18355,10 +18306,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -18388,10 +18339,10 @@ /turf/open/floor/iron/dark, /area/hydroponics) "eNY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -18471,10 +18422,10 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "ePt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "ePI" = ( @@ -18497,7 +18448,7 @@ /turf/open/floor/iron/dark, /area/bridge) "ePR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine{ @@ -18579,10 +18530,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/red, @@ -18607,10 +18558,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -18659,8 +18610,8 @@ /turf/open/floor/iron/dark, /area/medical/break_room) "eRv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -18720,10 +18671,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/red{ @@ -18739,7 +18690,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -18769,9 +18720,6 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "eSr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -18789,15 +18737,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating{ burnt = 1 }, @@ -18809,7 +18757,7 @@ /obj/effect/turf_decal/trimline/red/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -18828,10 +18776,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "eTn" = ( @@ -18873,7 +18821,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -18884,10 +18832,10 @@ /turf/open/floor/iron/dark, /area/engine/storage) "eUd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18896,10 +18844,10 @@ /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) "eUi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18947,10 +18895,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 }, @@ -18988,7 +18936,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light, @@ -19000,20 +18948,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, /area/security/prison) "eVd" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -19030,16 +18978,16 @@ /turf/open/floor/plating/asteroid, /area/library/lounge) "eVk" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, -/obj/machinery/meter/atmos/atmos_waste_loop, +/obj/machinery/meter/monitored/waste_loop, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/engine/atmos) "eVl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/item/radio/intercom{ @@ -19058,6 +19006,9 @@ /obj/effect/turf_decal/siding/dark/corner{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "eVs" = ( @@ -19074,10 +19025,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/machinery/light/small, /obj/structure/sign/poster/official/ian{ pixel_y = -32 @@ -19085,23 +19036,23 @@ /turf/open/floor/iron/grid/steel, /area/bridge) "eVx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, /turf/open/floor/iron/grid/steel, /area/bridge) "eVB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -19114,7 +19065,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; req_access_txt = "10; 13" @@ -19154,15 +19104,21 @@ }, /area/hallway/primary/central) "eWj" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/machinery/door/poddoor/shutters/preopen{ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/lobby) "eWG" = ( @@ -19172,10 +19128,7 @@ /turf/open/floor/iron/dark, /area/bridge) "eWS" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -19188,6 +19141,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "eXd" = ( @@ -19317,16 +19273,16 @@ /turf/open/space, /area/solar/port) "eXX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/office) "eYj" = ( @@ -19334,7 +19290,7 @@ /turf/open/floor/plating, /area/crew_quarters/kitchen) "eYk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload_foyer) "eYn" = ( @@ -19345,7 +19301,7 @@ /area/ai_monitored/turret_protected/ai_upload_foyer) "eYA" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -19405,7 +19361,7 @@ /area/hallway/primary/port) "eYZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/disposal) "eZi" = ( @@ -19417,7 +19373,7 @@ /turf/open/floor/iron, /area/hydroponics) "eZj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -19445,7 +19401,7 @@ /turf/open/floor/iron, /area/maintenance/aft) "eZs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/openup{ @@ -19479,18 +19435,18 @@ }, /area/hallway/secondary/exit/departure_lounge) "fan" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "faC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -19535,7 +19491,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/status_display/evac{ @@ -19547,10 +19503,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/start/station_engineer, @@ -19571,7 +19527,6 @@ /turf/open/floor/iron/techmaint, /area/science/lobby) "fbF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -19596,10 +19551,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -19636,7 +19591,7 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/port/aft) "fcM" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -19650,10 +19605,10 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -19678,7 +19633,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/red, @@ -19751,7 +19706,7 @@ /turf/closed/wall/r_wall, /area/drydock/security) "fej" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark/side, @@ -19788,10 +19743,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/engine, @@ -19850,10 +19805,10 @@ /area/hallway/primary/port) "fgk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + dir = 1 }, -/turf/open/floor/iron/dark, -/area/science/robotics/mechbay) +/turf/open/floor/wood, +/area/library) "fgp" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -19905,7 +19860,7 @@ pixel_x = 8; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -19921,7 +19876,7 @@ pixel_x = -24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -19942,8 +19897,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -20000,26 +19955,26 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) "fiF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "fiI" = ( @@ -20037,10 +19992,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -20058,6 +20013,7 @@ id = "toxinsdriver"; name = "Toxins Launcher Bay Door" }, +/obj/structure/fans/tiny, /turf/open/floor/iron/techmaint, /area/science/misc_lab) "fji" = ( @@ -20106,7 +20062,6 @@ icon_state = "map-right-fland"; pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -20117,10 +20072,10 @@ /turf/open/floor/plating, /area/storage/art) "fkn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -20156,9 +20111,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/drydock) "fkH" = ( /obj/effect/turf_decal/siding/wood{ @@ -20192,10 +20145,10 @@ name = "Infirmary" }, /obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -20213,8 +20166,8 @@ /obj/effect/turf_decal/guideline/guideline_mid/darkblue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -20224,7 +20177,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "flh" = ( @@ -20245,10 +20198,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -20264,13 +20217,22 @@ /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) "flq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/circuit, -/area/ai_monitored/turret_protected/ai_upload) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/secondary/entry) "flr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -20339,8 +20301,8 @@ /area/maintenance/aft/secondary) "fmE" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library) "fmU" = ( @@ -20362,10 +20324,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -20385,8 +20347,6 @@ /area/chapel/main) "fnO" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/external{ name = "External Airlock"; req_one_access_txt = "13;24;10" @@ -20416,7 +20376,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/flip{ @@ -20485,7 +20445,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/exit/departure_lounge) "foB" = ( @@ -20501,7 +20461,7 @@ /turf/open/floor/iron, /area/security/checkpoint/escape) "foD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 1 }, /turf/open/floor/engine/air/light, @@ -20601,16 +20561,13 @@ /area/security/prison) "fpA" = ( /obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -20643,6 +20600,16 @@ /obj/structure/bookcase/random/religion, /turf/open/floor/wood, /area/library) +"fqk" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "fql" = ( /turf/open/floor/iron/dark/side, /area/quartermaster/warehouse) @@ -20666,10 +20633,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -20744,7 +20711,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -20787,18 +20754,18 @@ /turf/closed/wall/r_wall, /area/security/prison/shielded) "fsh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/security/checkpoint/medical) "fsj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -20812,7 +20779,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -20829,8 +20796,8 @@ /turf/open/floor/engine, /area/engine/supermatter) "fsF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -20859,7 +20826,7 @@ dir = 4; name = "Unfiltered & Air to Mix" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -20870,8 +20837,8 @@ /turf/open/floor/plating, /area/maintenance/port/central) "fsO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/warning, @@ -20897,8 +20864,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -20962,12 +20929,12 @@ }, /obj/effect/turf_decal/siding/wideplating/dark, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) "ftI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -20977,6 +20944,9 @@ pixel_x = 21; pixel_y = 22 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ftR" = ( @@ -20994,9 +20964,6 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "fud" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 @@ -21022,19 +20989,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /obj/machinery/light/small, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port) "fut" = ( @@ -21098,13 +21056,13 @@ /turf/open/floor/wood, /area/bridge/meeting_room/council) "fuW" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; req_one_access_txt = "10;24;5" }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) "fuX" = ( @@ -21190,15 +21148,15 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/port/central) "fvT" = ( @@ -21224,13 +21182,12 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/quartermaster/miningdock) "fwa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/maintenance/disposal) +/obj/machinery/atmospherics/components/tank/air, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "fwb" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -21252,14 +21209,14 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room/council) "fwQ" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/engine/light, /area/medical/cryo) "fwV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -21286,12 +21243,15 @@ /turf/open/floor/iron/techmaint, /area/maintenance/aft/secondary) "fxw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "fxA" = ( @@ -21314,10 +21274,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/airalarm/directional/south{ @@ -21340,10 +21300,10 @@ /area/ai_monitored/turret_protected/ai_upload) "fys" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -21363,7 +21323,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -21440,7 +21400,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -21456,10 +21416,10 @@ }, /area/maintenance/disposal) "fAj" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -21468,14 +21428,14 @@ /turf/open/floor/iron/grid/steel, /area/engine/atmos) "fAu" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_out_arrow/blue{ @@ -21520,10 +21480,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/cmo) "fBb" = ( @@ -21549,6 +21511,17 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/customs) +"fBr" = ( +/obj/effect/turf_decal/stripes/full, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/secondary/entry) "fBt" = ( /obj/structure/rack, /obj/item/stack/sheet/cardboard, @@ -21572,10 +21545,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -21626,7 +21599,7 @@ }, /area/bridge) "fCd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -21635,10 +21608,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "fCp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -21658,19 +21631,24 @@ /turf/open/floor/iron, /area/hallway/primary/port) "fCG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/secondary/entry) "fCM" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid, @@ -21684,8 +21662,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -21790,10 +21768,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -21814,10 +21792,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -21851,10 +21829,10 @@ /obj/item/storage/secure/safe{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/camera/directional/east{ @@ -21903,9 +21881,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) @@ -21925,7 +21903,7 @@ /turf/closed/wall/mineral/plastitanium, /area/hallway/secondary/entry) "fFv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -21938,7 +21916,7 @@ /turf/open/floor/iron, /area/security/checkpoint) "fFG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -21969,7 +21947,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 1 }, /turf/open/floor/iron/ameridiner, @@ -21978,10 +21956,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "fGg" = ( @@ -21997,18 +21980,9 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "fGs" = ( @@ -22020,8 +21994,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "fGE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, @@ -22035,10 +22009,10 @@ name = "Experimentation Lab"; req_access_txt = "7" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -22061,7 +22035,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/wood, @@ -22096,12 +22070,16 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "fHa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai_upload) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "fHh" = ( /obj/structure/sign/painting/library{ pixel_x = 32 @@ -22115,13 +22093,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/wood, /area/library/lounge) "fHr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -22130,7 +22105,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -22144,6 +22119,12 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "fHQ" = ( @@ -22179,7 +22160,6 @@ pixel_x = -24; pixel_y = -8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) "fIp" = ( @@ -22229,10 +22209,10 @@ /turf/open/floor/circuit/green, /area/science/xenobiology) "fIY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -22289,10 +22269,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "fJx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -22350,8 +22330,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -22370,7 +22350,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/light/small{ dir = 4 @@ -22379,12 +22359,12 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "fKT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) "fKU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron/ameridiner, @@ -22454,10 +22434,10 @@ /area/crew_quarters/heads/hos) "fLC" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/box, @@ -22540,7 +22520,7 @@ /turf/open/floor/grass, /area/ai_monitored/turret_protected/ai) "fLK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -22584,11 +22564,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -22604,8 +22584,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/box, @@ -22645,8 +22625,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -22686,8 +22666,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "fND" = ( @@ -22704,13 +22684,6 @@ /area/ai_monitored/turret_protected/ai_upload_foyer) "fOb" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 - }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "fOg" = ( @@ -22779,13 +22752,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) "fON" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -22901,8 +22874,8 @@ /turf/open/floor/iron/techmaint, /area/maintenance/disposal) "fQe" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -22924,10 +22897,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "fQy" = ( @@ -22946,10 +22919,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/red, @@ -22958,7 +22931,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -22991,16 +22964,13 @@ /turf/open/floor/iron/dark, /area/security/brig) "fRG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "fRU" = ( @@ -23092,17 +23062,17 @@ /area/maintenance/starboard/aft) "fTo" = ( /obj/effect/landmark/start/chief_medical_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "fTA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -23130,7 +23100,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -23174,10 +23144,10 @@ /turf/open/floor/grass/no_border, /area/ai_monitored/security/armory) "fUw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "fUA" = ( @@ -23218,10 +23188,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -23245,7 +23215,7 @@ /area/science/lab) "fUT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/chapel/main) "fVa" = ( @@ -23269,12 +23239,12 @@ /obj/machinery/meter{ name = "Mixed Air Tank In" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "fVq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -23283,7 +23253,7 @@ /turf/open/floor/iron/dark, /area/medical/surgery) "fVs" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -23370,7 +23340,7 @@ /turf/open/floor/carpet/royalblue, /area/bridge/meeting_room/council) "fXg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/airalarm/directional/west{ @@ -23387,7 +23357,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light/small, @@ -23397,7 +23367,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -23407,14 +23377,14 @@ /area/maintenance/department/engine) "fXt" = ( /obj/effect/turf_decal/trimline/brown/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -23435,8 +23405,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/wood, @@ -23467,10 +23437,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -23494,8 +23464,8 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "fYw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -23551,7 +23521,7 @@ /turf/open/floor/iron, /area/security/checkpoint/escape) "fYU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -23564,8 +23534,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron, /area/security/checkpoint/escape) @@ -23628,13 +23598,9 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "fZL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -23642,6 +23608,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/tech/grid, /area/science/mixing/chamber) "gab" = ( @@ -23685,7 +23655,7 @@ }, /area/engine/atmos) "gag" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/firealarm/directional/south, @@ -23695,7 +23665,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "gam" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/science/robotics/mechbay) "gan" = ( @@ -23748,10 +23718,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "gbz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -23765,8 +23735,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/department/engine) "gbD" = ( @@ -23852,9 +23822,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -23864,16 +23831,9 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/quartermaster/storage) "gda" = ( @@ -23887,11 +23847,11 @@ /turf/open/floor/iron, /area/hallway/primary/central) "gdg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -23929,10 +23889,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -24000,7 +23960,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/newscaster{ pixel_x = -28; pixel_y = 1 @@ -24049,14 +24009,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/airlock/engineering{ name = "Port Solar Access"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -24170,8 +24130,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/central) "ghC" = ( @@ -24183,8 +24143,8 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "ghF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24297,7 +24257,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "giF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -24364,17 +24324,17 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/entry) "gjr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "gjH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -24432,8 +24392,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -24449,8 +24409,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -24474,11 +24434,11 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "gkE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/turf/open/floor/iron/techmaint, +/area/medical/morgue) "gkH" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -24534,7 +24494,6 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "glF" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -24546,6 +24505,12 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "gmj" = ( @@ -24582,7 +24547,7 @@ /turf/open/floor/iron/grid/steel, /area/medical/genetics) "gmD" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron, @@ -24591,8 +24556,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -24607,10 +24572,10 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science) "gnj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -24631,11 +24596,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/light/small{ dir = 8 }, @@ -24695,10 +24655,10 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "gnX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -24710,10 +24670,10 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "goz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -24762,13 +24722,13 @@ pixel_y = -28 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -24781,9 +24741,6 @@ /area/hallway/primary/central) "gpd" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24793,6 +24750,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "gpt" = ( @@ -24828,10 +24786,10 @@ /obj/effect/turf_decal/trimline/red/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -24841,20 +24799,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4; - name = "manual inlet valve" - }, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) "gpZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -24872,7 +24826,7 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "gqc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -24905,8 +24859,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24915,7 +24869,7 @@ "grl" = ( /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/plating/airless{ @@ -24926,19 +24880,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, /area/tcommsat/computer) "grO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/item/folder/blue{ @@ -24999,10 +24953,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -25037,10 +24991,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -25067,7 +25021,7 @@ /area/maintenance/department/medical) "gsE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/brown{ @@ -25116,10 +25070,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "gta" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -25129,8 +25083,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -25156,10 +25110,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -25180,7 +25134,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /turf/open/floor/iron/ameridiner, @@ -25189,7 +25143,7 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25200,8 +25154,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/science/xenobiology) @@ -25221,15 +25175,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/port) "guS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -25268,13 +25220,13 @@ /turf/open/floor/plating, /area/maintenance/port/central) "gvi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -25302,7 +25254,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -25314,18 +25266,15 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "gvX" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25341,10 +25290,10 @@ /turf/open/floor/iron/techmaint, /area/engine/storage_shared) "gwz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25364,14 +25313,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "gwS" = ( @@ -25407,8 +25356,8 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "gxl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -25420,7 +25369,7 @@ name = "Emergency Medical Lockdown Shutters" }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25432,6 +25381,9 @@ /obj/effect/turf_decal/stripes/red/end{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) "gxt" = ( @@ -25452,7 +25404,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "gxK" = ( @@ -25460,10 +25412,10 @@ name = "Chief Engineer's Office"; req_access_txt = "56" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25531,8 +25483,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, @@ -25550,10 +25502,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library/lounge) @@ -25565,8 +25517,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "gzI" = ( @@ -25576,11 +25526,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port/central) @@ -25618,9 +25568,10 @@ /area/maintenance/disposal) "gzZ" = ( /obj/structure/table/reinforced, -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/camera/directional/north{ c_tag = "Atmospherics - Turbines"; @@ -25632,14 +25583,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -25665,10 +25616,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25688,10 +25639,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -25700,18 +25651,15 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/port) "gAI" = ( @@ -25744,8 +25692,8 @@ }, /area/ai_monitored/storage/eva) "gBh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25771,12 +25719,6 @@ name = "Labour Shuttle Airlock"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/bridge) "gBu" = ( @@ -25825,8 +25767,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -25843,10 +25785,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -25896,13 +25838,13 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "gCJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/red, @@ -25913,10 +25855,10 @@ /turf/open/floor/engine, /area/security/nuke_storage) "gCU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25929,9 +25871,7 @@ /area/science/mixing) "gDc" = ( /obj/structure/lattice/catwalk/over, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "gDi" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -26066,16 +26006,19 @@ "gET" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/siding/dark/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "gFf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -26092,8 +26035,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -26116,7 +26059,7 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26137,9 +26080,14 @@ /turf/open/floor/iron, /area/maintenance/aft) "gGr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 5 + }, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "gGz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -26191,13 +26139,16 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/checker, /area/quartermaster/storage) "gHH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -26226,13 +26177,13 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -26256,8 +26207,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -26271,14 +26222,14 @@ name = "AI Upload"; req_access_txt = "16" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -26322,8 +26273,8 @@ /turf/open/floor/plating, /area/security/checkpoint/escape) "gIS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -26352,8 +26303,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -26367,7 +26318,7 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "gJx" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -26393,8 +26344,8 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "gJY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26431,7 +26382,7 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "gKw" = ( @@ -26444,8 +26395,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -26463,10 +26414,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "gKH" = ( @@ -26480,10 +26431,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "gKT" = ( @@ -26549,7 +26500,7 @@ /obj/structure/sign/warning/radiation{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26599,10 +26550,10 @@ /turf/open/floor/iron/techmaint, /area/maintenance/disposal/incinerator) "gLS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26622,13 +26573,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -26647,11 +26598,11 @@ name = "AI Core Access" }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -26681,13 +26632,13 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) "gNg" = ( @@ -26709,15 +26660,15 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "gNn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "gNp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26729,20 +26680,20 @@ /turf/open/floor/iron/techmaint, /area/bridge) "gNs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /mob/living/simple_animal/bot/cleanbot, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "gNw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/circuit, @@ -26760,10 +26711,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "gNZ" = ( @@ -26776,10 +26732,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -26815,10 +26771,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -26839,7 +26795,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "gOG" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/requests_console{ @@ -26898,19 +26854,13 @@ /obj/effect/turf_decal/stripes/openup{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, /turf/open/floor/iron/checker, /area/quartermaster/storage) "gPH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 8 }, /turf/open/floor/engine/co2/light, @@ -26936,18 +26886,18 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "gQm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "gQn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -26959,7 +26909,7 @@ name = "Turbine Generator Access"; req_one_access_txt = "24;10" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) @@ -27017,10 +26967,10 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "gRh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -27035,12 +26985,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 9 + }, /turf/open/floor/vault, /area/science/server) "gRq" = ( @@ -27050,10 +27003,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27096,10 +27049,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -27115,10 +27068,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -27140,14 +27093,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "gSS" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/iron/white, +/area/medical/apothecary) "gSV" = ( /obj/item/storage/box/papersack{ icon_state = "paperbag_NanotrasenStandard_closed" @@ -27176,11 +27134,11 @@ "gSY" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; req_one_access_txt = "10;24;5" }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/aft) "gTm" = ( @@ -27208,10 +27166,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -27232,10 +27190,10 @@ /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) "gTS" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/light{ dir = 4 }, @@ -27324,7 +27282,7 @@ /turf/open/floor/plating, /area/science/xenobiology) "gVe" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -27332,11 +27290,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -27351,7 +27309,7 @@ /turf/open/floor/iron/grid/steel, /area/library) "gVp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -27370,7 +27328,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "gVw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -27383,7 +27341,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner, @@ -27397,10 +27355,10 @@ /obj/machinery/computer/security/telescreen/minisat{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -27434,7 +27392,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine, @@ -27501,6 +27459,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "gXs" = ( @@ -27536,10 +27497,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -27583,8 +27544,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/central) "gYE" = ( @@ -27595,7 +27556,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "gYG" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) @@ -27608,10 +27569,10 @@ name = "Security Maintenance"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -27660,8 +27621,8 @@ /turf/open/floor/iron, /area/hallway/primary/port) "gZr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -27726,7 +27687,7 @@ anchored = 1; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -27739,8 +27700,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/cmo) "hao" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 @@ -27748,6 +27708,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/tiled/light, /area/medical/virology) "hap" = ( @@ -27766,8 +27729,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "haF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "haP" = ( @@ -27792,7 +27755,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/item/radio/intercom{ @@ -27814,7 +27777,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "hbD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -27823,7 +27786,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -27835,9 +27798,6 @@ }, /area/maintenance/port/aft) "hcf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -27861,7 +27821,6 @@ /obj/machinery/door/airlock/external{ name = "Main Docking Port" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/maintenance/port) "hcD" = ( @@ -27872,13 +27831,13 @@ /turf/open/floor/iron/techmaint, /area/security/prison/shielded) "hcG" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /turf/open/floor/iron, /area/engine/atmos) "hcI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -27914,10 +27873,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -27946,11 +27905,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/hallway/secondary/entry) "hdZ" = ( @@ -27968,8 +27927,7 @@ /area/maintenance/department/medical) "hes" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, @@ -28029,8 +27987,8 @@ /area/hallway/primary/central) "hfo" = ( /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, /turf/open/floor/iron/tech/grid, /area/science/mixing/chamber) "hfx" = ( @@ -28063,7 +28021,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -28125,8 +28083,8 @@ /turf/closed/wall, /area/maintenance/department/engine) "hgG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -28161,10 +28119,10 @@ /turf/open/floor/noslip/standard, /area/crew_quarters/heads/captain/private) "hho" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28186,7 +28144,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -28199,7 +28157,7 @@ pixel_x = 26; pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -28208,10 +28166,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "hin" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -28257,10 +28215,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -28280,7 +28238,6 @@ name = "Labour Shuttle Airlock"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/science/shuttle) "hiQ" = ( @@ -28319,7 +28276,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/medical/glass{ name = "Apothecary"; @@ -28367,11 +28324,18 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "hjw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ dir = 8 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/grid/steel, +/area/science/research) "hjx" = ( /obj/machinery/door/poddoor/preopen{ id = "maint2" @@ -28399,7 +28363,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -28469,7 +28433,7 @@ /area/ai_monitored/turret_protected/ai) "hlq" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -28498,10 +28462,10 @@ }, /area/docking/arrival) "hlJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28540,10 +28504,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -28562,29 +28526,27 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/maintenance/port) "hlZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/checker, /area/quartermaster/storage) "hmf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai_upload) +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/science/lobby) "hmj" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 @@ -28595,10 +28557,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -28647,17 +28609,28 @@ /area/ai_monitored/turret_protected/ai) "hnt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/library/lounge) +"hnI" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/grid/steel, +/area/crew_quarters/dorms) "hoi" = ( /turf/open/floor/engine/plasma/light, /area/engine/atmos) "hop" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28692,10 +28665,10 @@ /area/science/research) "hoD" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron/sepia, @@ -28707,7 +28680,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/ameridiner, @@ -28720,10 +28693,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -28774,9 +28747,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/shaft_miner, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) @@ -28786,8 +28756,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "hqg" = ( @@ -28809,14 +28779,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 9 }, /obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -28847,8 +28817,8 @@ req_access_txt = "37" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/library) "hrD" = ( @@ -28872,6 +28842,9 @@ /obj/effect/turf_decal/guideline/guideline_out/blue{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -28884,8 +28857,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/bridge) "hss" = ( @@ -28921,7 +28894,7 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "hsH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -28944,7 +28917,9 @@ /area/security/warden) "hsU" = ( /obj/structure/barricade/wooden/crude, -/obj/machinery/door/firedoor/closed, +/obj/machinery/door/firedoor/closed{ + alarm_type = null + }, /turf/open/floor/plating{ burnt = 1 }, @@ -29012,11 +28987,11 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "huM" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ +/obj/machinery/computer/atmos_control/oxygen_tank{ dir = 1 }, /turf/open/floor/iron/dark, @@ -29041,10 +29016,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -29057,15 +29032,13 @@ "hvt" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/drydock/security) "hvz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_mid_arrow/purple{ @@ -29083,20 +29056,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/central) "hvC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -29136,7 +29109,7 @@ /turf/open/floor/iron/techmaint, /area/engine/storage_shared) "hwj" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/light/small{ @@ -29161,8 +29134,8 @@ /turf/open/floor/iron/cafeteria, /area/storage/art) "hwz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -29226,19 +29199,19 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "hxK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, /area/maintenance/port/fore) "hxS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "hxY" = ( @@ -29263,7 +29236,7 @@ /turf/open/floor/iron/checker, /area/quartermaster/storage) "hyl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -29273,7 +29246,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -29293,10 +29266,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -29335,10 +29308,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "hzp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -29354,7 +29327,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "hzJ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Port to Turbine" @@ -29363,7 +29336,7 @@ /area/engine/atmos) "hzM" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/engine/storage) "hzR" = ( @@ -29386,8 +29359,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/stairs/medium, /area/hallway/primary/central) "hzW" = ( @@ -29417,7 +29390,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/engine/light, /area/medical/cryo) "hAf" = ( @@ -29448,31 +29421,34 @@ /turf/open/floor/plating, /area/maintenance/port/central) "hBa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/turf/open/floor/iron, -/area/maintenance/disposal) +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/port) "hBg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/science/shuttle) "hBh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -29487,17 +29463,14 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "hBv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/turf/open/floor/iron/checker, -/area/quartermaster/storage) +/turf/open/floor/iron, +/area/science/robotics/lab) "hBC" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -29512,10 +29485,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -29539,8 +29512,8 @@ /turf/open/floor/carpet, /area/hallway/primary/starboard) "hBY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -29582,7 +29555,7 @@ /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "hCP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -29617,9 +29590,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "hDl" = ( @@ -29658,11 +29631,17 @@ /turf/open/floor/iron/cafeteria, /area/vacant_room/commissary/commissaryFood) "hDG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "hDI" = ( /turf/open/floor/iron/dark/side{ dir = 6 @@ -29699,8 +29678,8 @@ /area/tcommsat/computer) "hEl" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -29718,31 +29697,27 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "hEL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "hEO" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/plating, /area/engine/atmos) "hEQ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "hEW" = ( @@ -29763,7 +29738,7 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -29794,6 +29769,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "hFH" = ( @@ -29827,14 +29805,14 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "hFQ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) "hFR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/blue, @@ -29860,10 +29838,10 @@ "hGw" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -29883,7 +29861,7 @@ /area/science/shuttledock) "hGE" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/atmos) "hGI" = ( @@ -29948,8 +29926,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, @@ -29984,7 +29962,7 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/item/radio/intercom{ @@ -30017,7 +29995,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "hIw" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 9 }, /turf/open/floor/iron, @@ -30052,10 +30030,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -30113,7 +30091,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -30171,7 +30148,7 @@ /turf/open/floor/plating, /area/bridge) "hJK" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -30196,7 +30173,7 @@ /turf/open/floor/iron/dark, /area/bridge) "hKg" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /turf/open/floor/iron/ameridiner, @@ -30285,10 +30262,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -30315,8 +30292,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -30343,10 +30320,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -30366,10 +30343,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "hLA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -30381,10 +30358,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "hLC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -30418,7 +30395,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/grid, @@ -30483,13 +30460,20 @@ /turf/open/floor/iron/dark, /area/medical/cryo) "hMs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/chapel/main) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "hMt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/iron/dark/side{ @@ -30500,20 +30484,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/engine/light, /area/medical/cryo) "hMF" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Atmos to Gas" + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "hMI" = ( @@ -30558,7 +30543,7 @@ /area/science/nanite) "hMQ" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /obj/structure/cable/orange{ @@ -30576,8 +30561,8 @@ req_access_txt = "3" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -30640,10 +30625,10 @@ /turf/open/floor/iron, /area/maintenance/disposal) "hOE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -30680,22 +30665,22 @@ c_tag = "Science - Toxins Mixing Lab Burn Chamber"; name = "science camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "hPh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning, @@ -30728,10 +30713,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -30769,7 +30754,7 @@ /turf/open/floor/grass, /area/hydroponics/garden) "hQM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -30787,10 +30772,10 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "hRv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -30816,8 +30801,8 @@ /turf/open/floor/carpet/grimy, /area/maintenance/department/security/brig) "hRK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30853,7 +30838,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "hSa" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /obj/structure/cable/yellow{ @@ -30888,9 +30873,7 @@ /turf/open/floor/wood, /area/library) "hSG" = ( -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating/airless, /area/space) "hSO" = ( /obj/effect/turf_decal/stripes/line{ @@ -30954,12 +30937,25 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) +"hUc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/port/central) "hUd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, @@ -30969,9 +30965,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -30979,7 +30972,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/ameridiner, @@ -30992,10 +30985,10 @@ }, /area/maintenance/starboard/fore) "hUw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "hUy" = ( @@ -31011,7 +31004,7 @@ dir = 1; name = "Port Mix to Engine" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -31035,10 +31028,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -31071,9 +31064,6 @@ /obj/machinery/newscaster{ pixel_y = 31 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -31115,23 +31105,23 @@ /turf/open/floor/iron/dark, /area/hallway/primary/fore) "hVN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/ai_monitored/storage/eva) "hVT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_out/yellow{ @@ -31141,12 +31131,18 @@ /turf/open/floor/iron, /area/hallway/primary/central) "hWb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/chair/fancy/sofa/old/right{ dir = 1 }, /turf/open/floor/iron, /area/crew_quarters/locker) +"hWc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/storage/primary) "hWh" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -31187,10 +31183,10 @@ /turf/open/floor/plating, /area/engine/storage) "hWJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -31206,10 +31202,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -31229,9 +31225,6 @@ /area/construction) "hXw" = ( /obj/structure/easel, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/disposal) "hXx" = ( @@ -31247,7 +31240,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/ameridiner, @@ -31281,7 +31274,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/ameridiner, @@ -31290,7 +31283,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 1; - filter_type = "n2"; + filter_type = list(/datum/gas/nitrogen); name = "nitrogen filter" }, /turf/open/floor/iron/ameridiner, @@ -31347,10 +31340,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -31390,15 +31383,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "hZI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -31419,8 +31412,8 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/customs) "hZN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -31430,7 +31423,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -31439,10 +31432,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "hZQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31466,8 +31459,6 @@ /obj/machinery/door/airlock/external{ name = "Labour Shuttle Airlock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "iac" = ( @@ -31475,10 +31466,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31499,10 +31490,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -31514,9 +31505,6 @@ /turf/open/floor/iron/dark, /area/science/breakroom) "iay" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 }, @@ -31567,11 +31555,11 @@ /turf/open/floor/catwalk_floor, /area/drydock) "ibj" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "ibl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -31644,17 +31632,20 @@ /turf/open/floor/iron, /area/quartermaster/sorting) "ibU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/iron/sepia, +/turf/open/floor/iron/grid/steel, /area/science/shuttle) "icd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -31742,7 +31733,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "icX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -31792,17 +31783,17 @@ /area/maintenance/department/medical) "ieb" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "ieB" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -31811,10 +31802,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "ieC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -31823,6 +31811,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "ieF" = ( @@ -31839,10 +31830,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral{ @@ -31893,7 +31884,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -31914,7 +31905,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "ifq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/openup{ @@ -31924,7 +31915,7 @@ /area/ai_monitored/turret_protected/ai) "ifR" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -31971,7 +31962,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/lattice/catwalk/over, @@ -31991,7 +31982,7 @@ /area/quartermaster/storage) "igW" = ( /obj/effect/turf_decal/bot, -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /turf/open/floor/iron/dark, /area/engine/atmos) "iho" = ( @@ -32049,9 +32040,15 @@ /turf/open/floor/plating, /area/maintenance/disposal) "iir" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "iis" = ( @@ -32077,13 +32074,13 @@ }, /area/quartermaster/office) "iiR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -32110,7 +32107,6 @@ dir = 4 }, /obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/techmaint, /area/medical/morgue) "ijw" = ( @@ -32132,14 +32128,14 @@ /turf/open/floor/wood, /area/security/detectives_office) "ijV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "ijY" = ( /obj/effect/landmark/start/botanist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, @@ -32147,17 +32143,14 @@ /turf/open/floor/iron, /area/hydroponics) "ikr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/maintenance/department/science) "ikz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -32183,7 +32176,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/genetics) @@ -32208,12 +32201,12 @@ /turf/open/floor/iron/white, /area/medical/surgery) "ilA" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 6 - }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 6 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "ilC" = ( @@ -32223,16 +32216,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/red, /area/library) "ilR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 1 }, @@ -32251,8 +32244,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -32264,12 +32257,12 @@ /turf/open/floor/iron/dark, /area/medical/storage) "imx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "imz" = ( @@ -32280,10 +32273,10 @@ /turf/open/floor/plating, /area/science/xenobiology) "imE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -32317,8 +32310,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 1 }, @@ -32341,8 +32334,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "inh" = ( @@ -32386,7 +32379,7 @@ /area/hallway/primary/starboard) "inB" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -32426,7 +32419,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/prison, @@ -32487,11 +32480,17 @@ /turf/open/floor/plating, /area/maintenance/port/central) "ioV" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, /obj/structure/railing{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/iron/stairs/right{ dir = 1 }, @@ -32524,7 +32523,7 @@ }, /obj/machinery/stasis, /obj/machinery/light, -/turf/open/floor/iron/dark/airless, +/turf/open/floor/iron/dark, /area/medical/surgery) "ipl" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -32562,7 +32561,7 @@ /turf/open/floor/plating/asteroid, /area/hallway/primary/starboard) "ipQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/table/wood/fancy/blue, /obj/machinery/recharger, /obj/item/book/manual/wiki/sopservice, @@ -32604,8 +32603,8 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "iqp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32643,8 +32642,8 @@ /turf/open/floor/iron/techmaint, /area/science/nanite) "iqP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, @@ -32669,12 +32668,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/construction) "irb" = ( @@ -32682,10 +32681,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -32708,7 +32707,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/ameridiner, @@ -32746,7 +32745,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/yellow{ @@ -32776,8 +32775,8 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32810,11 +32809,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -32823,11 +32822,17 @@ /turf/open/floor/iron/techmaint, /area/ai_monitored/turret_protected/ai) "isv" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, /obj/structure/railing{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/stairs/left{ dir = 1 }, @@ -32852,7 +32857,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "itf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -32860,7 +32865,7 @@ /area/engine/engine_room) "ito" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/landmark/start/detective, @@ -32916,19 +32921,19 @@ /obj/machinery/door/airlock/public/glass{ name = "Library" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, /area/library) "iue" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -32940,11 +32945,11 @@ /turf/open/floor/plating, /area/maintenance/aft) "iug" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/flip{ @@ -32968,10 +32973,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -32997,8 +33002,8 @@ name = "Library Junction"; sortType = 16 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -33020,10 +33025,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -33040,13 +33045,13 @@ name = "Xenobiology Kill Room"; req_access_txt = "55" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/iron/ridged/steel, /area/science/xenobiology) "iuP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -33054,7 +33059,7 @@ }, /area/crew_quarters/locker) "iuQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -33076,10 +33081,10 @@ /area/chapel/main) "iuV" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -33108,7 +33113,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -33119,10 +33124,10 @@ pixel_x = -26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -33137,12 +33142,15 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "ivB" = ( @@ -33161,10 +33169,10 @@ "ivG" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -33176,7 +33184,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "ivI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -33190,10 +33198,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -33216,7 +33224,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron, @@ -33272,7 +33280,7 @@ /turf/open/floor/plating, /area/science/shuttle) "ixq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -33285,8 +33293,8 @@ /turf/open/floor/iron, /area/engine/atmos) "ixw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -33294,8 +33302,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -33307,10 +33315,10 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -33322,10 +33330,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "ixO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33337,7 +33345,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/storage) "iyc" = ( @@ -33399,10 +33407,10 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "iys" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/guideline/guideline_mid/purple{ dir = 4 @@ -33435,9 +33443,9 @@ name = "AI Maintenance Chamber"; req_one_access_txt = "32;19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -33464,9 +33472,6 @@ name = "External Docking Port"; req_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/maintenance/department/science) "iyX" = ( @@ -33476,17 +33481,17 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/surgery) "izc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -33502,10 +33507,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -33519,11 +33524,11 @@ /turf/open/floor/wood, /area/hallway/primary/aft) "izK" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/ameridiner, @@ -33550,8 +33555,8 @@ /turf/open/floor/iron/dark, /area/storage/tech) "izY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -33621,18 +33626,20 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/science/robotics/lab) "iBQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) "iBX" = ( @@ -33708,10 +33715,10 @@ /turf/open/floor/iron/sepia, /area/construction/mining/aux_base) "iDi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -33750,11 +33757,21 @@ /area/medical/medbay/lobby) "iDq" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/engine/atmos) +"iDr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "iDA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -33766,6 +33783,9 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/checker, /area/quartermaster/storage) "iDI" = ( @@ -33843,10 +33863,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -33866,7 +33886,7 @@ }, /area/ai_monitored/turret_protected/ai) "iEQ" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air/light, /area/engine/atmos) "iES" = ( @@ -33876,7 +33896,6 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "iEU" = ( @@ -33913,10 +33932,10 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/auxiliary) "iFz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -33925,7 +33944,10 @@ /turf/open/floor/iron/sepia, /area/construction/mining/aux_base) "iFN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "iFO" = ( @@ -33951,10 +33973,10 @@ }, /area/maintenance/department/security/brig) "iFY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -33966,7 +33988,7 @@ }, /area/hallway/secondary/service) "iGe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -34005,9 +34027,6 @@ /area/hallway/primary/central) "iGI" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -34017,8 +34036,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/escape) "iGM" = ( @@ -34045,10 +34064,10 @@ /area/crew_quarters/heads/chief) "iHe" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -34081,10 +34100,10 @@ /turf/open/floor/plating, /area/maintenance/department/science) "iHv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -34100,7 +34119,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -34193,18 +34212,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/medical/surgery) "iIK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -34214,6 +34227,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "iIR" = ( @@ -34226,7 +34242,7 @@ /turf/open/floor/iron, /area/hydroponics) "iIU" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2/light, /area/engine/atmos) "iIX" = ( @@ -34266,7 +34282,7 @@ /area/engine/atmos) "iJt" = ( /obj/effect/turf_decal/stripes/red/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light/small{ dir = 4 }, @@ -34286,7 +34302,7 @@ "iJB" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment, @@ -34307,7 +34323,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/wood, /area/library) @@ -34398,7 +34413,7 @@ /turf/open/floor/iron/grid/steel, /area/science/lab) "iKM" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/iron/ameridiner, @@ -34414,9 +34429,6 @@ /obj/structure/sink/kitchen{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -34468,7 +34480,7 @@ /area/crew_quarters/heads/captain/private) "iMp" = ( /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -34508,15 +34520,9 @@ /turf/open/floor/iron/techmaint, /area/security/main) "iNo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "iNs" = ( @@ -34539,10 +34545,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -34552,10 +34558,6 @@ /area/medical/medbay/lobby) "iNF" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "iNJ" = ( @@ -34641,14 +34643,15 @@ /turf/open/floor/carpet/green, /area/security/detectives_office) "iON" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "iOW" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -34681,8 +34684,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34720,10 +34723,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -34738,6 +34741,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/carpet/green, /area/lawoffice) "iPJ" = ( @@ -34775,15 +34781,15 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/disposal) "iQn" = ( @@ -34823,10 +34829,10 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "iQL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -34844,8 +34850,8 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "iQM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -34869,8 +34875,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "iQY" = ( @@ -34893,15 +34899,15 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "iSd" = ( @@ -34916,13 +34922,13 @@ /area/ai_monitored/storage/eva) "iSh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -34957,8 +34963,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -35046,7 +35052,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -35054,9 +35060,6 @@ /turf/open/floor/iron, /area/security/checkpoint/science/research) "iTF" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -35080,6 +35083,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "iUe" = ( @@ -35087,10 +35091,10 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -35119,13 +35123,23 @@ /obj/effect/loot_jobscale/armoury/laser_gun, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"iUs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai_upload) "iUx" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, @@ -35148,7 +35162,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/ameridiner, @@ -35231,6 +35245,15 @@ }, /turf/open/floor/iron/vaporwave, /area/crew_quarters/heads/hor) +"iWy" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/sepia, +/area/maintenance/department/engine) "iWH" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /obj/machinery/button/door{ @@ -35250,10 +35273,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -35261,8 +35284,8 @@ /turf/open/floor/iron, /area/hallway/primary/port) "iXf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -35317,10 +35340,10 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/port/fore) "iYl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -35372,13 +35395,13 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "iYY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) @@ -35386,10 +35409,10 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -35449,10 +35472,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /mob/living/simple_animal/pet/dog/corgi/Ian, @@ -35465,8 +35488,8 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "jah" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -35509,11 +35532,13 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "jbe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/storage) "jbn" = ( @@ -35545,15 +35570,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"jbT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "jbY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35574,18 +35590,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/vault, /area/crew_quarters/heads/hor) "jcm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) @@ -35602,10 +35618,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -35732,11 +35748,11 @@ /area/security/nuke_storage) "jdS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "jef" = ( @@ -35781,13 +35797,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -35854,7 +35870,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Gambling Den" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/crew_quarters/bar/atrium) "jgA" = ( @@ -35886,10 +35902,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -35901,14 +35917,17 @@ /turf/open/floor/plating, /area/maintenance/port/central) "jhg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 }, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/iron/checker, -/area/quartermaster/storage) +/turf/open/floor/iron/grid/steel, +/area/science/lobby) "jhj" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -35926,15 +35945,15 @@ }, /area/docking/bridge) "jhn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/explab) "jhs" = ( @@ -35944,14 +35963,17 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/catwalk_floor, +/obj/structure/lattice/catwalk/over, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, /area/docking/bridge) "jhy" = ( /obj/machinery/status_display/evac, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "jhB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -36010,6 +36032,9 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "jjd" = ( @@ -36029,20 +36054,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) "jjj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -36129,10 +36154,10 @@ name = "Toxins Lab Shutters" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -36247,6 +36272,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet, /area/hallway/secondary/entry) "jky" = ( @@ -36279,10 +36307,10 @@ /area/library) "jlz" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -36401,8 +36429,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/iron, /area/hallway/secondary/entry) "jnD" = ( @@ -36427,7 +36453,7 @@ /turf/open/floor/plating, /area/security/brig) "joa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; @@ -36470,7 +36496,7 @@ /turf/open/floor/iron/dark, /area/hydroponics) "jot" = ( -/obj/machinery/air_sensor/atmos/mix_tank, +/obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/vacuum/light, /area/engine/atmos) "joE" = ( @@ -36479,13 +36505,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "joP" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -36544,8 +36570,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -36582,9 +36608,6 @@ /obj/effect/turf_decal/siding/wideplating_new/corner{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/sign/poster/official/obey{ pixel_y = -32 }, @@ -36600,12 +36623,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "jqc" = ( @@ -36629,15 +36646,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/science/lab) "jrk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/engine/storage) "jrn" = ( @@ -36659,16 +36676,16 @@ /turf/open/floor/iron/dark, /area/storage/tech) "jrC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "jrF" = ( @@ -36679,8 +36696,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -36690,7 +36707,7 @@ /area/bridge) "jrR" = ( /obj/effect/landmark/start/depsec/science, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair/office{ @@ -36705,8 +36722,8 @@ /turf/closed/wall, /area/tcommsat/computer) "jrY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/obj/machinery/meter/atmos/atmos_waste_loop, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, +/obj/machinery/meter/monitored/waste_loop, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -36715,8 +36732,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -36729,10 +36746,6 @@ /obj/item/multitool{ pixel_x = 3 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, /obj/structure/lattice/catwalk/over, /obj/machinery/light/small{ dir = 1 @@ -36743,7 +36756,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -36783,14 +36796,14 @@ /turf/open/floor/plating, /area/science/shuttle) "jtK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/item/radio/intercom{ pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/engine, @@ -36805,12 +36818,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/exit/departure_lounge) "juY" = ( @@ -36928,8 +36935,8 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -36989,10 +36996,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -37053,13 +37060,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/carpet, /area/hallway/secondary/entry) @@ -37087,17 +37094,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) "jzj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -37164,14 +37171,11 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "jAj" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/catwalk_floor, -/area/drydock) +/turf/open/floor/iron/dark, +/area/quartermaster/storage) "jAt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37179,9 +37183,6 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) "jAv" = ( @@ -37197,10 +37198,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -37216,7 +37217,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -37226,8 +37227,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -37241,7 +37242,7 @@ /turf/open/floor/plating, /area/vacant_room/commissary/commissaryRandom) "jAW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -37249,10 +37250,10 @@ }, /area/hallway/primary/aft) "jAX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -37287,25 +37288,19 @@ /turf/open/floor/iron, /area/hydroponics) "jBE" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ +/obj/effect/turf_decal/guideline/guideline_in/bar{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/science/lobby) -"jBG" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/guideline/guideline_mid/darkblue{ + dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 +/obj/effect/turf_decal/guideline/guideline_out/blue{ + dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) +"jBG" = ( /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) "jBQ" = ( @@ -37334,19 +37329,13 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) "jCi" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "jCn" = ( @@ -37357,7 +37346,7 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -37385,10 +37374,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "jDs" = ( @@ -37415,7 +37404,7 @@ /turf/open/floor/iron/grid/steel, /area/science/lab) "jDw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "jDD" = ( @@ -37440,11 +37429,11 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron/tech/grid, /area/maintenance/department/engine) @@ -37480,8 +37469,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/iron/dark/side{ @@ -37515,10 +37504,10 @@ /turf/open/floor/iron, /area/hydroponics) "jEp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -37551,8 +37540,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -37561,7 +37550,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Arrivals Dock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -37571,6 +37560,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "jFf" = ( @@ -37659,7 +37651,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -37679,15 +37671,13 @@ /turf/open/floor/iron/dark, /area/hydroponics) "jGZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -37705,13 +37695,13 @@ }, /area/docking/arrival) "jHk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) "jHm" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 }, /turf/open/floor/iron, @@ -37762,17 +37752,15 @@ /area/hallway/primary/port) "jHA" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "jHH" = ( @@ -37782,15 +37770,12 @@ /obj/machinery/door/airlock/external{ name = "Shuttle Construction Yard" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "jHR" = ( @@ -37896,7 +37881,7 @@ /area/security/main) "jIP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/plasma{ +/obj/machinery/atmospherics/components/tank/plasma{ dir = 1 }, /obj/effect/turf_decal/delivery, @@ -37932,12 +37917,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port) "jJy" = ( @@ -37955,7 +37934,7 @@ pixel_x = 24; pixel_y = -6 }, -/obj/machinery/computer/atmos_control/tank/toxins_mixing_tank{ +/obj/machinery/computer/atmos_control/toxinsmix{ dir = 8 }, /obj/machinery/light{ @@ -37968,10 +37947,10 @@ dir = 8 }, /turf/open/floor/iron/techmaint, -/area/science/mixing/chamber) +/area/science/mixing) "jJI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -38000,7 +37979,7 @@ /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "jKi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -38027,8 +38006,8 @@ req_access_txt = "12" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38075,19 +38054,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "jLt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -38125,7 +38104,7 @@ }, /area/hallway/primary/fore) "jLQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -38150,29 +38129,21 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, /turf/open/floor/grass/no_border, /area/security/brig) "jME" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "jMJ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/science/misc_lab/range) -"jMU" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/medical/break_room) "jMW" = ( /obj/machinery/power/smes{ charge = 5e+006 @@ -38180,12 +38151,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/drydock/security) "jNa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -38225,13 +38194,13 @@ /turf/open/floor/grass, /area/hydroponics) "jNU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/carpet, /area/chapel/main) "jOb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -38283,8 +38252,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -38300,13 +38269,13 @@ /obj/machinery/door/airlock/external{ name = "Main Docking Port" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "jOy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_mid/darkblue{ @@ -38332,8 +38301,8 @@ }, /area/hallway/primary/central) "jOA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -38350,18 +38319,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/railing{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port) "jOJ" = ( @@ -38381,7 +38350,6 @@ name = "Labour Shuttle Airlock"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/security/execution/transfer) "jPk" = ( @@ -38415,8 +38383,8 @@ req_one_access_txt = "31;48" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -38430,8 +38398,8 @@ /turf/open/floor/carpet/grimy, /area/vacant_room/office) "jPw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -38459,10 +38427,10 @@ /turf/open/floor/iron/dark, /area/bridge) "jPN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -38486,7 +38454,7 @@ /area/security/checkpoint/engineering) "jPV" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -38496,17 +38464,16 @@ name = "Server Room"; req_access_txt = "61" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -38518,10 +38485,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/engine{ @@ -38539,7 +38506,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -38551,10 +38518,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -38563,7 +38530,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "jQk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -38572,8 +38539,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -38601,11 +38568,11 @@ }, /area/maintenance/department/engine) "jQN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -38614,7 +38581,7 @@ /area/hallway/primary/starboard) "jQO" = ( /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) "jQP" = ( @@ -38635,13 +38602,13 @@ /turf/open/floor/plating, /area/maintenance/port) "jRe" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "jRk" = ( @@ -38652,7 +38619,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -38680,9 +38647,6 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -38707,10 +38671,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -38744,7 +38708,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -38766,17 +38730,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/office) "jTj" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -38788,8 +38752,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/engine/atmos) "jTp" = ( /obj/machinery/airalarm/directional/north{ @@ -38810,13 +38773,13 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -38839,7 +38802,7 @@ /turf/open/floor/plating, /area/maintenance/disposal) "jTO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/sepia, @@ -38865,10 +38828,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -38900,15 +38860,15 @@ /turf/open/floor/plating/airless, /area/science/test_area) "jUL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "jVg" = ( @@ -38940,21 +38900,21 @@ /turf/open/floor/iron/techmaint, /area/maintenance/aft) "jVH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "jVL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -38969,8 +38929,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) @@ -38988,8 +38948,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -39007,7 +38967,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/fore) "jWm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -39030,17 +38990,9 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "jWM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -26; - pixel_y = 2 - }, /turf/open/floor/iron/techmaint, /area/security/execution/transfer) "jWN" = ( @@ -39053,7 +39005,6 @@ /obj/machinery/door/airlock/external{ name = "Labour Shuttle Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/security/execution/transfer) "jWO" = ( @@ -39091,7 +39042,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/sign/map/left{ desc = "A framed outdated, yet detailed picture of the station. there's even the permanent prison wing in the bottom left!"; icon_state = "map-left-fland"; @@ -39143,10 +39093,10 @@ /area/hallway/secondary/exit/departure_lounge) "jYj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -39165,10 +39115,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -39176,8 +39126,6 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "jYl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -39199,12 +39147,6 @@ /obj/effect/turf_decal/stripes/red/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "jYA" = ( @@ -39221,9 +39163,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "jYD" = ( @@ -39256,8 +39195,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/stairs/medium{ dir = 1 @@ -39284,8 +39223,8 @@ }, /area/hallway/secondary/exit/departure_lounge) "jZa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -39311,18 +39250,12 @@ /obj/machinery/computer/nanite_cloud_controller, /turf/open/floor/iron/techmaint, /area/science/nanite) -"jZt" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/turf/closed/wall, -/area/maintenance/solars/starboard/fore) "jZw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "jZL" = ( @@ -39385,8 +39318,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/security/checkpoint/medical) "kaA" = ( @@ -39483,10 +39416,7 @@ /area/hallway/primary/starboard) "kbM" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/tech/grid, @@ -39515,10 +39445,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction{ @@ -39555,7 +39485,7 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/light_switch{ @@ -39622,23 +39552,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "kdD" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -39652,7 +39582,7 @@ name = "old sink"; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -39667,8 +39597,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -39682,9 +39612,6 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "kdX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/structure/closet/crate, /obj/item/stack/cable_coil{ pixel_x = 3; @@ -39708,8 +39635,8 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "ker" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -39727,10 +39654,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -39762,7 +39689,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -39900,10 +39827,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -39940,10 +39867,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -39964,8 +39891,8 @@ /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "khq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -40008,10 +39935,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -40020,10 +39947,10 @@ /turf/closed/wall/r_wall, /area/hallway/primary/starboard) "kib" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -40039,10 +39966,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "kie" = ( @@ -40125,11 +40052,12 @@ /turf/open/floor/iron/dark, /area/chapel/office) "kja" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/library) "kjg" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -40153,12 +40081,12 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/newscaster{ pixel_y = -28 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kjK" = ( @@ -40182,10 +40110,10 @@ /turf/open/floor/plating, /area/security/checkpoint/escape) "kkr" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "kkv" = ( @@ -40195,17 +40123,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "kkw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -40259,7 +40187,7 @@ /area/construction) "klv" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -40316,8 +40244,6 @@ /area/engine/atmos) "kmx" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4, /obj/machinery/light/small{ dir = 4 }, @@ -40339,10 +40265,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -40395,11 +40321,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -40460,8 +40382,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/grid, @@ -40483,12 +40405,6 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "kqb" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/exit/departure_lounge) "kqe" = ( @@ -40527,7 +40443,7 @@ id = "armoryaccess"; name = "Armory Shutter" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -40541,7 +40457,7 @@ /turf/open/floor/iron/grid/steel, /area/science/nanite) "kqF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -40687,10 +40603,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -40713,7 +40629,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -40735,7 +40651,7 @@ /turf/open/floor/engine, /area/maintenance/department/engine) "ksc" = ( -/obj/machinery/atmospherics/components/unary/tank/plasma{ +/obj/machinery/atmospherics/components/tank/plasma{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -40745,7 +40661,7 @@ "kss" = ( /obj/effect/landmark/event_spawn, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/engine_room) "ksx" = ( @@ -40782,7 +40698,7 @@ /turf/open/floor/iron/sepia, /area/science/shuttle) "ksX" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/machinery/meter, @@ -40808,11 +40724,15 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/engine/engine_room) +"ktq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "ktr" = ( /obj/structure/chair{ dir = 1 @@ -40862,7 +40782,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -40939,10 +40859,10 @@ location = "Bar"; name = "navigation beacon (Bar)" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41006,7 +40926,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -41043,7 +40963,7 @@ /obj/item/clothing/suit/toggle/lawyer, /obj/item/clothing/under/costume/maid, /obj/item/clothing/head/costume/kitty, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/item/clothing/gloves/maid, @@ -41063,8 +40983,8 @@ /obj/machinery/door/window{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissaryFood) "kwf" = ( @@ -41077,16 +40997,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "kwm" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -41107,7 +41024,7 @@ pixel_x = -1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41151,12 +41068,12 @@ }, /area/maintenance/starboard/fore) "kwW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -41263,8 +41180,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -41282,10 +41199,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/glass{ @@ -41304,6 +41221,18 @@ }, /turf/open/floor/iron, /area/hydroponics) +"kye" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "kyh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/kirbyplants/random, @@ -41336,13 +41265,13 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/quartermaster/miningdock) "kyS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -41420,7 +41349,7 @@ /turf/open/floor/iron/ridged/steel, /area/medical/break_room) "kzY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -41430,13 +41359,13 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "kAa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/chair/fancy/comfy{ @@ -41476,13 +41405,12 @@ /turf/open/floor/iron, /area/security/courtroom) "kAN" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /turf/open/floor/iron/dark, /area/science/xenobiology) "kAO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/library) "kAT" = ( @@ -41510,13 +41438,18 @@ /turf/open/floor/iron, /area/security/courtroom) "kBm" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/grid/steel, /area/science/lobby) "kBu" = ( @@ -41531,7 +41464,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -41542,7 +41475,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) "kBC" = ( @@ -41566,7 +41499,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "kBX" = ( @@ -41576,8 +41509,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, @@ -41601,7 +41534,7 @@ name = "Law Office Maintenance"; req_access_txt = "38" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/lawoffice) @@ -41683,7 +41616,7 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41696,7 +41629,7 @@ /turf/closed/wall/rust, /area/space/nearstation) "kDz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -41724,8 +41657,8 @@ "kDQ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -41748,11 +41681,11 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "kEg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -41771,7 +41704,7 @@ /turf/open/floor/iron/techmaint, /area/medical/medbay/central) "kEr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating{ @@ -41786,7 +41719,7 @@ /obj/effect/turf_decal/siding/wideplating_new/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -41796,7 +41729,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kEM" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -41818,8 +41751,8 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "kFq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -41849,7 +41782,7 @@ /area/hydroponics) "kFJ" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron, @@ -41884,16 +41817,13 @@ dir = 8 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/exit/departure_lounge) "kFY" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -41910,6 +41840,16 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"kGs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/research) "kGz" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/decal/cleanable/dirt, @@ -41951,21 +41891,7 @@ }, /turf/open/floor/iron/techmaint, /area/construction) -"kGX" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/exit/departure_lounge) "kHj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -42003,7 +41929,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -42075,7 +42001,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "kIy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -42093,7 +42019,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "kIB" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/railing/corner{ dir = 8 @@ -42101,26 +42026,26 @@ /obj/structure/railing/corner{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "kIC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Departure Lounge Airlock" - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 }, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/exit/departure_lounge) +/obj/structure/cable/yellow, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/central) "kIE" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/white/line, @@ -42223,7 +42148,7 @@ /area/security/main) "kKL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -42246,7 +42171,7 @@ /turf/open/floor/iron/white, /area/security/main) "kKQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -42322,14 +42247,19 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "kMH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "kMI" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/closed/wall/r_wall, @@ -42345,10 +42275,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -42369,10 +42299,10 @@ name = "Security Post - Medical"; req_one_access_txt = "1;40" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -42381,7 +42311,7 @@ /turf/open/floor/iron/grid/steel, /area/security/checkpoint/medical) "kNh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/rnd/production/techfab/department/service, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 @@ -42422,10 +42352,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/red{ @@ -42471,6 +42401,7 @@ /obj/structure/cable/orange{ dir = 1 }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/drydock/security) "kOu" = ( @@ -42481,15 +42412,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) "kPc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42512,10 +42443,10 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "kPg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -42560,7 +42491,7 @@ /obj/structure/sign/warning/electricshock{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/security/nuke_storage) @@ -42578,11 +42509,15 @@ /turf/open/floor/iron/dark, /area/chapel/main) "kPS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kQd" = ( @@ -42592,13 +42527,11 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kQw" = ( @@ -42645,8 +42578,8 @@ req_one_access_txt = "1;56" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/security/checkpoint/engineering) @@ -42665,7 +42598,7 @@ /area/vacant_room/office) "kRD" = ( /mob/living/basic/cockroach, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -42702,7 +42635,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -42719,10 +42652,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -42872,10 +42805,10 @@ /turf/open/floor/iron/dark, /area/engine/storage_shared) "kUm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/window/brigdoor{ @@ -42983,7 +42916,7 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -42998,8 +42931,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -43096,10 +43029,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/engine{ @@ -43127,8 +43060,8 @@ dir = 4 }, /obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -43171,12 +43104,12 @@ name = "Storage Room"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/maintenance/aft) "kWE" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/engine/light, @@ -43188,7 +43121,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -43218,8 +43151,8 @@ /turf/closed/wall/r_wall, /area/hallway/secondary/entry) "kWV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/spawner/structure/window/reinforced/tinted, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/engine_room) "kWW" = ( @@ -43253,10 +43186,10 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/prison, @@ -43289,7 +43222,7 @@ /obj/item/clothing/glasses/meson/engine/tray, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -43327,17 +43260,17 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/tcommsat/computer) "kXM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43373,8 +43306,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43384,8 +43317,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) @@ -43456,10 +43389,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "kYn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -43486,7 +43419,7 @@ /turf/open/floor/plating/airless, /area/solar/starboard/fore) "kYR" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -43504,10 +43437,10 @@ /turf/open/floor/plating/airless, /area/solar/starboard/fore) "kZd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -43561,7 +43494,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -43592,10 +43525,10 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "kZX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -43607,13 +43540,13 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "kZZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -43622,10 +43555,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "lae" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron, /area/engine/atmos) "laz" = ( @@ -43684,10 +43617,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -43709,8 +43642,8 @@ name = "Mech Bay"; req_access_txt = "29" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43726,7 +43659,7 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "lbn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "lbq" = ( @@ -43777,11 +43710,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -43800,11 +43733,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -26; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/light/small{ dir = 4 }, @@ -43812,7 +43740,6 @@ /area/hallway/secondary/entry) "lcG" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/toy/plush/moth/firewatch, /obj/machinery/camera/directional/east, /turf/open/floor/iron/dark/side{ @@ -43820,17 +43747,17 @@ }, /area/ai_monitored/storage/eva) "lcJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) "lcS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -43974,10 +43901,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -43987,7 +43914,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/door/firedoor, @@ -44032,9 +43959,6 @@ }, /area/quartermaster/warehouse) "lfJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/bed/roller, /obj/item/radio/intercom{ pixel_x = 28 @@ -44081,7 +44005,7 @@ /turf/open/floor/iron/grid/steel, /area/science/lobby) "lge" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron, @@ -44094,16 +44018,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "lgl" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 8 }, /turf/open/floor/engine/plasma/light, @@ -44195,10 +44119,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -44218,8 +44142,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side{ dir = 1 @@ -44241,10 +44165,10 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -44293,8 +44217,8 @@ /obj/machinery/door/airlock/public/glass{ name = "Departures Lounge" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/exit/departure_lounge) "lil" = ( @@ -44377,10 +44301,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -44389,17 +44313,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/lobby) "liP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai_upload) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/science/research) "liX" = ( /obj/item/radio/intercom{ pixel_y = 24 @@ -44470,21 +44400,14 @@ }, /turf/open/floor/iron/dark, /area/medical/storage) -"ljI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/port/central) "ljJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "ljK" = ( @@ -44533,7 +44456,7 @@ /turf/open/floor/iron/techmaint, /area/science/misc_lab) "lkt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_out/yellow{ @@ -44550,15 +44473,15 @@ }, /area/hallway/primary/central) "lkw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, /area/security/courtroom) "lkB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/lootdrop/grille_or_trash, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -44567,7 +44490,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "lkH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/landmark/xeno_spawn, @@ -44659,13 +44582,13 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "llz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44681,14 +44604,14 @@ /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/grid/steel, /area/science/research) "llU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -44709,8 +44632,8 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/chapel/main) "lmq" = ( @@ -44755,8 +44678,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "lmO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -44767,30 +44690,15 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/vault, /area/crew_quarters/heads/hor) -"lni" = ( -/obj/effect/turf_decal/caution/stand_clear{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/quartermaster/storage) "lnk" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark, @@ -44799,16 +44707,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, /area/maintenance/port/central) "lnS" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /turf/open/floor/iron/dark, @@ -44877,7 +44785,7 @@ /turf/open/floor/iron/grid/steel, /area/medical/genetics) "lor" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "loG" = ( @@ -44896,8 +44804,8 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "loY" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_mid/purple{ @@ -44947,6 +44855,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "lpz" = ( @@ -44990,10 +44901,10 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "lqg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45016,24 +44927,27 @@ /turf/open/floor/iron/techmaint, /area/bridge) "lqi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/turf/open/floor/circuit, -/area/ai_monitored/turret_protected/ai_upload) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "lqp" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lqv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/camera/directional/north{ @@ -45050,12 +44964,12 @@ /turf/closed/wall, /area/construction/mining/aux_base) "lqN" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, -/obj/machinery/meter, -/turf/open/floor/iron/grid/steel, -/area/engine/atmos) +/turf/open/floor/plating/airless, +/area/maintenance/disposal/incinerator) "lqQ" = ( /obj/machinery/aug_manipulator, /obj/effect/turf_decal/bot, @@ -45129,10 +45043,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -45153,8 +45067,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "lrT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45165,10 +45079,10 @@ /turf/open/floor/plating, /area/maintenance/port) "lsa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/trimline/green/filled/warning, @@ -45181,10 +45095,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -45217,15 +45131,15 @@ /turf/open/floor/iron, /area/hallway/primary/port) "lsC" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/cryo) "lsK" = ( /obj/effect/turf_decal/bot, -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /turf/open/floor/iron/dark, /area/engine/atmos) "lsL" = ( @@ -45233,7 +45147,6 @@ /turf/closed/wall, /area/crew_quarters/bar) "lsO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = 24 @@ -45249,7 +45162,7 @@ /turf/open/floor/engine/n2o/light, /area/engine/atmos) "lte" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45264,8 +45177,8 @@ name = "Kitchen"; req_access_txt = "28" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -45282,7 +45195,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lts" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45298,9 +45211,6 @@ "ltM" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/disposal) "ltQ" = ( @@ -45310,10 +45220,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45342,7 +45252,7 @@ /turf/open/floor/plating/rust, /area/maintenance/aft) "luh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -45363,9 +45273,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "luw" = ( @@ -45434,8 +45344,8 @@ /turf/open/floor/iron/dark, /area/bridge) "lvk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -45470,15 +45380,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"lvB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "lvR" = ( /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 @@ -45677,10 +45578,10 @@ /turf/open/floor/iron/grid, /area/medical/virology) "lxJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -45696,9 +45597,6 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "lxN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/light/small{ dir = 4 }, @@ -45737,20 +45635,6 @@ broken = 1 }, /area/maintenance/aft) -"lyq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 26 - }, -/turf/open/floor/iron/techmaint, -/area/security/execution/transfer) "lyM" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -45811,7 +45695,7 @@ /turf/open/floor/iron/techmaint, /area/engine/atmos) "lzF" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -45822,18 +45706,23 @@ /area/asteroid/nearstation) "lzY" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "lAj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "lAv" = ( @@ -45898,10 +45787,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -45936,7 +45825,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/security/brig) "lCl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -45994,10 +45883,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -46021,24 +45910,14 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library) "lDv" = ( -/obj/effect/turf_decal/guideline/guideline_in/red{ - dir = 8 - }, -/obj/effect/turf_decal/guideline/guideline_mid/darkblue{ - dir = 8 - }, -/obj/effect/turf_decal/guideline/guideline_out/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/turf/open/floor/iron/dark, +/area/hallway/secondary/entry) "lDy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46046,8 +45925,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/guideline/guideline_out_arrow/yellow{ dir = 1 @@ -46055,13 +45934,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"lDE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/department/medical) "lDG" = ( /obj/structure/table, /turf/open/floor/iron, @@ -46103,7 +45975,7 @@ /area/ai_monitored/security/armory) "lET" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -46179,20 +46051,18 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/security/flip{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "lGe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "lGr" = ( @@ -46207,7 +46077,7 @@ id = "mixwindows"; name = "Toxin Mix Chamber Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/spawner/structure/window/plasma/reinforced, @@ -46227,7 +46097,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -46239,10 +46109,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/shuttledock) "lHa" = ( @@ -46267,12 +46137,16 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "lHw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/disposal) +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/port) "lHz" = ( /obj/machinery/light, /obj/item/kirbyplants/random, @@ -46309,9 +46183,9 @@ /area/quartermaster/warehouse) "lIb" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 5 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -46320,16 +46194,13 @@ /obj/machinery/light_switch{ pixel_y = -24 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/security/courtroom) "lIn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -46381,8 +46252,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) @@ -46401,10 +46272,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -46423,7 +46294,7 @@ /obj/structure/sign/painting/library{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/camera/directional/north, @@ -46431,7 +46302,7 @@ /area/library/lounge) "lJJ" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/hallway/primary/starboard) @@ -46445,13 +46316,12 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lJR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "lKq" = ( @@ -46462,16 +46332,19 @@ c_tag = "Library - Entrance"; name = "library camera" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/library/lounge) "lKu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -46485,7 +46358,7 @@ /turf/closed/wall, /area/crew_quarters/heads/hor) "lKC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -46496,7 +46369,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -46530,9 +46403,6 @@ /obj/machinery/door/airlock/external{ name = "Labour Shuttle Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/bridge) "lKT" = ( @@ -46572,10 +46442,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/port) "lMd" = ( @@ -46595,10 +46467,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -46618,7 +46490,7 @@ /turf/open/floor/iron/white, /area/medical/apothecary) "lMA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/orange{ @@ -46633,7 +46505,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/ameridiner, @@ -46689,17 +46561,16 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) "lNF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/engine/atmos) "lNG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Thermoelectric Generator output" @@ -46726,7 +46597,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/grid, @@ -46743,10 +46614,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -46776,7 +46647,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/central) "lOy" = ( @@ -46853,8 +46724,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/junction/flip{ @@ -46888,10 +46759,10 @@ /turf/open/floor/grass, /area/hydroponics/garden) "lPL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -46932,7 +46803,7 @@ /turf/open/floor/iron, /area/construction) "lQY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/table, /obj/item/extinguisher{ pixel_x = -4 @@ -47040,11 +46911,19 @@ /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) "lSq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/engineering/glass{ + name = "Shuttle Lab" }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/techmaint, +/area/science/shuttle) "lSw" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -47057,7 +46936,7 @@ /turf/open/floor/engine, /area/science/storage) "lSH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -47072,8 +46951,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -47127,7 +47006,7 @@ "lUg" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/suit/burgundy, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/orange, @@ -47190,17 +47069,16 @@ /obj/item/radio/intercom{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lVb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -47271,11 +47149,11 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "lVB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark/side, /area/engine/atmos) "lVK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -47289,7 +47167,7 @@ /obj/item/clothing/head/beret, /obj/item/clothing/suit/toggle/lawyer, /obj/item/clothing/suit/jacket/letterman_nanotrasen, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/carpet/royalblue, @@ -47307,8 +47185,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/detectives_office) "lWc" = ( @@ -47333,19 +47211,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"lWG" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/bridge) "lWQ" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -47379,10 +47244,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -47398,8 +47263,8 @@ /obj/effect/turf_decal/trimline/green/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47555,7 +47420,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -47564,24 +47429,21 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /turf/open/floor/iron/sepia, /area/science/shuttle) "lZw" = ( /obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/grass, /area/hydroponics/garden) "lZy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -47608,14 +47470,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_y = 27 }, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine, @@ -47665,8 +47527,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47693,8 +47555,8 @@ /turf/open/floor/iron/grid/steel, /area/science/misc_lab) "mbL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47713,16 +47575,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, /area/library) "mbR" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -47793,13 +47655,13 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "mcp" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "mcv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -47808,19 +47670,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) "mcR" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/machinery/meter, @@ -47831,8 +47693,8 @@ /area/science/mixing) "mdb" = ( /obj/effect/spawner/structure/window/reinforced/tinted, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/engine/engine_room) "mdj" = ( @@ -47856,7 +47718,7 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "mdw" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 5 }, /turf/open/floor/iron, @@ -47874,10 +47736,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light/small{ @@ -47901,10 +47763,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction{ @@ -47917,8 +47779,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/brig) "meF" = ( @@ -47928,7 +47790,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "meQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -47945,7 +47807,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 5 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "meW" = ( @@ -47970,8 +47831,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/railing/corner{ dir = 1 }, @@ -47993,8 +47854,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -48056,7 +47917,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "mhe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/lab) "mho" = ( @@ -48068,9 +47929,6 @@ /turf/open/floor/engine, /area/science/mixing/chamber) "mhr" = ( -/obj/machinery/computer/atmos_control/tank/sm{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "mhK" = ( @@ -48110,10 +47968,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -48187,7 +48045,7 @@ name = "Supermatter Engine"; req_one_access_txt = "10;24" }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/techmaint, /area/engine/engine_room) "mip" = ( @@ -48213,7 +48071,7 @@ /turf/open/floor/iron/ridged, /area/crew_quarters/toilet/auxiliary) "miP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -48266,7 +48124,7 @@ /turf/open/floor/plating, /area/security/prison) "mjB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, @@ -48293,7 +48151,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "mjR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/red{ @@ -48332,9 +48190,6 @@ /turf/open/floor/iron/tech/grid, /area/medical/morgue) "mkn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/iron, /area/storage/primary) "mks" = ( @@ -48352,8 +48207,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -48399,11 +48254,11 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/prison/shielded) "mlM" = ( @@ -48461,7 +48316,7 @@ "mmX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -48473,8 +48328,14 @@ /turf/open/floor/iron/techmaint, /area/engine/engine_room) "mnr" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/starboard) "mnu" = ( @@ -48487,9 +48348,6 @@ /obj/machinery/door/airlock/external{ name = "Inner Docking Port" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, @@ -48518,11 +48376,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -48532,6 +48390,13 @@ }, /turf/open/floor/iron/checker, /area/quartermaster/storage) +"mnW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "moh" = ( /obj/structure/table/optable, /obj/effect/turf_decal/bot_white, @@ -48540,8 +48405,8 @@ "mos" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/shutters/window{ id = "svashutters"; name = "S.V.A. Storage Shutters" @@ -48570,7 +48435,7 @@ /turf/open/floor/plating, /area/engine/atmos) "moJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -48612,8 +48477,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 }, @@ -48641,10 +48506,10 @@ }, /area/ai_monitored/storage/eva) "mpL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -48661,10 +48526,10 @@ icon_state = "2-4" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -48757,7 +48622,7 @@ /area/maintenance/disposal/incinerator) "mrF" = ( /obj/structure/closet/crate/rcd, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48787,6 +48652,7 @@ id = "barcounter"; name = "Bar Counter Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "msg" = ( @@ -48832,10 +48698,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "msG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -48887,19 +48753,16 @@ /turf/open/floor/plating, /area/maintenance/port/central) "mtJ" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "Main Docking Port" +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/entry) +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/starboard) "mtP" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/delivery, @@ -48917,8 +48780,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "mui" = ( @@ -48929,7 +48792,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light_switch{ pixel_x = 24; pixel_y = 24 @@ -48948,7 +48810,7 @@ /turf/open/floor/carpet, /area/hallway/primary/starboard) "mux" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/wood, @@ -48964,8 +48826,8 @@ /area/security/brig) "muB" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/security/brig) "muD" = ( @@ -48999,7 +48861,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -49030,8 +48892,8 @@ /obj/structure/chair/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -49042,10 +48904,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -49068,7 +48930,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 1 }, @@ -49096,7 +48958,7 @@ /turf/open/floor/iron/grid/steel, /area/medical/apothecary) "mwq" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, +/obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma/light, /area/engine/atmos) "mwr" = ( @@ -49106,7 +48968,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs/left{ dir = 1 }, @@ -49129,10 +48991,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_out_arrow/blue{ dir = 9 }, @@ -49224,7 +49086,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -49258,6 +49120,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/grid/steel, /area/science/mixing) "myk" = ( @@ -49293,16 +49156,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, /area/security/brig) "myS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -49311,32 +49174,31 @@ /turf/open/floor/wood, /area/lawoffice) "myU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "myW" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/grid/steel, /area/science/lobby) "mzh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -49367,7 +49229,7 @@ /area/crew_quarters/fitness/recreation) "mzJ" = ( /obj/item/storage/box/mousetraps, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -49382,8 +49244,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, @@ -49410,13 +49272,13 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "mAi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/grid/steel, @@ -49433,10 +49295,10 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "mAy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -49452,10 +49314,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/bot, /turf/open/floor/iron/techmaint, /area/maintenance/port) @@ -49488,9 +49346,6 @@ /turf/open/floor/iron/techmaint, /area/maintenance/aft) "mBP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -49514,8 +49369,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "mCc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -49524,6 +49379,9 @@ charge = 100; maxcharge = 15000 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating{ burnt = 1 }, @@ -49650,10 +49508,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -49677,7 +49535,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "mDo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, /obj/machinery/holopad, /turf/open/floor/grass, @@ -49714,7 +49572,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "mEl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -49729,13 +49587,13 @@ /turf/open/floor/wood, /area/bridge/meeting_room/council) "mEm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/box, @@ -49805,17 +49663,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai_upload) +/turf/open/floor/iron/sepia, +/area/science/shuttle) "mEU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, @@ -49848,19 +49705,18 @@ /turf/open/floor/carpet/red, /area/crew_quarters/bar/atrium) "mFm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/shuttledock) "mFs" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) "mFB" = ( @@ -49871,14 +49727,14 @@ icon_state = "0-2" }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/engine/engine_smes) "mFT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -49895,10 +49751,10 @@ /area/holodeck/prison) "mGs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/stripes/closeup{ @@ -49919,7 +49775,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "mGV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/sorting/mail{ name = "Engineering Junction"; sortType = 4 @@ -49954,7 +49810,6 @@ /turf/open/floor/plating, /area/science/misc_lab) "mHr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -49973,17 +49828,17 @@ /obj/effect/turf_decal/siding/dark_green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/grid/steel, /area/medical/virology) "mHU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) @@ -50038,23 +49893,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "mIH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -50069,13 +49924,13 @@ /turf/open/floor/iron/dark, /area/library) "mIV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "mIY" = ( @@ -50086,7 +49941,7 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) @@ -50135,10 +49990,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -50183,6 +50038,7 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/solars/port) "mKx" = ( @@ -50205,7 +50061,7 @@ icon_state = "curator" }, /obj/item/clothing/under/rank/civilian/curator/treasure_hunter, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/purple, @@ -50256,7 +50112,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, @@ -50290,10 +50146,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/brown{ @@ -50428,12 +50284,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"mNG" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/security/execution/transfer) "mNL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1; name = "Hydroponics Junction"; @@ -50489,10 +50352,13 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "mOT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "mOY" = ( @@ -50527,7 +50393,7 @@ id = "techstorageshutters"; name = "Tech Storage Shutter Control"; pixel_y = -24; - req_access_txt = "31" + req_access_txt = "10;24" }, /turf/open/floor/iron/dark, /area/storage/tech) @@ -50581,10 +50447,10 @@ /area/security/checkpoint/customs) "mPD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50603,7 +50469,7 @@ /area/chapel/office) "mPV" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "mPX" = ( @@ -50658,14 +50524,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) "mQq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -50678,15 +50544,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/lawoffice) "mQu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/central) @@ -50739,8 +50602,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/turf_decal/siding/purple, @@ -50757,7 +50620,7 @@ "mRP" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/exit/departure_lounge) @@ -50799,6 +50662,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/break_room) "mSH" = ( @@ -50809,7 +50673,7 @@ /turf/open/floor/wood, /area/lawoffice) "mTi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -50832,22 +50696,29 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "mTv" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/turf_decal/box/corners{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/iron/dark, -/area/engine/atmos) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/fore) "mTx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/light{ @@ -50869,7 +50740,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/engine, @@ -50896,8 +50767,8 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "mTZ" = ( @@ -50942,18 +50813,15 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mUr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment, @@ -50975,19 +50843,19 @@ /turf/open/floor/plating, /area/tcommsat/computer) "mUI" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/circuit/telecomms, +/turf/open/floor/circuit, /area/science/xenobiology) "mUL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -51016,11 +50884,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "mVd" = ( @@ -51043,7 +50911,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "mVs" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -51078,27 +50946,29 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/engine/gravity_generator) "mWE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, /area/ai_monitored/storage/eva) "mWT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -51110,7 +50980,7 @@ /area/maintenance/aft/secondary) "mXd" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ name = "Genetics Desk Maintenance"; req_access_txt = "9" @@ -51122,14 +50992,18 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) "mXq" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Arrivals Dock" + }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 }, -/turf/open/floor/iron/techmaint, +/obj/structure/cable/yellow, +/turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "mXu" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, @@ -51147,7 +51021,7 @@ /area/bridge/meeting_room/council) "mXN" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, @@ -51168,8 +51042,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "mXU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51181,7 +51055,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port/central) "mYb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -51233,8 +51107,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51302,7 +51176,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -51317,7 +51191,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "naL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -51334,6 +51208,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/docking/arrival) "naZ" = ( @@ -51347,11 +51222,11 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "nbi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -51375,13 +51250,13 @@ /turf/open/floor/iron, /area/janitor) "nbs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -51403,7 +51278,7 @@ /turf/open/floor/iron, /area/medical/break_room) "nbC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -51470,7 +51345,7 @@ name = "Toxins Storage"; req_access_txt = "8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51501,8 +51376,8 @@ "ncv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51510,8 +51385,8 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "ncx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "ncC" = ( @@ -51526,7 +51401,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "ncH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -51610,7 +51485,7 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "nex" = ( @@ -51634,17 +51509,27 @@ /turf/open/floor/engine, /area/science/xenobiology) "nfd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/window, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron/sepia, /area/science/shuttle) "nfh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -51704,7 +51589,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -51717,7 +51602,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair/fancy/bench/right{ @@ -51730,7 +51615,7 @@ /area/maintenance/disposal) "nfZ" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/plating, /area/engine/engine_room) "ngf" = ( @@ -51773,7 +51658,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /obj/machinery/meter, @@ -51781,7 +51666,7 @@ /area/engine/engine_room) "ngo" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -51794,7 +51679,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -51847,19 +51732,14 @@ /turf/open/floor/iron/techmaint, /area/science/xenobiology) "nhq" = ( -/obj/machinery/advanced_airlock_controller/directional/west, /obj/structure/lattice/catwalk/over, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/science/shuttledock) "nhu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light{ dir = 8 }, @@ -51869,7 +51749,7 @@ /turf/open/floor/iron/dark/side, /area/hallway/primary/port) "nhx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "nhL" = ( @@ -51887,13 +51767,13 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "nhN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -51913,10 +51793,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -51940,10 +51820,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -51958,8 +51838,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) "nix" = ( @@ -51994,8 +51874,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/security/execution/transfer) "njl" = ( @@ -52003,8 +51883,8 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -52020,7 +51900,6 @@ pixel_y = 24 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood, /area/library) "njq" = ( @@ -52047,12 +51926,11 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "njs" = ( -/obj/structure/sign/painting/library{ - pixel_x = 32 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/library/lounge) +/turf/open/floor/iron/sepia, +/area/science/shuttle) "njt" = ( /obj/machinery/power/tesla_coil, /obj/machinery/camera/directional/south{ @@ -52071,8 +51949,8 @@ /area/quartermaster/exploration_prep) "nkl" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -52098,7 +51976,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "nkF" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/iron/tech/grid, /area/engine/engine_room) "nkK" = ( @@ -52166,10 +52044,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52191,10 +52069,10 @@ /turf/open/floor/iron/techmaint, /area/security/courtroom) "nlV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52218,12 +52096,14 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "nmy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/chapel/main) +/turf/open/floor/iron/sepia, +/area/science/shuttle) "nmH" = ( /obj/machinery/airalarm/directional/east{ pixel_x = 22 @@ -52256,7 +52136,7 @@ /area/vacant_room/office) "nno" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/grid/steel, @@ -52295,23 +52175,23 @@ /turf/open/space/basic, /area/space) "nnz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "nnM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "nnV" = ( @@ -52348,7 +52228,7 @@ req_access_txt = "47" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -52364,7 +52244,7 @@ /turf/open/floor/iron/techmaint, /area/science/nanite) "now" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, @@ -52512,8 +52392,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/aft) "nqH" = ( @@ -52563,13 +52443,13 @@ /turf/open/floor/plating, /area/crew_quarters/locker) "nsc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -52646,14 +52526,14 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "nsR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) @@ -52677,14 +52557,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plating, /area/maintenance/department/medical) "nti" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -52694,6 +52573,9 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "ntj" = ( @@ -52706,7 +52588,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "ntk" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /turf/open/floor/catwalk_floor, @@ -52718,22 +52600,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/exit/departure_lounge) -"ntM" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/exit/departure_lounge) "ntP" = ( @@ -52744,7 +52610,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -52791,10 +52657,10 @@ /turf/open/floor/iron/grid, /area/crew_quarters/toilet/restrooms) "nue" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -52810,22 +52676,22 @@ /area/science/storage) "nuj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "nuw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52892,9 +52758,6 @@ pixel_x = 28; pixel_y = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/library) "nvW" = ( @@ -52906,7 +52769,7 @@ "nwa" = ( /obj/machinery/power/rad_collector/anchored, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/red/line, @@ -52957,14 +52820,13 @@ /turf/open/floor/carpet/grimy, /area/maintenance/department/security/brig) "nxn" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/structure/displaycase/trophy, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet/green, +/area/library/lounge) "nxy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52975,7 +52837,7 @@ /area/hallway/primary/aft) "nxC" = ( /obj/effect/turf_decal/guideline/guideline_in/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side{ dir = 1 @@ -52996,8 +52858,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "nxH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -53023,8 +52885,15 @@ }, /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) +"nyj" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "nyo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53121,10 +52990,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "nzD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -53139,8 +53008,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "nzO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -53148,6 +53015,10 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "nzU" = ( @@ -53176,10 +53047,10 @@ "nAb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -53190,6 +53061,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) "nAD" = ( @@ -53256,7 +53130,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "nBe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -53302,7 +53176,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/grimy, @@ -53322,6 +53196,12 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "nBA" = ( @@ -53332,13 +53212,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "nBD" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -53360,10 +53240,10 @@ /turf/open/floor/carpet/green, /area/lawoffice) "nBU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -53394,7 +53274,7 @@ /turf/open/floor/wood, /area/vacant_room/office) "nCD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 8 }, /turf/open/floor/engine/plasma/light, @@ -53404,14 +53284,14 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "nCN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -53449,10 +53329,14 @@ /turf/open/floor/iron, /area/hallway/primary/port) "nDh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai_upload) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "nDi" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/delivery, @@ -53490,8 +53374,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "nDQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -53506,7 +53390,6 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/break_room) "nEv" = ( @@ -53519,10 +53402,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "nEH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -53546,8 +53429,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 6 }, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -53579,10 +53462,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "nFM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -53620,10 +53503,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -53646,7 +53529,7 @@ /area/science/lab) "nGj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -53664,9 +53547,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/wood, /area/vacant_room/office) "nGx" = ( @@ -53702,11 +53582,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/medical/break_room) @@ -53776,7 +53656,7 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -53803,7 +53683,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/chapel/main) "nHy" = ( @@ -53816,8 +53696,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -53882,8 +53762,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "nHZ" = ( @@ -53897,8 +53777,8 @@ /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness/recreation) "nIj" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -53924,16 +53804,14 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "nIv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/surgery) "nIP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/dorms) @@ -53945,15 +53823,15 @@ /turf/open/floor/iron/white, /area/science/lobby) "nIW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "nJa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/button/door{ @@ -53981,7 +53859,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) "nJH" = ( @@ -53998,6 +53876,7 @@ /area/engine/atmos) "nJU" = ( /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/iron/techmaint, /area/science/server) "nKa" = ( @@ -54015,8 +53894,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/central) "nKm" = ( @@ -54026,28 +53905,28 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "nKt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/port) "nKw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -54058,7 +53937,7 @@ req_one_access_txt = "10;24" }, /turf/open/floor/iron/ameridiner, -/area/engine/supermatter) +/area/engine/engine_room) "nKL" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -54076,7 +53955,7 @@ /area/maintenance/starboard/fore) "nKZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) "nLx" = ( @@ -54090,8 +53969,8 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 8 }, /turf/open/floor/iron/stairs/right{ dir = 8 @@ -54116,6 +53995,15 @@ }, /turf/open/floor/cult, /area/library) +"nLQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "nLR" = ( /obj/structure/table, /obj/effect/turf_decal/bot, @@ -54128,8 +54016,8 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "nMg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -54197,10 +54085,13 @@ /turf/open/floor/iron/dark, /area/security/main) "nNM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "nNT" = ( @@ -54215,10 +54106,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/chair/office{ @@ -54227,16 +54118,13 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "nOr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 1 }, @@ -54244,7 +54132,7 @@ /area/quartermaster/miningdock) "nOs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/disposal) "nOv" = ( @@ -54257,14 +54145,21 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/docking/bridge) "nOV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/sepia, +/area/science/shuttle) "nPd" = ( /obj/effect/turf_decal/guideline/guideline_mid/darkblue{ dir = 8 @@ -54340,8 +54235,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/main) "nQq" = ( @@ -54370,7 +54265,7 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "nQQ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "nQT" = ( @@ -54399,8 +54294,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/central) "nRz" = ( @@ -54423,7 +54318,7 @@ /turf/open/floor/plating/airless, /area/science/test_area) "nRP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -54440,7 +54335,7 @@ /turf/open/floor/wood, /area/lawoffice) "nSA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -54465,8 +54360,6 @@ "nSV" = ( /obj/machinery/door/airlock/external, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/techmaint, /area/science/shuttledock) @@ -54487,13 +54380,12 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "nTR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/quartermaster/miningdock) +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "nUj" = ( /obj/machinery/suit_storage_unit/engine, /obj/structure/lattice/catwalk/over, @@ -54534,10 +54426,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -54592,10 +54484,10 @@ /turf/open/floor/iron/dark, /area/bridge) "nVy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -54674,7 +54566,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light/small, @@ -54705,7 +54597,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -54759,11 +54651,10 @@ /turf/open/floor/iron/dark, /area/storage/primary) "nXO" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -54771,6 +54662,10 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "nYc" = ( @@ -54825,14 +54720,19 @@ /turf/open/floor/plating, /area/crew_quarters/toilet/restrooms) "nZa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) "nZg" = ( @@ -54875,10 +54775,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -54900,11 +54800,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -54914,7 +54814,7 @@ /turf/open/floor/wood, /area/bridge/meeting_room/council) "nZD" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/camera/directional/west{ c_tag = "Atmospherics - Engine Passage"; name = "atmospherics camera" @@ -54933,10 +54833,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -54962,7 +54862,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/maintenance/port) "oam" = ( @@ -54970,7 +54869,7 @@ name = "Delivery Office"; req_access_txt = "50" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -54989,10 +54888,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -55003,7 +54902,7 @@ /turf/open/floor/plating, /area/maintenance/port) "oaH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -55025,10 +54924,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -55040,8 +54939,8 @@ /turf/open/floor/iron/grid/steel, /area/hallway/secondary/service) "oaY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -55070,8 +54969,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -55103,7 +55002,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port) "obK" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "obP" = ( @@ -55135,8 +55034,8 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "ocd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -55159,10 +55058,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/apothecary) "ocu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -55196,9 +55095,6 @@ pixel_x = 28; pixel_y = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -55225,8 +55121,8 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) "ocT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -55264,10 +55160,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -55293,7 +55189,7 @@ "odD" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -55367,8 +55263,8 @@ location = "14.1-GravGen" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "ofA" = ( @@ -55379,11 +55275,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ofB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -55423,23 +55319,23 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "ogc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, /area/security/courtroom) "ogi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/crew_quarters/fitness/recreation) "ogy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -55507,7 +55403,7 @@ pixel_x = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -55517,7 +55413,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -55543,14 +55439,14 @@ /turf/open/floor/carpet, /area/vacant_room/office) "oiz" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "oiB" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron, @@ -55585,10 +55481,10 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -55607,8 +55503,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ dir = 4 }, @@ -55616,10 +55512,10 @@ /turf/open/floor/plating, /area/maintenance/port) "ojo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -55667,10 +55563,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -55679,7 +55575,7 @@ /turf/open/floor/carpet/orange, /area/quartermaster/qm) "oka" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -55696,7 +55592,7 @@ }, /area/hallway/primary/central) "okO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -55799,7 +55695,7 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -55815,7 +55711,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -55852,12 +55748,12 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/tcommsat/computer) "omZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/engine/atmos) "onb" = ( @@ -55877,7 +55773,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "onl" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/light/small, @@ -55920,17 +55816,16 @@ name = "Server Room"; req_access_txt = "61" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -55939,10 +55834,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light/small{ @@ -55977,8 +55872,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -56003,10 +55898,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -56048,10 +55943,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "oon" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -56081,10 +55976,10 @@ /turf/open/floor/carpet/green, /area/security/detectives_office) "ooT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail{ @@ -56098,8 +55993,8 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "opn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56143,14 +56038,12 @@ /area/tcommsat/server) "opF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ dir = 8 }, -/area/crew_quarters/fitness/recreation) +/turf/open/floor/iron, +/area/quartermaster/storage) "opL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -56166,20 +56059,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/port/central) "oqa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/hallway/secondary/entry) "oqg" = ( @@ -56213,8 +56103,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/navbeacon{ @@ -56239,8 +56129,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /obj/structure/cable/yellow{ @@ -56252,11 +56142,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) @@ -56286,8 +56176,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_in_arrow_con/red, /obj/effect/turf_decal/guideline/guideline_mid_arrow_con/purple, /obj/effect/turf_decal/guideline/guideline_out_arrow_con/yellow, @@ -56360,23 +56250,22 @@ /area/science/xenobiology) "orP" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "orV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "ose" = ( /obj/structure/lattice/catwalk/over, /obj/structure/closet/firecloset, -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/item/toy/plush/moth/ragged, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /turf/open/floor/plating, /area/engine/engine_room) "osl" = ( @@ -56451,11 +56340,11 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port) @@ -56495,7 +56384,7 @@ /obj/effect/turf_decal/bot, /obj/item/clothing/mask/balaclava, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -56507,7 +56396,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -56571,15 +56460,15 @@ /area/science/xenobiology) "ouW" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "ovf" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -56589,10 +56478,10 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ovz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -56621,10 +56510,10 @@ name = "Monkey Pen"; req_access_txt = "39" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -56650,10 +56539,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -56665,7 +56554,7 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "ovY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -56687,9 +56576,6 @@ /obj/machinery/newscaster{ pixel_y = -28 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -56711,10 +56597,20 @@ /turf/open/floor/iron, /area/hallway/primary/central) "owt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"oww" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/fore) "owF" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/white/line, @@ -56775,11 +56671,18 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "oxG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/effect/turf_decal/trimline/purple/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/science/research) "oxQ" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -56797,15 +56700,6 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/teleporter) -"oxU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/department/medical) "oya" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -56841,8 +56735,8 @@ /turf/closed/wall, /area/hallway/primary/starboard) "oyV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 }, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -56886,10 +56780,10 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "ozV" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 8 }, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/science/server) "oAk" = ( /obj/machinery/holopad, @@ -56899,7 +56793,7 @@ /area/gateway) "oAF" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -56914,7 +56808,7 @@ /area/bridge/showroom/corporate) "oAX" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -56945,8 +56839,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -57025,7 +56919,7 @@ }, /area/engine/atmos) "oCi" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -57048,10 +56942,10 @@ /turf/open/floor/carpet, /area/vacant_room/office) "oCz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -57072,10 +56966,10 @@ /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -57087,7 +56981,7 @@ /turf/open/floor/iron/techmaint, /area/hallway/primary/central) "oCN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -57118,10 +57012,10 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "oDj" = ( -/obj/machinery/computer/atmos_control/tank/air_tank{ +/obj/machinery/computer/atmos_control/air_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -57177,7 +57071,7 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid, /area/medical/surgery) "oDU" = ( @@ -57266,11 +57160,7 @@ /turf/open/floor/plating, /area/tcommsat/server) "oFD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -57278,6 +57168,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "oFV" = ( @@ -57306,9 +57200,6 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = -30 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/medical/surgery) @@ -57327,10 +57218,10 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/highsecurity{ @@ -57376,8 +57267,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -57401,8 +57292,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -57445,10 +57336,10 @@ /turf/open/floor/iron/sepia, /area/science/shuttle) "oHP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -57463,7 +57354,7 @@ /turf/open/floor/iron/white, /area/science/research) "oHT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -57502,10 +57393,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/chair/fancy/comfy{ @@ -57517,13 +57408,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -57551,7 +57442,7 @@ /turf/open/floor/iron/dark, /area/science/breakroom) "oJd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -57632,8 +57523,7 @@ /turf/open/floor/engine, /area/engine/gravity_generator) "oJM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -57643,6 +57533,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/science/shuttle) "oKb" = ( @@ -57652,7 +57543,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -57662,8 +57552,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -57671,9 +57561,14 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "oKs" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plating, -/area/construction) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/sepia, +/area/science/shuttle) "oKz" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -57686,15 +57581,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/techmaint, /area/maintenance/solars/starboard/fore) "oKZ" = ( @@ -57707,10 +57602,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -57723,10 +57618,7 @@ icon_state = "0-4" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -57743,10 +57635,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -57761,27 +57653,24 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 5 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "oLQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/item/beacon, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/science/shuttle) "oLS" = ( @@ -57818,9 +57707,9 @@ /turf/closed/wall, /area/storage/primary) "oMg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/delivery, -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/computer/atmos_control/plasma_tank{ desc = "Used to monitor the station's atmospherics sensors. On the Side it's engraved 'Do not'."; dir = 8 }, @@ -57838,7 +57727,7 @@ /turf/open/floor/plating, /area/science/xenobiology) "oMG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/library) "oNi" = ( @@ -57846,7 +57735,7 @@ /turf/closed/wall, /area/janitor) "oNU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -57871,22 +57760,22 @@ /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "oOp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, /area/library) "oOu" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "oOH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -57898,8 +57787,8 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "oOR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -57909,7 +57798,7 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "oOV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -57950,7 +57839,7 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "oPF" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) "oQl" = ( @@ -58017,7 +57906,7 @@ /turf/open/floor/iron/dark, /area/chapel/main) "oRa" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, @@ -58054,7 +57943,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -58088,10 +57977,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -58129,12 +58018,12 @@ /area/maintenance/aft) "oSt" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/brig) "oSF" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/meter, @@ -58203,8 +58092,8 @@ /turf/closed/wall/r_wall, /area/security/nuke_storage) "oTx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -58243,10 +58132,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/junction{ @@ -58275,7 +58164,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 }, @@ -58293,13 +58182,9 @@ }, /area/engine/storage) "oUF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -58309,14 +58194,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "oUH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -58407,15 +58301,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oWi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "oWl" = ( @@ -58461,8 +58355,8 @@ }, /area/maintenance/port/central) "oWT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -58492,10 +58386,10 @@ /area/security/detectives_office) "oXQ" = ( /obj/effect/landmark/start/clown, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -58554,7 +58448,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -58580,7 +58474,7 @@ }, /area/engine/atmos) "oYP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -58607,12 +58501,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "oZg" = ( @@ -58656,8 +58544,8 @@ /obj/effect/turf_decal/guideline/guideline_mid/darkblue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "oZM" = ( @@ -58684,10 +58572,10 @@ name = "science Access"; req_access_txt = "47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58696,9 +58584,6 @@ /turf/open/floor/iron/techmaint, /area/maintenance/aft) "oZZ" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank{ - pixel_x = 25 - }, /obj/machinery/igniter/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) @@ -58741,8 +58626,8 @@ pixel_x = -24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -58781,10 +58666,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58836,7 +58721,7 @@ }, /area/teleporter) "pbB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -58861,7 +58746,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58870,19 +58755,19 @@ /turf/open/floor/iron, /area/engine/atmos) "pcp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 9 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "pcC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -58913,8 +58798,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -58939,7 +58824,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -58974,7 +58859,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/engine, @@ -59011,10 +58896,10 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "pdM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59041,8 +58926,8 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron/dark, /area/chapel/main) @@ -59069,8 +58954,8 @@ /area/maintenance/starboard/aft) "pet" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -59098,8 +58983,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -59120,10 +59005,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -59133,8 +59018,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -59145,15 +59030,12 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "pfM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/stripes/end, /turf/open/floor/iron/white, /area/science/xenobiology) "pfQ" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/item/paper_bin, @@ -59183,7 +59065,7 @@ pixel_x = -26; pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -59220,8 +59102,8 @@ name = "Chapel Morgue"; req_access_txt = "27" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/chapel/office) "pgq" = ( @@ -59250,7 +59132,7 @@ /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "pgx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -59327,11 +59209,10 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "phD" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "phJ" = ( @@ -59348,7 +59229,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -59406,8 +59287,8 @@ /turf/open/floor/wood, /area/hallway/primary/port) "piT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59444,8 +59325,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "pjL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59510,8 +59391,8 @@ /turf/open/floor/plating, /area/construction) "pkE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59604,17 +59485,13 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/library) "pmh" = ( -/obj/machinery/airalarm/server{ - pixel_y = 22; - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -59634,8 +59511,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/office) @@ -59653,7 +59530,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /obj/machinery/light{ @@ -59680,7 +59557,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side, @@ -59707,10 +59584,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -59735,8 +59612,8 @@ /turf/open/floor/iron/techmaint, /area/security/checkpoint/auxiliary) "pnM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59744,7 +59621,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "pob" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -59778,8 +59655,8 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -59798,8 +59675,8 @@ /turf/open/floor/iron/cafeteria, /area/storage/art) "ppi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/junction{ @@ -59829,7 +59706,7 @@ /area/quartermaster/warehouse) "ppG" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "pqf" = ( @@ -59889,19 +59766,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, /area/library) "pqt" = ( /obj/structure/lattice, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating/airless, /area/space/nearstation) "pqv" = ( /obj/item/toy/figure/scientist{ @@ -59951,11 +59826,11 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -59971,10 +59846,10 @@ /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -60004,7 +59879,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) @@ -60071,10 +59946,10 @@ }, /area/maintenance/starboard/fore) "ptN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -60102,20 +59977,20 @@ /turf/open/floor/iron, /area/hydroponics) "pul" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "puo" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) "put" = ( @@ -60178,6 +60053,10 @@ /obj/machinery/button/shieldwallgen/directional/south{ name = "Arrivals" }, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "manual inlet valve" + }, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -60212,10 +60091,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -60254,10 +60133,10 @@ /turf/open/floor/plating, /area/engine/storage) "pvW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -60294,10 +60173,10 @@ /turf/open/floor/plating, /area/crew_quarters/locker) "pwy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/openup{ @@ -60310,10 +60189,6 @@ /turf/open/floor/iron, /area/maintenance/disposal) "pwI" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Atmos to Gas" - }, /obj/machinery/light{ dir = 1 }, @@ -60326,6 +60201,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "pwZ" = ( @@ -60344,7 +60222,7 @@ dir = 8; id = "incineratorturbine" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/button/door/incinerator_vent_atmos_main{ @@ -60368,11 +60246,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/shuttle) "pxt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -60410,8 +60291,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/library) "pyf" = ( @@ -60429,7 +60310,7 @@ "pyl" = ( /obj/machinery/light/small, /obj/structure/lattice/catwalk/over, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "pyo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -60536,8 +60417,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor, @@ -60560,10 +60441,10 @@ /turf/open/floor/grass/no_border, /area/quartermaster/exploration_prep) "pzW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -60616,7 +60497,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "pAr" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/iron/dark/side, @@ -60681,8 +60562,8 @@ /turf/open/floor/iron/grid/steel, /area/storage/primary) "pBs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) @@ -60735,10 +60616,10 @@ req_access_txt = "30" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -60755,6 +60636,7 @@ roundstart_template = /datum/map_template/shuttle/escape_pod/default; width = 3 }, +/obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) "pBX" = ( @@ -60782,9 +60664,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "pCt" = ( @@ -60794,10 +60676,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60835,7 +60717,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60848,10 +60730,10 @@ /turf/open/floor/iron/white, /area/medical/genetics) "pDc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -60867,7 +60749,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /turf/open/floor/iron/dark, @@ -60896,8 +60778,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in_arrow_con/red, /obj/effect/turf_decal/guideline/guideline_mid_arrow_con/darkblue, /obj/effect/turf_decal/guideline/guideline_out_arrow_con/blue, @@ -60910,11 +60792,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "pEs" = ( @@ -60945,8 +60830,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -60982,8 +60867,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "pFo" = ( @@ -61021,6 +60905,7 @@ id = "barcounter"; name = "Bar Counter Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "pFL" = ( @@ -61033,8 +60918,8 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "pFT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61042,7 +60927,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "pGa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -61114,8 +60999,8 @@ }, /obj/effect/landmark/event_spawn, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -61137,9 +61022,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "pHu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) @@ -61176,8 +61058,8 @@ /turf/open/floor/iron, /area/medical/break_room) "pHF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/carpet, /area/chapel/main) @@ -61185,10 +61067,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -61212,16 +61094,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/prison) "pIb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library) "pIn" = ( @@ -61256,8 +61138,8 @@ /turf/open/floor/iron/tech/grid, /area/medical/morgue) "pIQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -61275,7 +61157,7 @@ dir = 1 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -61322,7 +61204,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/firealarm/directional/south, /obj/machinery/camera/directional/south, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -61340,9 +61221,6 @@ /area/science/lab) "pJq" = ( /obj/effect/landmark/start/mime, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -61355,7 +61233,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_smooth, +/turf/open/floor/iron/techmaint, /area/maintenance/disposal/incinerator) "pJI" = ( /obj/machinery/camera/directional/north{ @@ -61365,8 +61243,8 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science) "pJJ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "pJN" = ( @@ -61376,7 +61254,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -61426,7 +61304,7 @@ /turf/open/floor/iron/dark, /area/engine/engine_smes) "pKt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "pKv" = ( @@ -61473,8 +61351,8 @@ /turf/open/space/basic, /area/space/nearstation) "pLu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61486,10 +61364,10 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "pLC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -61498,7 +61376,7 @@ /turf/open/floor/catwalk_floor, /area/engine/atmos) "pLE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/holopad, @@ -61514,7 +61392,6 @@ /area/security/checkpoint/medical) "pLF" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; req_access_txt = "48" @@ -61522,8 +61399,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/quartermaster/miningdock) "pLU" = ( @@ -61546,7 +61421,6 @@ /turf/open/floor/iron, /area/medical/break_room) "pLX" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -61554,6 +61428,11 @@ dir = 8 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, /area/science/lobby) "pMb" = ( @@ -61571,8 +61450,8 @@ /obj/effect/turf_decal/plaque{ icon_state = "L9" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "pMq" = ( @@ -61580,13 +61459,13 @@ /turf/open/floor/iron, /area/maintenance/disposal) "pMM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -61681,10 +61560,10 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "pNC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -61695,7 +61574,7 @@ /area/hallway/secondary/exit/departure_lounge) "pNU" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/closet/l3closet/security, @@ -61719,8 +61598,8 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "pOm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61749,8 +61628,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) @@ -61758,14 +61637,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/lawoffice) "pPk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61801,7 +61680,7 @@ /turf/open/floor/prison, /area/security/prison) "pPI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -61814,8 +61693,7 @@ /turf/open/floor/iron/dark, /area/lawoffice) "pQr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61826,11 +61704,27 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/lobby) "pQv" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) "pQA" = ( @@ -61844,10 +61738,10 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "pQI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -61897,10 +61791,10 @@ /turf/open/floor/iron/dark, /area/security/main) "pSh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -61927,8 +61821,8 @@ /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "pSv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61982,10 +61876,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -62001,7 +61895,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/engine/gravity_generator) "pUj" = ( @@ -62019,7 +61913,7 @@ /obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -62090,10 +61984,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -62112,7 +62006,7 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, @@ -62129,19 +62023,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/teleporter) "pVM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/iron/sepia, -/area/science/shuttle) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/grid/steel, +/area/bridge) "pVT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -62172,7 +62068,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) "pWK" = ( @@ -62213,16 +62109,16 @@ /area/crew_quarters/dorms) "pXh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, /area/security/prison) "pXj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -62252,9 +62148,9 @@ /turf/closed/wall/r_wall, /area/security/warden) "pXQ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) @@ -62290,7 +62186,7 @@ /turf/open/floor/wood, /area/hallway/primary/port) "pYt" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/closed/wall/r_wall, @@ -62302,10 +62198,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -62314,8 +62210,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -62328,7 +62224,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/quartermaster/warehouse) "pYP" = ( @@ -62353,7 +62249,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/reagent_dispensers/water_cooler, @@ -62386,10 +62282,10 @@ pixel_y = -24; req_access_txt = "11" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -62424,10 +62320,10 @@ pixel_x = -6; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet, @@ -62461,10 +62357,10 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/central) "qar" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -62479,10 +62375,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -62514,8 +62410,8 @@ /turf/closed/wall, /area/crew_quarters/heads/captain) "qaR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62529,19 +62425,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissaryFood) "qbd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_mid/purple{ @@ -62557,8 +62453,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -62614,11 +62510,11 @@ /turf/open/floor/carpet, /area/chapel/main) "qbJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -62626,7 +62522,7 @@ /area/hallway/primary/central) "qbK" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 4 }, /obj/structure/lattice/catwalk/over, @@ -62705,7 +62601,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "qdj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -62720,15 +62616,20 @@ /turf/open/floor/iron, /area/hallway/primary/port) "qdt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "qdw" = ( @@ -62738,10 +62639,10 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -62753,7 +62654,7 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "qdH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/red{ @@ -62777,10 +62678,10 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "qeb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -62803,7 +62704,7 @@ "qed" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/railing/corner{ @@ -62827,9 +62728,12 @@ }, /area/maintenance/port/central) "qel" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "qep" = ( @@ -62855,7 +62759,7 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -62885,7 +62789,7 @@ /area/hallway/primary/fore) "qeJ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -62942,17 +62846,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "qfX" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "qfY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -62964,10 +62871,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, @@ -62977,8 +62884,6 @@ /turf/open/space/basic, /area/space) "qgo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62996,13 +62901,13 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "qgC" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "qgL" = ( @@ -63068,7 +62973,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "qhQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "qhY" = ( @@ -63103,10 +63008,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -63150,8 +63055,8 @@ /turf/open/floor/iron/techmaint, /area/storage/tech) "qiI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63170,7 +63075,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -63179,12 +63084,12 @@ /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "qiU" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "qiV" = ( @@ -63193,10 +63098,10 @@ /turf/open/floor/iron/dark, /area/engine/storage_shared) "qiY" = ( -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -63239,8 +63144,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -63252,7 +63157,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/loading_area, -/obj/machinery/door/firedoor, /turf/open/floor/iron/grid/steel, /area/science/misc_lab) "qjE" = ( @@ -63290,10 +63194,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/junction{ @@ -63337,7 +63241,7 @@ /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "qla" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -63360,7 +63264,7 @@ /turf/open/floor/iron, /area/storage/primary) "qls" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -63391,7 +63295,7 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "qlI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -63401,10 +63305,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -63430,7 +63334,7 @@ /turf/open/floor/iron/techmaint, /area/crew_quarters/locker) "qmc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -63439,18 +63343,23 @@ /turf/open/floor/iron, /area/security/courtroom) "qmd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "qmf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, @@ -63493,7 +63402,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/cafeteria) "qmS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -63556,20 +63465,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) -"qnw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port/central) "qnx" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment{ @@ -63590,14 +63490,14 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "qnU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -63630,7 +63530,7 @@ /turf/open/floor/iron, /area/maintenance/department/security/brig) "qos" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63653,8 +63553,8 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/item/radio/intercom{ @@ -63739,7 +63639,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "qqk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -63764,16 +63664,10 @@ /area/drydock) "qqz" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/quartermaster/storage) "qqB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -63898,7 +63792,7 @@ name = "Brig"; req_access_txt = "38; 63; 42" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -63912,7 +63806,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ dir = 4 }, /obj/structure/cable/orange{ @@ -63936,10 +63830,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/lawoffice) "qsz" = ( @@ -63975,10 +63869,10 @@ /turf/closed/wall/r_wall, /area/storage/tech) "qsR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/purple, @@ -64010,24 +63904,24 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "qtl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "qtm" = ( -/obj/machinery/computer/telecomms/server{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-4" }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/computer/telecomms/monitor{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/tcommsat/computer) "qtt" = ( @@ -64041,7 +63935,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64053,13 +63947,13 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "qtE" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -64084,7 +63978,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ @@ -64106,7 +64000,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "qtW" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron/dark/side, /area/engine/atmos) "qtY" = ( @@ -64184,9 +64078,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, @@ -64205,10 +64096,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /mob/living/simple_animal/bot/floorbot, @@ -64217,7 +64108,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "qvc" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 9 }, /turf/open/floor/iron/sepia, @@ -64230,10 +64121,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -64243,11 +64134,11 @@ /turf/open/floor/iron/techmaint, /area/engine/storage) "qvj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -64301,19 +64192,19 @@ /turf/open/floor/plating, /area/maintenance/department/science) "qwn" = ( -/obj/machinery/computer/atmos_control/tank/mix_tank{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/atmos) "qwo" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/corner{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -64364,10 +64255,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "qxH" = ( @@ -64381,7 +64275,7 @@ pixel_y = -32 }, /obj/item/aicard, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -64393,7 +64287,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/techmaint, /area/maintenance/disposal/incinerator) "qxZ" = ( @@ -64450,10 +64344,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -64468,7 +64362,7 @@ /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "qyT" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Pure to Ports" @@ -64502,12 +64396,6 @@ /obj/effect/turf_decal/stripes/openup{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -64517,8 +64405,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -64563,7 +64451,7 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "qAX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64596,10 +64484,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -64619,8 +64507,8 @@ /turf/open/floor/iron/techmaint, /area/security/main) "qBA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64657,11 +64545,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -64693,10 +64581,10 @@ /turf/open/floor/iron, /area/maintenance/disposal) "qBX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -64706,8 +64594,8 @@ /area/science/mixing) "qBZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -64724,7 +64612,7 @@ /turf/open/floor/iron/dark, /area/security/checkpoint) "qCn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/sepia, @@ -64736,7 +64624,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -64763,7 +64651,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -64786,22 +64674,25 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "qDs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "qDZ" = ( @@ -64833,7 +64724,7 @@ /turf/open/floor/iron/techmaint, /area/security/execution/transfer) "qEi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -64862,10 +64753,10 @@ }, /area/hallway/primary/central) "qEs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/teleporter) @@ -64873,8 +64764,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -64887,18 +64778,24 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "qEC" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) "qEF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -64967,20 +64864,20 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "qFL" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "qFR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -64990,11 +64887,14 @@ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "qFV" = ( /obj/machinery/portable_atmospherics/scrubber/huge, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -65080,18 +64980,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/hallway/primary/central) -"qGW" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes/closeup{ - dir = 5 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -26; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/entry) "qGZ" = ( /obj/structure/closet/crate{ name = "food crate" @@ -65164,15 +65052,26 @@ }, /area/medical/surgery) "qHN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/security/courtroom) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/carpet/red, +/area/library) "qHV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/lawoffice) "qIc" = ( @@ -65205,7 +65104,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -65276,13 +65175,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) "qIR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -65295,10 +65194,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/side, @@ -65331,10 +65230,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -65355,7 +65254,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -65364,9 +65263,6 @@ }, /area/tcommsat/server) "qKj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/medical/exam_room) "qKl" = ( @@ -65389,7 +65285,7 @@ /turf/open/floor/iron, /area/janitor) "qKv" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /turf/open/floor/iron/dark, @@ -65403,10 +65299,10 @@ /turf/open/floor/monotile/dark, /area/engine/engine_room) "qKz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/sign/warning/electricshock{ @@ -65441,10 +65337,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -65458,15 +65354,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -65479,16 +65372,15 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qLf" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -65496,6 +65388,13 @@ /obj/structure/railing/corner{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) "qLi" = ( @@ -65520,8 +65419,8 @@ /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "qLR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -65551,10 +65450,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -65569,6 +65468,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "qMO" = ( @@ -65580,7 +65482,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron/dark, @@ -65607,18 +65509,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/junction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "qNB" = ( @@ -65682,7 +65581,7 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "qOF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -65704,8 +65603,8 @@ /area/hallway/primary/starboard) "qOZ" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance{ name = "Medbay Desk Maintenance"; req_access_txt = "5" @@ -65722,7 +65621,7 @@ name = "Law Office"; req_access_txt = "38" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -65770,6 +65669,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/virology) +"qPD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/medical/medbay/lobby) "qPF" = ( /obj/machinery/light_switch{ pixel_x = -24 @@ -65782,18 +65691,15 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/warning, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/maintenance/department/engine) "qPS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "qPX" = ( @@ -65884,28 +65790,26 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/techmaint, /area/crew_quarters/theatre/backstage) "qQM" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/plating, /area/maintenance/port/central) "qRb" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o/light, /area/engine/atmos) "qRg" = ( @@ -65916,22 +65820,28 @@ /turf/open/floor/iron, /area/maintenance/central) "qRj" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/airalarm/engine{ - dir = 4; - pixel_x = 24 +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron/ameridiner, -/area/engine/supermatter) +/area/engine/engine_room) "qRl" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "qRm" = ( @@ -65950,8 +65860,8 @@ /area/crew_quarters/heads/hos) "qRv" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -65964,8 +65874,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -66008,10 +65918,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -66053,7 +65963,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "qSy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66062,7 +65972,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light/small{ @@ -66070,15 +65980,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"qSI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/medical) "qSM" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/southright{ @@ -66099,10 +66000,10 @@ /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) "qSN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66115,8 +66016,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/primary/central) "qSQ" = ( @@ -66136,7 +66037,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow{ @@ -66156,8 +66057,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -66228,9 +66129,6 @@ /turf/open/floor/plating/rust, /area/maintenance/port/aft) "qTJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -66244,7 +66142,6 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/end, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; @@ -66269,8 +66166,8 @@ /area/science/xenobiology) "qUk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -66294,7 +66191,7 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "qUS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -66343,7 +66240,7 @@ /area/security/warden) "qWv" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -66370,10 +66267,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -66398,10 +66295,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -66416,7 +66313,7 @@ }, /area/maintenance/starboard/central) "qXv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66496,10 +66393,10 @@ /turf/closed/wall, /area/library/lounge) "qZx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -66527,10 +66424,10 @@ /turf/open/floor/iron, /area/quartermaster/storage) "rab" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66573,17 +66470,17 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "raL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -66603,10 +66500,10 @@ /area/maintenance/starboard/fore) "rbF" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -66642,10 +66539,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -66662,10 +66559,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -66675,10 +66572,10 @@ dir = 1 }, /obj/structure/railing, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -66692,7 +66589,7 @@ }, /area/maintenance/port) "rcR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -66730,10 +66627,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -66743,7 +66640,7 @@ name = "Corporate Showroom"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -66763,10 +66660,10 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -66789,7 +66686,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -66798,7 +66695,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port/aft) "rdR" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/engine{ @@ -66806,7 +66703,7 @@ }, /area/docking/arrival) "rdZ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -66855,10 +66752,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "rfa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66902,11 +66799,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -66914,8 +66811,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "rfI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -66954,8 +66851,8 @@ /area/hallway/primary/central) "rgi" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -66965,10 +66862,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -67069,10 +66966,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -67151,8 +67048,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -67172,8 +67069,8 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "riN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -67197,7 +67094,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -67211,8 +67108,8 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -67222,11 +67119,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "rjH" = ( @@ -67257,14 +67152,14 @@ name = "Emergency Medical Lockdown Shutters" }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/end{ dir = 4 }, /obj/effect/turf_decal/stripes/red/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -67301,10 +67196,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "rlu" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "rlv" = ( @@ -67320,13 +67215,15 @@ /turf/open/floor/holofloor/plating, /area/holodeck/prison) "rlQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "rlX" = ( @@ -67342,7 +67239,7 @@ /turf/open/floor/iron/dark, /area/science/lab) "rlY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -67443,13 +67340,16 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "rnc" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "rno" = ( @@ -67468,10 +67368,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -67555,10 +67455,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -67584,10 +67484,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -67604,11 +67504,10 @@ /turf/open/floor/iron/grid/steel, /area/science/mixing) "rpq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/science/mixing) "rpu" = ( @@ -67618,7 +67517,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "rpv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -67658,12 +67557,6 @@ /area/engine/break_room) "rpZ" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/maintenance/disposal) "rqd" = ( @@ -67684,10 +67577,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -67705,15 +67598,15 @@ /turf/open/floor/plating, /area/science/shuttle) "rqz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/item/radio/intercom{ pixel_y = -28 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, /turf/open/floor/iron/sepia, /area/maintenance/disposal/incinerator) "rqD" = ( @@ -67731,6 +67624,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/medical/break_room) "rrs" = ( @@ -67768,10 +67664,10 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "rrR" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -67792,10 +67688,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "rrS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -67834,10 +67730,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "rso" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -67871,10 +67767,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ @@ -67891,19 +67787,22 @@ /turf/open/floor/iron/dark, /area/maintenance/department/security/brig) "rtM" = ( -/obj/machinery/atmospherics/components/binary/valve/on{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/carpet/purple, +/area/crew_quarters/theatre) "rtO" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -67930,8 +67829,8 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "ruz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67961,14 +67860,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/central) "ruK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Mix to Ports" @@ -67976,8 +67875,8 @@ /turf/open/floor/iron, /area/engine/atmos) "ruU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -68025,7 +67924,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "rvn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68038,6 +67937,9 @@ pixel_y = 24; req_access_txt = "25" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "rvI" = ( @@ -68063,6 +67965,10 @@ /obj/structure/table/wood, /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) +"rvV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/maintenance/port/central) "rvW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -68073,10 +67979,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L11" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -68106,10 +68012,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -68119,10 +68025,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "rwt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -68134,10 +68040,10 @@ /turf/open/floor/plating, /area/maintenance/port) "rwz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68225,24 +68131,26 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/flip, /turf/open/floor/plating, /area/maintenance/port) "rxE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/sepia, /area/science/shuttle) "rxF" = ( @@ -68261,10 +68169,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -68292,13 +68200,13 @@ /obj/effect/turf_decal/plaque{ icon_state = "L7" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -68307,13 +68215,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, /area/engine/engine_room) "ryP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68328,8 +68236,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ryY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "rza" = ( @@ -68360,7 +68268,7 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/turf/open/floor/iron/dark/airless, +/turf/open/floor/iron/dark, /area/medical/surgery) "rzi" = ( /obj/structure/table/wood, @@ -68374,8 +68282,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/red, @@ -68417,9 +68325,7 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/maintenance/disposal) "rzV" = ( @@ -68429,8 +68335,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/navbeacon{ @@ -68453,10 +68359,10 @@ pixel_x = -1; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -68466,7 +68372,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68536,7 +68442,7 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/fore) "rBB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -68560,8 +68466,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68616,20 +68522,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/security/brig) "rCG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -68653,8 +68559,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -68727,22 +68633,27 @@ /turf/open/floor/prison, /area/security/prison) "rDU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/starboard) "rEa" = ( @@ -68776,10 +68687,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -68788,8 +68699,8 @@ /turf/closed/wall/r_wall, /area/engine/engineering) "rFk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68830,15 +68741,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "rFI" = ( @@ -68853,10 +68761,10 @@ }, /area/maintenance/aft/secondary) "rFS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68876,7 +68784,7 @@ /turf/open/floor/wood, /area/hallway/primary/port) "rFZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -68987,25 +68895,25 @@ /turf/closed/wall/r_wall, /area/engine/engine_room) "rHf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "rHh" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/railing/corner{ @@ -69064,12 +68972,15 @@ /area/hallway/primary/aft) "rIs" = ( /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/disposal) "rIA" = ( @@ -69114,10 +69025,7 @@ /area/crew_quarters/heads/chief) "rIS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -69141,15 +69049,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "rJy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -69166,7 +69074,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/vault, @@ -69206,11 +69114,11 @@ /area/maintenance/department/security/brig) "rJX" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -69219,13 +69127,13 @@ }, /area/quartermaster/office) "rKe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -69265,7 +69173,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "rKB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "rKC" = ( @@ -69298,21 +69206,27 @@ /turf/open/floor/iron/grid, /area/medical/virology) "rLa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "rLd" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "rLf" = ( @@ -69364,7 +69278,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow{ @@ -69377,8 +69291,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -69432,7 +69346,7 @@ /area/maintenance/department/security/brig) "rMz" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 8 }, /turf/open/floor/iron, @@ -69475,8 +69389,8 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -69493,7 +69407,7 @@ /turf/open/floor/wood, /area/lawoffice) "rNo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -69521,7 +69435,7 @@ c_tag = "Medbay - Sleepers"; name = "medbay camera" }, -/turf/open/floor/iron/dark/airless, +/turf/open/floor/iron/dark, /area/medical/surgery) "rNL" = ( /obj/effect/turf_decal/bot, @@ -69538,7 +69452,7 @@ /turf/open/space/basic, /area/space/nearstation) "rNP" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 8 }, /turf/open/floor/engine/co2/light, @@ -69547,20 +69461,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/port) "rOa" = ( /obj/machinery/power/rad_collector/anchored, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/effect/turf_decal/stripes/red/line, @@ -69571,7 +69485,6 @@ "rOe" = ( /obj/machinery/door/airlock/external, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -69587,15 +69500,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/side{ dir = 1 }, /area/medical/surgery) "rOn" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -69614,8 +69524,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -69653,10 +69563,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "rOQ" = ( @@ -69675,10 +69583,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -69691,10 +69599,10 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/central) "rOU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -69761,10 +69669,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -69773,20 +69681,23 @@ /turf/open/floor/iron, /area/security/main) "rPl" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/starboard) "rPy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light/small, @@ -69803,7 +69714,7 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /obj/item/radio/intercom{ @@ -69819,10 +69730,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "rPI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -69834,20 +69745,20 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "rPL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "rPR" = ( /turf/closed/wall, /area/security/courtroom) "rPS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -69925,12 +69836,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/central) "rQI" = ( /obj/effect/landmark/start/botanist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -69950,10 +69861,10 @@ /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) "rQY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/button/door{ @@ -70023,19 +69934,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "rRP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock{ @@ -70045,10 +69953,10 @@ /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) "rSq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/dorms) "rSD" = ( @@ -70065,12 +69973,6 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "rSR" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, @@ -70090,10 +69992,10 @@ /turf/open/floor/iron/dark, /area/chapel/office) "rSZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock{ @@ -70149,10 +70051,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "rUk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/button/door{ @@ -70168,7 +70070,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -70177,8 +70079,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -70199,10 +70101,7 @@ /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "rVk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -70212,6 +70111,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "rVp" = ( @@ -70301,10 +70203,10 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "rWj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -70383,15 +70285,15 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/fore) "rXc" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "rXf" = ( @@ -70408,7 +70310,7 @@ /turf/closed/wall/r_wall, /area/maintenance/department/engine) "rXD" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2/light, /area/engine/atmos) "rXH" = ( @@ -70513,10 +70415,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/white, @@ -70551,14 +70453,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/guideline/guideline_in_arrow/red{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -70586,10 +70488,10 @@ /turf/open/space, /area/solar/port) "rZN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -70678,10 +70580,10 @@ /turf/open/space/basic, /area/solar/starboard/fore) "sbj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -70707,12 +70609,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -70722,6 +70618,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "sbJ" = ( @@ -70757,7 +70659,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -70773,19 +70675,19 @@ /turf/open/floor/iron/grid/steel, /area/science/explab) "scj" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, /turf/open/floor/engine, /area/engine/engine_room) "scq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/side, @@ -70798,13 +70700,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/techmaint, /area/science/shuttle) "scz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /turf/open/floor/iron/tech/grid, /area/engine/engine_room) "scF" = ( @@ -70825,7 +70728,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "scR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/light_switch{ pixel_x = -24 @@ -70841,8 +70744,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/science/xenobiology) "sda" = ( @@ -70852,10 +70755,10 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "sdb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -70867,6 +70770,7 @@ id = "barcounter"; name = "Bar Counter Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "sdg" = ( @@ -70894,6 +70798,7 @@ id = "barcounter"; name = "Bar Counter Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "sdA" = ( @@ -70905,7 +70810,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -70965,7 +70870,7 @@ /area/maintenance/central) "sfb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -70992,8 +70897,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71065,10 +70970,10 @@ /area/bridge) "sgg" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -71089,7 +70994,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -71101,7 +71006,7 @@ /turf/closed/wall, /area/vacant_room/commissary/commissaryFood) "shb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -71110,7 +71015,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail{ @@ -71154,15 +71059,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/corner{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/solars/port) "shI" = ( @@ -71171,14 +71076,17 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "shJ" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/hallway/primary/fore) "shK" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -71195,18 +71103,18 @@ /area/maintenance/aft/secondary) "shP" = ( /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "sif" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71315,6 +71223,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/grid/steel, /area/gateway) "siW" = ( @@ -71324,7 +71238,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -71333,7 +71247,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/science/lobby) "sjs" = ( @@ -71343,10 +71257,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -71373,8 +71287,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -71401,14 +71315,14 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "skf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -71448,7 +71362,7 @@ name = "Science Maintenance"; req_access_txt = "47" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71459,7 +71373,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71481,10 +71395,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/landmark/event_spawn, @@ -71514,7 +71428,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/white, /area/science/xenobiology) "sme" = ( @@ -71542,7 +71456,7 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -71600,10 +71514,10 @@ /turf/open/floor/wood, /area/library) "smI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/extinguisher_cabinet{ @@ -71620,8 +71534,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -71637,21 +71551,21 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "snf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard/fore) "snm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "snr" = ( @@ -71679,12 +71593,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "snU" = ( @@ -71700,8 +71612,8 @@ /area/crew_quarters/heads/hos) "soa" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71733,13 +71645,13 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) "soH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -71749,7 +71661,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "soQ" = ( @@ -71781,19 +71693,16 @@ /turf/open/floor/iron/techmaint, /area/crew_quarters/locker) "spl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/iron/sepia, /area/science/shuttle) "spA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/medical/surgery) "spI" = ( @@ -71848,18 +71757,17 @@ name = "Storage Room"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/aft) "sqU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/medical) "sqV" = ( -/turf/open/floor/plating{ - broken = 1 - }, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/color_adapter, +/turf/open/floor/iron, +/area/engine/atmos) "srw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -71935,7 +71843,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction{ @@ -71992,10 +71900,10 @@ }, /area/science/robotics/lab) "stj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -72076,19 +71984,26 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/stairs/right{ dir = 8 }, /area/crew_quarters/dorms) "sup" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -72111,8 +72026,6 @@ name = "Main Docking Port" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/port) "suE" = ( @@ -72122,13 +72035,6 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/science/shuttle) -"suJ" = ( -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/engine/atmos) "suQ" = ( /obj/structure/sign/departments/minsky/medical/medical2, /turf/closed/wall/r_wall, @@ -72174,10 +72080,10 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port) "svz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -72198,7 +72104,7 @@ /area/maintenance/aft/secondary) "svR" = ( /obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -72214,8 +72120,8 @@ /turf/open/floor/iron, /area/hallway/primary/port) "swv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -72236,7 +72142,7 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -72255,7 +72161,7 @@ /area/science/explab) "swI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/main) "swK" = ( @@ -72282,7 +72188,7 @@ /turf/open/floor/plating, /area/construction/mining/aux_base) "sxm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -72302,16 +72208,16 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "sxH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -72351,9 +72257,21 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"sxS" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/gateway) "sxV" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -72362,7 +72280,7 @@ /area/crew_quarters/bar/atrium) "sxX" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/chair/stool/bar/directional/south, @@ -72373,13 +72291,13 @@ name = "AI Foyer"; req_one_access_txt = "32;19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -72427,7 +72345,7 @@ "syY" = ( /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/chair/stool/bar/directional/south, @@ -72455,6 +72373,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/bridge) "szp" = ( @@ -72513,7 +72434,7 @@ /obj/machinery/camera/directional/north{ c_tag = "Interrogation room" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light/small{ @@ -72523,7 +72444,7 @@ /area/security/main) "szM" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -72556,10 +72477,10 @@ /turf/open/floor/wood, /area/hallway/primary/port) "sAE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -72589,16 +72510,13 @@ /area/hallway/primary/port) "sAP" = ( /obj/structure/lattice, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "sAU" = ( /obj/machinery/status_display/evac{ pixel_y = 32 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) @@ -72657,10 +72575,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/genetics) "sBH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -72690,7 +72608,7 @@ /turf/open/floor/prison, /area/security/prison) "sBS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/tech) "sBW" = ( @@ -72812,6 +72730,7 @@ id = "barcounter"; name = "Bar Counter Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "sCS" = ( @@ -72843,10 +72762,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -72856,8 +72775,8 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "sDA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -72895,7 +72814,7 @@ /turf/open/floor/iron, /area/security/main) "sDI" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/engineering/glass{ @@ -72955,7 +72874,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/vault, /area/crew_quarters/heads/hor) @@ -72966,8 +72885,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) @@ -72995,7 +72914,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid, @@ -73008,7 +72927,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -73023,7 +72942,7 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -73070,7 +72989,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "sGa" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -73130,16 +73049,16 @@ }, /area/engine/atmos) "sHj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/plating, /area/maintenance/port/aft) "sHu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/guideline/guideline_mid/purple{ dir = 4 @@ -73254,10 +73173,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -73303,7 +73222,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/starboard/central) "sJZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -73319,13 +73238,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/medical/medbay/central) "sKZ" = ( @@ -73387,6 +73306,17 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/techmaint, /area/security/prison) +"sLN" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/central) "sMk" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -73412,16 +73342,17 @@ /turf/open/floor/iron, /area/quartermaster/sorting) "sMw" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Main Docking Port" +/obj/machinery/door/airlock/public/glass{ + name = "Arrivals Dock" }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/iron/techmaint, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "sMz" = ( /obj/structure/chair/fancy/sofa/old/left{ @@ -73473,9 +73404,6 @@ /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "sNb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/quartermaster/office) "sNc" = ( @@ -73497,6 +73425,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/drydock) "sNs" = ( @@ -73524,7 +73453,7 @@ /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -73535,7 +73464,7 @@ /turf/open/floor/iron, /area/engine/atmos) "sND" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -73550,11 +73479,11 @@ /turf/open/floor/plating, /area/maintenance/port) "sNH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 1 }, /turf/open/floor/iron/dark, @@ -73612,10 +73541,11 @@ /obj/effect/turf_decal/trimline/purple/line{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/grid/steel, /area/science/research) "sOH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -73665,8 +73595,8 @@ /turf/open/floor/plating, /area/security/checkpoint/customs) "sOX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/orange{ @@ -73695,7 +73625,7 @@ /obj/structure/sign/warning/radiation{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -73720,7 +73650,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /obj/item/stack/marker_beacon{ anchored = 1; icon_state = "markerburgundy-on"; @@ -73738,7 +73668,7 @@ }, /area/docking/arrival) "sQi" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "sQn" = ( @@ -73823,14 +73753,14 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "sRl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/firealarm/directional/west, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "sRn" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /turf/open/floor/iron, @@ -73851,10 +73781,7 @@ /obj/machinery/door/airlock/external{ name = "Shuttle Construction Yard" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -73880,7 +73807,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "sRD" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -73893,8 +73820,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -73921,7 +73848,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -73959,7 +73886,7 @@ /turf/open/floor/engine/light, /area/science/explab) "sSw" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/floor/iron, @@ -73987,18 +73914,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/science/lab) -"sTj" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/port/central) "sTm" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -74055,7 +73973,7 @@ req_access_txt = "31" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -74115,7 +74033,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -74146,7 +74064,7 @@ /area/hallway/primary/port) "sUD" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine, @@ -74174,10 +74092,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -74217,11 +74135,9 @@ /turf/open/floor/iron, /area/hallway/primary/central) "sVM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "sVP" = ( @@ -74231,7 +74147,7 @@ }, /area/maintenance/starboard/aft) "sVQ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/catwalk_floor, /area/engine/engine_room) "sVS" = ( @@ -74265,7 +74181,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -74279,7 +74195,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -74290,7 +74206,7 @@ /area/hallway/primary/port) "sWv" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -74329,9 +74245,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -74351,10 +74264,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -74392,10 +74305,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -74430,10 +74343,10 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port) "sYC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -74474,11 +74387,10 @@ /turf/open/floor/plating, /area/quartermaster/storage) "sYT" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -74486,6 +74398,11 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "sYV" = ( @@ -74495,7 +74412,7 @@ /turf/open/floor/iron/dark, /area/gateway) "sYX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -74508,7 +74425,7 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "sZm" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -74605,8 +74522,8 @@ id_tag = "stallfood"; name = "Food Commissary" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -74635,7 +74552,7 @@ /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/dress/redeveninggown, /obj/item/clothing/head/costume/rabbitears, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/carpet/red, @@ -74645,7 +74562,7 @@ /area/hallway/primary/starboard) "taH" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/plating, @@ -74657,13 +74574,13 @@ /turf/closed/wall/r_wall, /area/construction/mining/aux_base) "taV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "tbf" = ( @@ -74700,7 +74617,7 @@ dir = 1 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -74774,12 +74691,10 @@ /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness/recreation) "tce" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hydroponics) "tcf" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -74790,6 +74705,12 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "tcl" = ( @@ -74810,7 +74731,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -74873,12 +74794,12 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/grimy, /area/library) "teK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -74889,15 +74810,13 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "teQ" = ( @@ -74941,7 +74860,7 @@ name = "Corporate Showroom"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -74977,12 +74896,6 @@ /area/storage/tech) "tgi" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -75002,6 +74915,7 @@ "tgx" = ( /obj/effect/turf_decal/stripes/full, /obj/effect/turf_decal/stripes/white/full, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/drydock/security) "tgQ" = ( @@ -75071,7 +74985,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "thS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/structure/lattice/catwalk, /turf/open/floor/plating, /area/engine/engine_room) @@ -75129,7 +75043,7 @@ /turf/open/floor/carpet/royalblack, /area/bridge/showroom/corporate) "tiA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) "tiC" = ( @@ -75153,8 +75067,8 @@ "tiM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -75197,7 +75111,7 @@ /turf/open/floor/iron/cafeteria, /area/vacant_room/commissary/commissaryFood) "tjq" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 }, /obj/structure/lattice/catwalk/over, @@ -75207,8 +75121,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) "tjy" = ( @@ -75251,7 +75165,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "tke" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -75312,10 +75226,10 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "tkM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/button/door{ @@ -75339,8 +75253,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) @@ -75371,7 +75285,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "tlu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -75401,10 +75315,10 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -75416,10 +75330,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75448,10 +75362,10 @@ }, /area/maintenance/port/aft) "tno" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock{ @@ -75464,9 +75378,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/engineering{ name = "Port Quarter Solar Access"; req_access_txt = "10" @@ -75485,13 +75399,14 @@ "tnU" = ( /obj/effect/turf_decal/stripes/full, /obj/effect/turf_decal/stripes/white/full, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/docking/bridge) "tok" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock{ @@ -75501,8 +75416,8 @@ /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) "too" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -75577,8 +75492,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -75587,9 +75502,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -75611,13 +75526,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -75631,10 +75546,10 @@ }, /area/hallway/primary/central) "tpK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/button/door{ @@ -75647,7 +75562,7 @@ /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "tpM" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/iron/ameridiner, @@ -75704,10 +75619,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -75731,20 +75646,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/medical/storage) -"tqK" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -26 - }, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/exit/departure_lounge) "tqQ" = ( /obj/item/toy/plush/flushed{ pixel_x = 4; @@ -75764,16 +75665,18 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "tra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/sepia, /area/science/shuttle) "trc" = ( @@ -75823,10 +75726,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -75844,8 +75747,8 @@ /turf/open/floor/iron, /area/security/main) "tsf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/guideline/guideline_mid/purple{ dir = 4 @@ -75924,7 +75827,7 @@ /turf/open/floor/iron/freezer, /area/medical/surgery) "ttk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/dark, /area/engine/storage) @@ -75938,7 +75841,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/dorms) "ttC" = ( @@ -75957,10 +75860,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/junction/flip{ @@ -75969,29 +75872,22 @@ /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "ttK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "ttO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/aft) "ttS" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -76051,8 +75947,8 @@ "tus" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -76159,8 +76055,8 @@ /turf/open/floor/iron/dark/side, /area/hallway/primary/central) "twb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -76186,14 +76082,19 @@ /turf/open/floor/plating/airless, /area/solar/port/aft) "twx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/stairs/medium{ dir = 1 }, @@ -76206,7 +76107,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -76217,7 +76118,7 @@ /area/engine/engine_room) "twS" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/closed/wall/r_wall, @@ -76253,7 +76154,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -76262,19 +76163,6 @@ }, /turf/open/floor/iron, /area/security/main) -"txE" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/catwalk_floor, -/area/maintenance/department/engine) "txJ" = ( /obj/docking_port/stationary{ dir = 8; @@ -76350,7 +76238,7 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "tyX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "tzj" = ( @@ -76380,13 +76268,12 @@ /turf/open/floor/prison, /area/security/prison) "tzR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron/checker, /area/quartermaster/storage) "tzS" = ( @@ -76419,7 +76306,7 @@ /area/maintenance/starboard/central) "tAi" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, @@ -76484,7 +76371,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine{ @@ -76516,8 +76403,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, /area/security/checkpoint/customs) @@ -76560,7 +76447,7 @@ /area/maintenance/department/security/brig) "tBH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -76603,7 +76490,7 @@ /turf/open/floor/cult, /area/library) "tCk" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -76687,7 +76574,7 @@ req_access_txt = "55" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76705,11 +76592,11 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "tCQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -76726,21 +76613,29 @@ /obj/machinery/door/airlock/public/glass{ name = "Arrivals Dock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "tDI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/item/storage/secure/safe{ @@ -76830,10 +76725,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison, @@ -76862,8 +76757,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) +"tFJ" = ( +/obj/machinery/rnd/server, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/floor/iron/techmaint, +/area/science/server) "tFZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ @@ -77002,19 +76905,16 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port) "tIl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -77032,12 +76932,11 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "tIE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/stripes/corner, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/ameridiner, @@ -77052,10 +76951,10 @@ /turf/open/floor/iron/checker, /area/quartermaster/storage) "tIH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/button/door{ @@ -77068,13 +76967,12 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "tIJ" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron, -/area/medical/break_room) +/turf/open/floor/iron/dark, +/area/bridge) "tIL" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -77097,10 +76995,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "tIN" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "tIU" = ( @@ -77128,7 +77026,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -77139,16 +77037,16 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, /area/security/prison) "tJz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock{ @@ -77183,16 +77081,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) +"tKe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/research) "tKq" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -77235,17 +77141,16 @@ }, /area/crew_quarters/locker) "tKM" = ( -/obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/advanced_airlock_controller/directional/west, -/obj/machinery/light/small{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/turf/open/floor/plating, -/area/science/shuttledock) +/obj/structure/cable/yellow, +/turf/open/floor/iron/grid/steel, +/area/hallway/secondary/entry) "tKO" = ( /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -77267,7 +77172,7 @@ /turf/open/floor/iron/techmaint, /area/engine/engine_room) "tKV" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/engine{ @@ -77306,14 +77211,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "tLw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/siding/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/chapel/main) +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "tLB" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -77321,8 +77227,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "tLH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -77334,9 +77240,14 @@ /turf/open/floor/wood, /area/medical/exam_room) "tLV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/dorms) "tMf" = ( /obj/structure/closet/secure_closet/contraband/armory, /obj/effect/spawner/lootdrop/maintenance/three, @@ -77367,7 +77278,7 @@ /obj/item/folder, /obj/item/toy/figure/engineer, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77384,15 +77295,13 @@ name = "Labour Shuttle Airlock"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "tMP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 8 }, /turf/open/floor/engine/n2o/light, @@ -77419,10 +77328,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -77491,8 +77400,8 @@ /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissary2) "tOs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -77505,7 +77414,7 @@ /turf/open/floor/glass/reinforced, /area/hallway/secondary/service) "tOE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -77518,10 +77427,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/poddoor/preopen{ @@ -77573,10 +77482,14 @@ /turf/open/floor/prison, /area/security/prison) "tPe" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "tPg" = ( @@ -77603,13 +77516,15 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "tPm" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/machinery/door/poddoor/shutters/preopen{ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/lobby) "tPn" = ( @@ -77622,10 +77537,10 @@ pixel_y = 24 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line, @@ -77655,10 +77570,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -77666,15 +77581,13 @@ }, /area/hallway/primary/port) "tPL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/checker, /area/quartermaster/storage) "tPT" = ( @@ -77746,10 +77659,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77792,10 +77705,10 @@ req_access_txt = "24" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -77836,13 +77749,13 @@ /turf/open/floor/iron/ridged, /area/crew_quarters/toilet/restrooms) "tSz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -77908,18 +77821,12 @@ /turf/open/floor/iron, /area/hallway/primary/port) "tTj" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 10 - }, -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/storage/primary) "tTo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/disposal) "tTr" = ( @@ -77980,10 +77887,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "tTX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -77993,6 +77897,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "tTZ" = ( @@ -78056,8 +77963,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) @@ -78160,8 +78067,8 @@ /turf/open/floor/prison, /area/security/prison) "tWg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/guideline/guideline_mid_arrow_con/purple{ dir = 10 @@ -78202,7 +78109,7 @@ /area/space/nearstation) "tWH" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -78283,19 +78190,24 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "tXl" = ( @@ -78316,9 +78228,6 @@ /turf/closed/wall, /area/engine/engineering) "tXP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 @@ -78339,7 +78248,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, @@ -78373,16 +78282,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library/lounge) "tZq" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Thermoelectric Generator Input" @@ -78390,6 +78296,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "tZC" = ( @@ -78493,18 +78400,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "ubb" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78516,8 +78423,8 @@ /turf/open/floor/iron/techmaint, /area/storage/tools) "ubc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78525,7 +78432,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "ubg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 8 }, /turf/open/floor/engine/vacuum/light, @@ -78572,7 +78479,7 @@ /turf/open/floor/plating, /area/security/checkpoint/science/research) "ubW" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 1 }, /turf/open/floor/engine/o2/light, @@ -78581,10 +78488,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -78596,8 +78503,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -78618,8 +78525,8 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hos) "ucJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/junction, /obj/effect/turf_decal/guideline/guideline_mid/purple{ dir = 4 @@ -78646,10 +78553,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -78664,7 +78571,7 @@ /turf/open/floor/noslip/standard, /area/crew_quarters/fitness/recreation) "udf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, /turf/open/floor/iron/techmaint, @@ -78685,10 +78592,10 @@ /turf/open/floor/carpet/royalblack, /area/bridge/showroom/corporate) "udE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -78764,7 +78671,7 @@ /turf/open/floor/grass/no_border, /area/crew_quarters/bar/atrium) "uek" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/engineering{ name = "Engineering Access"; req_access_txt = "10" @@ -78849,12 +78756,6 @@ /area/crew_quarters/bar/atrium) "ufE" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/bot, /obj/structure/sign/nanotrasen{ pixel_y = 32 @@ -78868,10 +78769,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -78891,10 +78792,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -78941,7 +78842,7 @@ /turf/open/floor/iron, /area/maintenance/department/security/brig) "ugU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ dir = 1 }, /turf/open/floor/engine/o2/light, @@ -78970,7 +78871,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/red/line{ @@ -78992,10 +78893,10 @@ /turf/open/floor/grass, /area/hydroponics/garden) "uhU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -79004,16 +78905,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, /turf/open/floor/engine, /area/engine/engine_room) "uhW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -79064,7 +78965,7 @@ pixel_x = -5; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "uiF" = ( @@ -79077,8 +78978,8 @@ name = "Departures Lounge" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/chapel/main) "uiJ" = ( @@ -79155,10 +79056,13 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/office) "uke" = ( @@ -79207,12 +79111,15 @@ /turf/open/floor/iron/dark, /area/quartermaster/sorting) "ukZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "ule" = ( @@ -79226,9 +79133,11 @@ /turf/open/floor/prison, /area/security/prison) "ulg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet, -/area/medical/exam_room) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/library/lounge) "ulh" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -79253,7 +79162,6 @@ name = "External Airlock"; req_one_access_txt = "13;24;10" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "ulx" = ( @@ -79305,7 +79213,7 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "ulX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -79320,7 +79228,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -79340,7 +79248,7 @@ /obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -79350,7 +79258,7 @@ /turf/open/floor/iron/grid/steel, /area/storage/primary) "umj" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -79397,7 +79305,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/stairs/medium{ @@ -79408,10 +79316,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -79419,8 +79327,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "unn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -79444,10 +79352,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -79499,10 +79407,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/wood, @@ -79519,10 +79427,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -79542,9 +79450,6 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "upi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -79573,10 +79478,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -79589,7 +79494,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/customs) "upL" = ( @@ -79611,7 +79516,7 @@ "uqq" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/teleporter) "uqv" = ( @@ -79619,10 +79524,10 @@ /area/storage/tools) "uqD" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/box, @@ -79679,14 +79584,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/science/research) "urh" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/plating, @@ -79707,8 +79612,6 @@ name = "Labour Shuttle Airlock"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "urx" = ( @@ -79722,15 +79625,13 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid, /area/crew_quarters/toilet/restrooms) "usf" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/genetics) "uso" = ( @@ -79743,10 +79644,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -79780,13 +79681,13 @@ "usA" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/misc/assistantformal, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "usI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -79847,10 +79748,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/fireaxecabinet{ @@ -79880,14 +79781,14 @@ /turf/open/floor/grass, /area/medical/medbay/central) "utQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/sign/warning/radiation/rad_area{ @@ -79906,10 +79807,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -79999,10 +79900,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -80016,10 +79917,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -80071,10 +79972,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -80111,8 +80012,8 @@ /turf/open/floor/plating, /area/security/checkpoint/supply) "uvX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -80151,10 +80052,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/port) "uwt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -80175,8 +80076,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -80201,10 +80102,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -80290,7 +80191,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "uxw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -80371,7 +80272,7 @@ /turf/open/floor/iron/techmaint, /area/engine/engine_room) "uzf" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, @@ -80384,10 +80285,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "uzy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock{ @@ -80435,7 +80336,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -80460,9 +80364,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "uzV" = ( @@ -80474,16 +80380,14 @@ pixel_x = -24 }, /obj/effect/turf_decal/box, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/drydock/security) "uAb" = ( /obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -80495,7 +80399,7 @@ /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "uAg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -80515,7 +80419,7 @@ dir = 1 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -80551,10 +80455,10 @@ icon_state = "0-2" }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -80569,6 +80473,7 @@ /obj/structure/cable/orange{ dir = 1 }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/drydock/security) "uAZ" = ( @@ -80593,7 +80498,7 @@ /turf/open/floor/iron/dark/side, /area/crew_quarters/theatre/backstage) "uBs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -80700,6 +80605,12 @@ /obj/effect/turf_decal/guideline/guideline_in_alt/blue, /turf/open/floor/iron, /area/hallway/primary/central) +"uCQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/gateway) "uCS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/nanotrasen_logo, @@ -80736,8 +80647,8 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "uDs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, @@ -80745,10 +80656,7 @@ /area/vacant_room/commissary/commissaryFood) "uDx" = ( /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -80763,6 +80671,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "uDC" = ( @@ -80790,6 +80701,9 @@ "uEa" = ( /obj/machinery/rnd/server, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, /turf/open/floor/iron/techmaint, /area/science/server) "uEn" = ( @@ -80802,15 +80716,15 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "uEz" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "uEQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -80866,8 +80780,6 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "uFq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -80875,6 +80787,12 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/lobby) "uFy" = ( @@ -80898,10 +80816,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/red/warning{ @@ -80918,16 +80836,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/prison, /area/security/prison) "uFQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/food/pie_smudge, @@ -81000,14 +80918,13 @@ /turf/open/floor/iron/techmaint, /area/engine/engine_room) "uGH" = ( -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -81016,6 +80933,12 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) "uGP" = ( @@ -81045,7 +80968,7 @@ /turf/open/floor/iron/dark, /area/security/warden) "uGR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -81054,15 +80977,15 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) "uGV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 10 }, /obj/structure/disposalpipe/segment, @@ -81073,13 +80996,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/grid/steel, /area/crew_quarters/locker) "uHo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -81087,7 +81010,7 @@ /area/security/checkpoint/supply) "uHp" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/grid/steel, /area/crew_quarters/locker) @@ -81128,8 +81051,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /mob/living/basic/cockroach, /turf/open/floor/plating, /area/maintenance/port/central) @@ -81162,10 +81085,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "uIE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -81213,6 +81136,7 @@ /area/bridge) "uJr" = ( /obj/effect/spawner/xmastree, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) "uJy" = ( @@ -81255,20 +81179,23 @@ /turf/open/floor/plating, /area/maintenance/port) "uJJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, -/area/maintenance/disposal) +/area/hallway/secondary/exit/departure_lounge) "uJQ" = ( /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/bridge) "uJW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/warehouse) @@ -81302,10 +81229,7 @@ /turf/closed/wall, /area/hallway/primary/port) "uKw" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -81316,6 +81240,7 @@ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "uKz" = ( @@ -81373,7 +81298,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -81383,13 +81308,16 @@ /turf/open/floor/iron, /area/hallway/primary/port) "uLI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/department/medical) "uLX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/guideline/guideline_mid/purple{ dir = 4 @@ -81441,13 +81369,13 @@ /turf/closed/mineral, /area/maintenance/disposal) "uMW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -81472,10 +81400,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -81493,10 +81421,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -81513,9 +81441,6 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/library/lounge) "uNK" = ( @@ -81570,10 +81495,10 @@ /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -81586,7 +81511,7 @@ codes_txt = "patrol;next_patrol=12.2-PortQmFrontR"; location = "12.1-QmCentre" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -81598,12 +81523,15 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "uOt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/central) "uOu" = ( @@ -81614,18 +81542,17 @@ /turf/open/floor/iron/grid/steel, /area/engine/engineering) "uOP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/iron/checker, -/area/quartermaster/storage) +/turf/open/floor/iron, +/area/hallway/secondary/entry) "uPe" = ( /obj/machinery/firealarm/directional/west, /obj/structure/chair/fancy/sofa/old/left{ @@ -81636,10 +81563,10 @@ /turf/open/floor/wood, /area/medical/exam_room) "uPi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -81652,20 +81579,14 @@ /turf/open/floor/iron, /area/engine/atmos) "uPJ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron/techmaint, /area/science/shuttle) "uPN" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -81688,13 +81609,13 @@ /area/security/checkpoint/supply) "uPP" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -81706,16 +81627,16 @@ /turf/open/floor/iron, /area/hallway/primary/port) "uPR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "uPW" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -81740,10 +81661,10 @@ /obj/effect/turf_decal/trimline/red/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -81753,17 +81674,17 @@ /turf/open/floor/prison, /area/security/prison) "uQy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/surgery) "uQB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -81780,6 +81701,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/central) +"uQI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "uQJ" = ( /obj/effect/spawner/room/tenxfive, /turf/open/floor/plating, @@ -81819,8 +81747,6 @@ /area/engine/gravity_generator) "uRw" = ( /obj/effect/turf_decal/stripes/openup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -81854,10 +81780,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -81868,10 +81794,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -81921,14 +81847,14 @@ /turf/open/floor/grass/no_border, /area/hallway/primary/central) "uTg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/red, /area/crew_quarters/bar/atrium) "uTB" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /turf/open/floor/iron, @@ -81947,15 +81873,14 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "uUa" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "uUc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -82075,24 +82000,25 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "uWu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/directional/west{ c_tag = "Science - Shuttle dock"; name = "science camera" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/shuttledock) "uWB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -82102,12 +82028,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, @@ -82163,14 +82083,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "uXj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -82197,7 +82120,7 @@ /area/hallway/secondary/service) "uXD" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers, /turf/open/floor/plating, /area/engine/atmos) "uXH" = ( @@ -82211,8 +82134,8 @@ /turf/open/floor/iron/freezer, /area/security/prison) "uXL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -82235,15 +82158,19 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "uXZ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/item/kirbyplants/random, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "uYs" = ( @@ -82254,10 +82181,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -82363,7 +82290,7 @@ /obj/item/radio/intercom{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -82433,7 +82360,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "uZU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /obj/machinery/meter, @@ -82449,10 +82376,10 @@ }, /area/quartermaster/warehouse) "uZY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -82481,13 +82408,17 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "var" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "vau" = ( @@ -82504,8 +82435,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -82515,6 +82445,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/escape) "vaF" = ( @@ -82532,6 +82463,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/drydock) "vaQ" = ( @@ -82550,13 +82482,13 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"vaY" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 +"vaW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/structure/lattice/catwalk/over, +/turf/open/floor/iron, +/area/hallway/primary/port) +"vaY" = ( /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "vbd" = ( @@ -82581,7 +82513,7 @@ /area/maintenance/department/security/brig) "vby" = ( /obj/machinery/igniter/incinerator_atmos, -/obj/machinery/air_sensor/atmos/incinerator_tank{ +/obj/machinery/air_sensor/incinerator_tank{ pixel_x = 32; pixel_y = 32 }, @@ -82661,17 +82593,26 @@ }, /turf/open/floor/iron/freezer, /area/medical/surgery) +"vcp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "vcv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) "vcy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -82683,7 +82624,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -82691,18 +82632,18 @@ /turf/open/floor/iron/techmaint, /area/security/nuke_storage) "vcF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/storage) "vcI" = ( /turf/open/floor/glass/reinforced, /area/security/main) "vcT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -82713,15 +82654,9 @@ /area/maintenance/port/central) "vcV" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, /turf/open/floor/iron/techmaint, /area/maintenance/port) "vcZ" = ( @@ -82766,10 +82701,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -82781,8 +82716,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) @@ -82796,13 +82731,13 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "vdW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -82816,8 +82751,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -82827,8 +82762,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance_hatch{ name = "Theatre Backstage"; @@ -82854,10 +82789,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -82919,18 +82851,16 @@ /turf/open/space, /area/solar/port/fore) "vfj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/science/lobby) "vfD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - broken = 1 - }, -/area/space/nearstation) +/obj/machinery/air_sensor/toxins_burn_chamber, +/turf/open/floor/engine/vacuum, +/area/science/mixing/chamber) "vfE" = ( /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall, @@ -82941,6 +82871,13 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/aft) +"vfI" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "vfL" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/corner{ @@ -83008,7 +82945,7 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) "vgC" = ( @@ -83036,7 +82973,7 @@ /area/hallway/secondary/exit/departure_lounge) "vhe" = ( /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -83045,7 +82982,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -83056,7 +82993,7 @@ }, /area/engine/atmos) "vhl" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -83067,7 +83004,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, @@ -83092,12 +83029,12 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "vhC" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 5 + }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "vhU" = ( @@ -83117,8 +83054,8 @@ /turf/open/floor/engine/o2/light, /area/engine/atmos) "vii" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -83182,7 +83119,7 @@ /turf/closed/wall, /area/vacant_room/commissary/commissary1) "viL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/sepia, /area/engine/break_room) @@ -83203,7 +83140,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -83238,18 +83174,24 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "vjj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/department/engine) "vjo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -83271,6 +83213,9 @@ pixel_x = -20; pixel_y = -21 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "vjs" = ( @@ -83294,7 +83239,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -83309,10 +83254,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -83341,7 +83286,7 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science) "vjW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -83375,8 +83320,8 @@ /turf/open/floor/iron, /area/hallway/primary/port) "vkx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -83395,7 +83340,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -83415,14 +83360,14 @@ name = "Service Foyer"; req_one_access_txt = "22;25;26;28;35;37;38;46" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -83468,10 +83413,10 @@ /turf/open/floor/iron/techmaint, /area/science/misc_lab) "vkY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -83509,10 +83454,11 @@ id = "barcounter"; name = "Bar Counter Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "vlS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -83522,7 +83468,7 @@ /turf/closed/wall, /area/storage/art) "vmb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -83533,7 +83479,7 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "vme" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -83548,7 +83494,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/medical/genetics) @@ -83563,10 +83509,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -83629,7 +83575,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -83678,8 +83624,8 @@ /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "vnZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -83706,10 +83652,10 @@ icon_state = "2-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -83719,7 +83665,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/stairs/right{ dir = 1 @@ -83746,8 +83692,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -83759,21 +83705,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/hallway/secondary/entry) "voV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/plasma/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "voW" = ( @@ -83867,7 +83813,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -83883,7 +83829,7 @@ "vqc" = ( /obj/machinery/power/rad_collector/anchored, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/red/line, @@ -83910,10 +83856,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "vqu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -83963,7 +83909,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -83975,12 +83921,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/fore) "vqS" = ( @@ -84077,16 +84028,13 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "vrS" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/cryo) "vrW" = ( @@ -84094,8 +84042,20 @@ c_tag = "Xenobiology - Kill Room"; name = "xenobiology camera" }, -/turf/open/floor/circuit/telecomms, +/turf/open/floor/circuit, /area/science/xenobiology) +"vsb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "vsd" = ( /obj/structure/table/wood/fancy, /obj/item/soulstone/anybody/chaplain, @@ -84111,7 +84071,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, @@ -84141,17 +84101,12 @@ dir = 10 }, /obj/effect/turf_decal/trimline/brown/filled/warning, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "vso" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "vsD" = ( @@ -84228,10 +84183,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "vtk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -84245,35 +84200,45 @@ }, /area/crew_quarters/fitness/recreation) "vtm" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/grid/steel, /area/hallway/primary/fore) "vtr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/stairs/left{ dir = 4 }, /area/crew_quarters/fitness/recreation) "vtx" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) "vty" = ( @@ -84301,8 +84266,8 @@ /obj/effect/turf_decal/guideline/guideline_out_arrow_con/yellow, /obj/effect/turf_decal/guideline/guideline_in_arrow_con/blue, /obj/effect/turf_decal/guideline/guideline_mid/purple, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -84333,10 +84298,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, @@ -84345,10 +84310,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -84373,10 +84338,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/chair/fancy/comfy{ @@ -84391,10 +84356,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -84435,7 +84400,7 @@ /turf/open/floor/iron/dark, /area/medical/storage) "vuJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/item/beacon, /turf/open/floor/iron, @@ -84444,6 +84409,9 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/maintenance/disposal) "vuQ" = ( @@ -84487,7 +84455,7 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "vuZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -84503,7 +84471,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/library/lounge) "vvb" = ( @@ -84530,11 +84498,14 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vvq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -84554,7 +84525,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "vvA" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -84593,7 +84564,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "vvL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -84637,10 +84608,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -84678,10 +84649,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -84725,10 +84696,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -84737,17 +84708,16 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "vwP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/crew_quarters/locker) "vwR" = ( -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/stairs/medium{ dir = 4 }, @@ -84793,17 +84763,11 @@ name = "External Airlock"; req_one_access_txt = "13;24;10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "vxE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/mining/glass{ @@ -84837,10 +84801,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -84849,12 +84813,20 @@ /turf/open/floor/plating, /area/maintenance/port/central) "vxQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, -/area/crew_quarters/locker) +/area/hallway/secondary/exit/departure_lounge) "vxT" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -84869,7 +84841,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/security/nuke_storage) @@ -84908,7 +84880,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "vyB" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -84950,10 +84922,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -84971,7 +84940,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "vzn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -85041,10 +85010,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -85066,13 +85035,13 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "vAg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -85096,16 +85065,16 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "vAl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/white, /area/science/research) "vAy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -85147,7 +85116,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -85178,8 +85147,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -85189,17 +85158,17 @@ name = "Chief Engineer's Quarters"; req_access_txt = "56" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/crew_quarters/heads/chief) "vBw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light/small, @@ -85215,7 +85184,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -85235,13 +85204,13 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -85269,13 +85238,13 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "vCi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/aft) "vCk" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark/side, /area/engine/atmos) "vCE" = ( @@ -85327,11 +85296,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "vDN" = ( @@ -85362,7 +85333,7 @@ /turf/closed/wall/r_wall, /area/gateway) "vEb" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 1 }, /turf/open/floor/engine/air/light, @@ -85390,7 +85361,13 @@ /area/quartermaster/sorting) "vEQ" = ( /obj/effect/turf_decal/stripes/full, -/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) "vER" = ( @@ -85417,7 +85394,7 @@ /turf/open/floor/plating, /area/science/nanite) "vFa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -85479,20 +85456,20 @@ }, /area/quartermaster/warehouse) "vFG" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "vFP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/crew_quarters/bar) "vFU" = ( @@ -85500,7 +85477,7 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -85518,6 +85495,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/airless, /area/docking/bridge) "vGr" = ( @@ -85541,7 +85519,7 @@ /turf/open/floor/prison, /area/security/prison) "vGD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side, @@ -85560,8 +85538,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -85579,7 +85557,7 @@ /turf/closed/wall/r_wall, /area/security/checkpoint/medical) "vHs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -85608,6 +85586,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "vHy" = ( @@ -85620,16 +85601,21 @@ /turf/open/floor/engine, /area/engine/gravity_generator) "vHL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron/dark/side, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/science/xenobiology) "vHQ" = ( /turf/open/floor/iron, /area/hallway/primary/central) "vIg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /obj/machinery/airalarm/directional/south{ @@ -85663,10 +85649,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -85684,16 +85670,16 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/central) "vIH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "vIM" = ( @@ -85713,10 +85699,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/quartermaster/storage) "vJa" = ( @@ -85763,8 +85747,8 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -85779,10 +85763,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/railing{ @@ -85794,7 +85778,7 @@ /turf/open/floor/plating, /area/maintenance/port) "vJz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/iron, @@ -85803,8 +85787,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, @@ -85872,7 +85856,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -85897,7 +85881,7 @@ /turf/open/floor/engine/light, /area/science/explab) "vKA" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -85931,25 +85915,25 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor, +/obj/structure/lattice/catwalk/over, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, /area/docking/bridge) "vKJ" = ( -/turf/open/floor/plating{ - broken = 1 - }, -/area/asteroid/nearstation) +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/turf/open/floor/plating, +/area/engine/engine_room) "vKW" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron/tech/grid, /area/maintenance/department/engine) @@ -86020,10 +86004,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -86041,10 +86025,10 @@ req_access_txt = "24" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -86071,10 +86055,7 @@ }, /area/maintenance/disposal) "vMO" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -86082,6 +86063,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/science/shuttle) "vMR" = ( @@ -86122,7 +86104,7 @@ /turf/open/floor/iron/dark, /area/medical/surgery) "vNt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -86131,7 +86113,7 @@ /turf/open/floor/iron, /area/engine/atmos) "vNu" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/light{ @@ -86162,13 +86144,11 @@ }, /area/crew_quarters/fitness/recreation) "vNy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "vNz" = ( @@ -86178,11 +86158,11 @@ /area/quartermaster/office) "vNA" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson{ pixel_y = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/plating, /area/engine/engine_room) "vND" = ( @@ -86190,7 +86170,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction{ dir = 2 }, @@ -86202,8 +86182,8 @@ /obj/item/clothing/glasses/meson{ pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /turf/open/floor/plating, /area/engine/engine_room) "vNT" = ( @@ -86226,10 +86206,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -86264,10 +86244,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -86358,10 +86338,10 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "vPc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -86374,7 +86354,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "vPl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -86405,10 +86385,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -86477,9 +86457,9 @@ /area/engine/atmos) "vQp" = ( /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/rack, /obj/item/pipe_dispenser, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/plating, /area/engine/engine_room) "vQs" = ( @@ -86497,8 +86477,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "vQG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/port) "vQJ" = ( @@ -86508,8 +86487,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "vQL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -86576,20 +86555,18 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "vRC" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light_switch{ @@ -86599,7 +86576,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "vRE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs, /area/science/misc_lab) "vRI" = ( @@ -86639,7 +86616,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/techmaint, /area/medical/morgue) "vRR" = ( @@ -86699,13 +86676,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -86742,19 +86719,24 @@ /turf/open/floor/iron, /area/construction) "vTc" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "vTg" = ( @@ -86764,7 +86746,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "vTi" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 1 }, /turf/open/floor/engine/n2/light, @@ -86874,8 +86856,8 @@ icon_state = "1-4" }, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/lobby) "vUR" = ( @@ -86902,10 +86884,10 @@ /turf/open/floor/iron/dark, /area/chapel/main) "vVb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -86944,8 +86926,8 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "vVG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -86978,6 +86960,7 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "vWr" = ( @@ -87003,9 +86986,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -87021,15 +87002,26 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) +"vWU" = ( +/obj/effect/turf_decal/stripes/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/secondary/entry) "vXA" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -87090,7 +87082,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "vYc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light{ @@ -87141,13 +87133,18 @@ /turf/open/floor/iron/dark/side, /area/hallway/secondary/exit/departure_lounge) "vYW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plating{ - broken = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/maintenance/port) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "vZb" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -87155,7 +87152,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -87173,8 +87170,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/central) "vZW" = ( @@ -87190,10 +87187,10 @@ /turf/open/floor/iron/ridged/steel, /area/science/storage) "vZX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -87214,15 +87211,19 @@ /turf/open/floor/iron/dark, /area/security/brig) "wad" = ( -/obj/machinery/door/firedoor, /obj/structure/railing, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/stairs/right{ dir = 4 }, /area/crew_quarters/fitness/recreation) "wam" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -87239,14 +87240,11 @@ /turf/open/floor/iron, /area/science/lab) "waz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 6 }, -/turf/open/floor/iron, -/area/storage/primary) +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "waG" = ( /obj/structure/table/wood, /obj/item/storage/photo_album, @@ -87266,6 +87264,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/stairs/medium{ dir = 8 }, @@ -87300,19 +87301,13 @@ dir = 8 }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/techmaint, /area/quartermaster/storage) "wby" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -87356,8 +87351,7 @@ /area/science/lab) "wcw" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -87368,6 +87362,7 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "wcA" = ( @@ -87403,11 +87398,11 @@ /turf/closed/wall/r_wall, /area/engine/break_room) "wdh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 1 }, @@ -87457,11 +87452,17 @@ /turf/open/floor/plating, /area/security/main) "wdy" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "wdH" = ( /obj/effect/turf_decal/tile/red/opposingcorners, @@ -87497,19 +87498,24 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/fore) "wej" = ( @@ -87525,7 +87531,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "wem" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -87607,8 +87613,8 @@ /obj/structure/sign/departments/restroom{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -87620,7 +87626,7 @@ /turf/open/floor/iron/grid, /area/crew_quarters/toilet/restrooms) "wfl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -87680,10 +87686,10 @@ }, /area/janitor) "wgq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -87700,10 +87706,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -87718,7 +87724,7 @@ /turf/open/floor/iron/grid/steel, /area/science/mixing) "wgX" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "wgY" = ( @@ -87742,10 +87748,10 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "wha" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -87766,7 +87772,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/ameridiner, @@ -87824,10 +87830,10 @@ }, /area/hallway/primary/port) "wiV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -87840,15 +87846,14 @@ icon_state = "4-8" }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/security/checkpoint/escape) "wjb" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/engine, /area/engine/engine_room) "wjr" = ( @@ -87864,7 +87869,7 @@ /area/maintenance/department/medical) "wjs" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 9 }, /turf/open/floor/engine, @@ -87881,7 +87886,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -87895,10 +87900,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -87912,10 +87917,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -87953,7 +87958,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /turf/open/floor/engine, @@ -87962,17 +87967,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/tech/grid, /area/maintenance/department/engine) "wkJ" = ( /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/chair/fancy/comfy{ color = "#666666"; dir = 1 @@ -87989,11 +87991,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/starboard) "wlc" = ( @@ -88019,7 +88026,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "wlC" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -88029,7 +88036,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "wlU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/locker) "wlV" = ( @@ -88040,8 +88047,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "wmu" = ( @@ -88099,12 +88106,6 @@ name = "External Docking Port"; req_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/techmaint, /area/maintenance/department/science) "wmM" = ( @@ -88146,17 +88147,17 @@ /obj/machinery/door/airlock/external{ name = "Main Docking Port" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "wnp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -88167,13 +88168,13 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; req_one_access_txt = "10;24;5" }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/aft) "wns" = ( @@ -88252,6 +88253,12 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) +"woI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "woJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/command{ @@ -88265,10 +88272,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -88282,20 +88289,32 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/engine/atmos) +"woW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/port) "woY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/storage/primary) "wpn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -88377,8 +88396,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/junction/flip{ dir = 1 @@ -88452,8 +88471,8 @@ /turf/open/floor/iron/grid/steel, /area/crew_quarters/bar/atrium) "wrm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "wrn" = ( @@ -88480,10 +88499,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "wrz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "wrE" = ( @@ -88494,8 +88513,6 @@ /obj/machinery/door/airlock/external{ name = "Labour Shuttle Airlock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -88518,13 +88535,13 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "wrO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -88552,7 +88569,7 @@ /turf/open/floor/iron/tiled, /area/medical/virology) "wrU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -88560,14 +88577,19 @@ "wrY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) +"wsg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/construction) "wsD" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -88599,12 +88621,10 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port/aft) "wsQ" = ( @@ -88626,7 +88646,7 @@ /turf/open/floor/plating, /area/security/checkpoint/customs) "wta" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -88668,7 +88688,7 @@ "wtQ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/science/misc_lab) "wtT" = ( @@ -88691,13 +88711,13 @@ /turf/open/floor/iron, /area/hallway/primary/port) "wub" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_smooth, @@ -88712,7 +88732,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood, /area/crew_quarters/theatre) "wui" = ( @@ -88742,7 +88761,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "wuu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/table, /obj/item/food/cheesiehonkers{ pixel_x = -4; @@ -88757,14 +88776,14 @@ /obj/machinery/door/airlock/public/glass{ name = "Gambling Den" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/crew_quarters/bar/atrium) "wuE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -88787,8 +88806,8 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "wuM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment, @@ -88814,7 +88833,8 @@ /turf/open/floor/plating, /area/hallway/primary/central) "wvB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, /turf/open/floor/vault, /area/science/server) "wvE" = ( @@ -88854,7 +88874,7 @@ }, /area/maintenance/aft/secondary) "wwp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/newscaster{ @@ -88863,6 +88883,9 @@ /obj/structure/chair/fancy/plastic{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/construction) "wws" = ( @@ -88885,8 +88908,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "wwZ" = ( @@ -88900,8 +88923,8 @@ /turf/closed/wall, /area/maintenance/port) "wxi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron/white, /area/medical/surgery) @@ -88923,8 +88946,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -88944,10 +88967,10 @@ /turf/open/floor/carpet/royalblack, /area/bridge/showroom/corporate) "wxD" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -88969,8 +88992,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/bridge) @@ -89004,12 +89027,15 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "wyE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "wyH" = ( @@ -89045,10 +89071,7 @@ /turf/open/floor/iron/techmaint, /area/science/robotics/lab) "wzn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -89125,8 +89148,8 @@ /area/hallway/secondary/entry) "wzL" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/heads/cmo) "wzS" = ( @@ -89134,8 +89157,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -89145,8 +89168,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/engineering/glass{ @@ -89181,15 +89204,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/wood, /area/security/detectives_office) "wAk" = ( /obj/effect/landmark/start/bartender, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -89233,14 +89256,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/light/small{ dir = 8 }, @@ -89258,6 +89273,7 @@ "wBn" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/crew_quarters/heads/cmo) "wBq" = ( @@ -89289,10 +89305,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -89315,18 +89331,18 @@ /turf/open/floor/iron/techmaint, /area/science/research) "wBU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "wCr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -89429,7 +89445,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "wEN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "wEO" = ( @@ -89472,10 +89488,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -89490,13 +89506,13 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/hop) "wFM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -89535,7 +89551,7 @@ /obj/structure/table/wood, /obj/item/storage/crayons, /obj/item/storage/firstaid/regular, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -89552,6 +89568,11 @@ "wGA" = ( /obj/machinery/door/firedoor, /obj/structure/railing, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, /turf/open/floor/iron/stairs/left{ dir = 8 }, @@ -89560,7 +89581,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -89582,16 +89603,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/heads/cmo) "wGU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -89628,8 +89647,8 @@ /turf/open/floor/grass/no_border, /area/science/research) "wHh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -89642,7 +89661,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "wHm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -89703,7 +89722,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -89722,11 +89741,8 @@ /area/maintenance/starboard/aft) "wIx" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1; - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, /turf/open/floor/iron/techmaint, /area/science/server) @@ -89760,12 +89776,12 @@ /turf/open/floor/iron/dark, /area/bridge) "wIK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "wIW" = ( @@ -89804,10 +89820,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -89836,18 +89852,18 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, /area/space/nearstation) -"wJv" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes/closeup{ - dir = 5 +"wJy" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 26; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/gateway) "wJL" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -89930,12 +89946,12 @@ /area/construction) "wLl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/main) "wLn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -89960,10 +89976,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -89986,10 +89999,10 @@ /turf/open/floor/plating, /area/maintenance/port) "wMa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -90030,10 +90043,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -90096,8 +90109,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "wNp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron, @@ -90129,6 +90142,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, +/obj/machinery/air_sensor/engine_chamber, /obj/effect/turf_decal/caution{ dir = 8 }, @@ -90146,7 +90160,7 @@ /turf/open/floor/iron/grid/steel, /area/science/lobby) "wOa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -90197,6 +90211,9 @@ /area/engine/atmos) "wOD" = ( /obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "wOG" = ( @@ -90218,7 +90235,9 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "wOP" = ( @@ -90226,6 +90245,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "wOR" = ( @@ -90233,8 +90253,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "wOU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -90248,16 +90268,16 @@ /turf/open/floor/iron/white, /area/science/shuttledock) "wPh" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "wPk" = ( @@ -90269,7 +90289,7 @@ /area/maintenance/starboard/aft) "wPr" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -90306,7 +90326,7 @@ dir = 1 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/holopad, @@ -90331,9 +90351,10 @@ /turf/open/space/basic, /area/science/mixing/chamber) "wQj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/shuttledock) "wQm" = ( @@ -90343,7 +90364,7 @@ }, /area/docking/arrival) "wQs" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron/ameridiner, @@ -90388,8 +90409,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/main) "wRD" = ( @@ -90422,10 +90443,10 @@ /turf/open/floor/engine/light, /area/science/xenobiology) "wRN" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -90436,14 +90457,20 @@ /area/maintenance/department/engine) "wRQ" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/cmo) "wRY" = ( /turf/closed/wall, /area/quartermaster/office) +"wSi" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/miningdock) "wSk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -90453,7 +90480,7 @@ /area/science/xenobiology) "wSw" = ( /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -90495,10 +90522,10 @@ /turf/open/floor/iron/sepia, /area/maintenance/disposal/incinerator) "wSQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -90511,12 +90538,12 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "wTb" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "wTf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/status_display/ai{ @@ -90561,10 +90588,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/railing/corner{ @@ -90579,7 +90606,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -90594,8 +90621,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -90609,9 +90636,7 @@ /obj/structure/railing/corner{ dir = 1 }, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating/airless, /area/asteroid/nearstation) "wTK" = ( /obj/effect/turf_decal/trimline/red/filled/line, @@ -90619,10 +90644,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -90634,27 +90659,25 @@ /turf/closed/wall, /area/hallway/primary/central) "wTN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) "wTY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail{ name = "Genetics Junction"; sortType = 23 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay/lobby) "wTZ" = ( @@ -90727,8 +90750,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -90747,10 +90770,10 @@ /turf/open/floor/plating, /area/science/robotics/lab) "wUO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -90828,10 +90851,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "wVi" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "wVq" = ( @@ -90902,10 +90928,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -90919,8 +90945,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/storage/art) @@ -90942,8 +90968,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; name = "biohazard Containment Door" @@ -90961,7 +90987,7 @@ name = "Auxiliary Tool Storage Maintenance"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/port/aft) "wWH" = ( @@ -90988,13 +91014,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "wWV" = ( @@ -91005,7 +91031,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/grid/steel, @@ -91041,17 +91067,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "wXA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet, /area/chapel/main) "wXE" = ( @@ -91062,10 +91085,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/grid/steel, @@ -91095,7 +91118,7 @@ /area/hallway/primary/fore) "wYg" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) @@ -91236,17 +91259,17 @@ /turf/open/space, /area/solar/port/aft) "wZu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) "wZy" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light{ dir = 8 }, @@ -91267,7 +91290,7 @@ /area/engine/atmos) "wZD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -91290,10 +91313,10 @@ /turf/open/floor/iron/techmaint, /area/crew_quarters/locker) "wZX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -91337,8 +91360,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -91358,19 +91381,16 @@ /turf/open/floor/carpet/royalblack, /area/bridge/showroom/corporate) "xao" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "xap" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -91438,19 +91458,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/light_switch{ pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, /area/crew_quarters/theatre) "xby" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating{ broken = 1 }, @@ -91470,6 +91493,8 @@ /obj/effect/turf_decal/siding/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "xbX" = ( @@ -91483,6 +91508,7 @@ "xcc" = ( /obj/effect/turf_decal/stripes/full, /obj/effect/turf_decal/stripes/white/full, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating, /area/drydock) "xcg" = ( @@ -91494,12 +91520,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) @@ -91547,10 +91567,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -91592,8 +91612,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -91605,12 +91625,12 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/theatre) "xdD" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -91665,10 +91685,6 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port) "xdT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -91688,8 +91704,8 @@ /area/hallway/primary/port) "xed" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -91744,12 +91760,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "xeC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/assistant, /obj/structure/chair/fancy/sofa/old/left, /turf/open/floor/iron, @@ -91759,8 +91775,8 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hor) "xeF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/maintenance/department/science) @@ -91772,7 +91788,7 @@ name = "Law Office"; req_access_txt = "38" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/structure/disposalpipe/segment, @@ -91787,10 +91803,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/quartermaster/miningdock) "xeY" = ( @@ -91801,8 +91813,14 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "xfb" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/fore) "xfd" = ( @@ -91814,10 +91832,10 @@ /turf/open/floor/iron/dark, /area/security/detectives_office) "xfm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -91849,9 +91867,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/disposal) @@ -91874,7 +91889,7 @@ icon_state = "1-4" }, /obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -91887,28 +91902,25 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/grimy, /area/library) "xfE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "xfN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/grid/steel, /area/engine/atmos) "xfR" = ( @@ -91993,7 +92005,7 @@ /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -92002,8 +92014,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 1 }, @@ -92082,8 +92094,8 @@ }, /area/crew_quarters/theatre/backstage) "xhb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -92136,7 +92148,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/plating/airless{ @@ -92145,7 +92157,7 @@ /area/docking/arrival) "xhU" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -92160,7 +92172,7 @@ }, /area/docking/arrival) "xid" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -92198,7 +92210,7 @@ /area/hallway/primary/central) "xiE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "xiG" = ( @@ -92206,9 +92218,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -92313,7 +92322,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "xjA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -92326,7 +92335,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid, @@ -92358,13 +92367,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/maintenance/department/science) "xkj" = ( @@ -92384,10 +92390,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -92403,8 +92409,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/aft) @@ -92429,8 +92435,8 @@ /turf/open/floor/iron, /area/maintenance/aft) "xkO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -92461,10 +92467,7 @@ /turf/open/floor/iron/dark, /area/security/brig) "xlg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -92473,10 +92476,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -92530,15 +92533,15 @@ /obj/machinery/meter{ name = "Mixed Air Tank Out" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "xlW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) @@ -92546,8 +92549,8 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/library) "xmu" = ( @@ -92564,12 +92567,12 @@ }, /area/medical/surgery) "xmv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "xmw" = ( @@ -92597,19 +92600,17 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/quartermaster/storage) "xmO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/event_spawn, @@ -92645,7 +92646,6 @@ /turf/open/floor/iron, /area/medical/break_room) "xmW" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/cable{ icon_state = "4-8" }, @@ -92653,6 +92653,7 @@ dir = 4; name = "Thermoelectric Generator Input" }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "xnb" = ( @@ -92682,8 +92683,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "xnr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -92736,7 +92737,7 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "xnO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, @@ -92745,10 +92746,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -92787,17 +92788,16 @@ /turf/open/floor/iron, /area/hallway/primary/central) "xoU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/ameridiner, /area/engine/engine_room) "xoZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/power/terminal{ dir = 4 @@ -92878,7 +92878,7 @@ /obj/machinery/status_display/ai{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "xqd" = ( @@ -92930,10 +92930,14 @@ name = "Security Escape Pod 4" }, /obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi, /turf/open/floor/iron/techmaint, /area/science/shuttle) "xqG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "xqH" = ( @@ -92948,9 +92952,15 @@ /turf/open/floor/plating, /area/bridge) "xqI" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/iron/grid/steel, /area/science/lobby) "xqJ" = ( @@ -92965,7 +92975,7 @@ /obj/structure/sign/painting/library{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/library/lounge) "xqO" = ( @@ -92991,8 +93001,8 @@ /turf/open/floor/iron/dark, /area/science/lab) "xqT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -93041,16 +93051,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "xrv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "xrI" = ( @@ -93070,7 +93077,7 @@ }, /area/docking/arrival) "xsj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -93096,19 +93103,19 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, /area/medical/medbay/central) "xsH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -93134,7 +93141,7 @@ /turf/open/floor/iron, /area/maintenance/central/secondary) "xsR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -93143,14 +93150,14 @@ /turf/open/floor/iron/grid/steel, /area/engine/storage_shared) "xsT" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/cable/orange{ icon_state = "1-8" }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "xsW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -93203,7 +93210,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -93212,18 +93219,25 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "xtt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/reagent_dispensers/watertank, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/department/medical) "xtu" = ( @@ -93323,8 +93337,8 @@ /area/maintenance/port) "xuL" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -93398,10 +93412,7 @@ /turf/closed/wall, /area/medical/cryo) "xvk" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /turf/open/floor/iron/ameridiner, @@ -93434,7 +93445,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "xvC" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -93451,8 +93462,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "xvQ" = ( @@ -93463,20 +93472,25 @@ /turf/open/floor/iron, /area/construction) "xvV" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/science/lobby) "xvW" = ( @@ -93495,6 +93509,7 @@ /area/security/detectives_office) "xwp" = ( /obj/effect/decal/cleanable/greenglow, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction) "xwv" = ( @@ -93524,15 +93539,14 @@ /obj/machinery/light_switch{ pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction) "xwO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -93560,8 +93574,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, @@ -93588,22 +93602,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "xxk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light/small, @@ -93613,7 +93625,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "xxs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) "xxt" = ( @@ -93645,9 +93657,12 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/construction) "xxw" = ( @@ -93670,7 +93685,7 @@ /area/quartermaster/storage) "xxG" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -93683,7 +93698,7 @@ /turf/closed/wall/r_wall, /area/science/test_area) "xxI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/start/scientist, @@ -93787,7 +93802,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/disposal/incinerator) "xyI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -93834,7 +93849,6 @@ c_tag = "Cargo - Mining Dock"; name = "cargo camera" }, -/obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "xzK" = ( @@ -93849,22 +93863,22 @@ /turf/open/floor/plating, /area/crew_quarters/locker) "xzW" = ( -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "xzY" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -93880,10 +93894,10 @@ /turf/open/floor/carpet, /area/chapel/main) "xAn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -93904,7 +93918,7 @@ name = "Atmospherics RC"; pixel_x = -30 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "xAq" = ( @@ -93915,17 +93929,17 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/fore) "xAs" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/turf/open/floor/circuit/green/telecomms/mainframe, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/circuit/green, /area/science/server) "xAt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "xAA" = ( @@ -94002,7 +94016,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "xBu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "xBx" = ( @@ -94028,8 +94042,8 @@ /obj/effect/turf_decal/trimline/purple/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -94107,23 +94121,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) "xCy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -94157,8 +94171,8 @@ /area/maintenance/department/engine) "xCP" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -94203,10 +94217,10 @@ /turf/open/floor/iron, /area/security/main) "xDh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -94295,16 +94309,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/storage) "xDS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/engineering/glass{ @@ -94337,8 +94351,8 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "xEa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -94387,9 +94401,6 @@ /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -94402,11 +94413,11 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science) "xEZ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -94437,8 +94448,8 @@ /turf/open/floor/iron/vaporwave, /area/crew_quarters/heads/hor) "xFq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, @@ -94448,8 +94459,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) "xFv" = ( @@ -94526,17 +94535,20 @@ /obj/item/bot_assembly/cleanbot, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/construction) "xGd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -94559,11 +94571,11 @@ "xGq" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "xGr" = ( @@ -94580,9 +94592,6 @@ name = "Labour Shuttle Airlock"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/bridge) "xGz" = ( @@ -94597,7 +94606,7 @@ }, /area/quartermaster/storage) "xGG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, @@ -94617,7 +94626,7 @@ /turf/open/floor/iron/dark/side, /area/hallway/primary/aft) "xHa" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/machinery/camera/directional/south, @@ -94641,7 +94650,7 @@ }, /area/hallway/primary/central) "xHj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -94650,7 +94659,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/junction/yjunction{ @@ -94659,13 +94668,13 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/science) "xHm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) "xHD" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 8 }, /turf/open/floor/engine/n2o/light, @@ -94692,8 +94701,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -94746,11 +94755,11 @@ /turf/open/floor/plating, /area/maintenance/central) "xIu" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2/light, /area/engine/atmos) "xIB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/library) "xIK" = ( @@ -94791,8 +94800,8 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -94806,10 +94815,10 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) "xIW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/mech_bay_recharge_floor, @@ -94832,10 +94841,10 @@ name = "Robotics Lab"; req_access_txt = "29" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -94851,13 +94860,13 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "xJr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -94881,13 +94890,14 @@ }, /area/quartermaster/sorting) "xJx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark/corner{ dir = 8 }, /area/hallway/primary/fore) "xJy" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ @@ -94930,10 +94940,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/tech/grid, @@ -94942,7 +94952,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -94955,9 +94965,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/science/robotics/lab) "xJU" = ( @@ -95154,9 +95167,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) @@ -95176,10 +95186,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -95197,10 +95207,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -95217,10 +95227,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/prison, @@ -95229,8 +95239,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=19-FoodCounter"; location = "18-BotanyCorner" @@ -95261,7 +95271,7 @@ /area/crew_quarters/dorms) "xMx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/locker) "xML" = ( @@ -95286,10 +95296,10 @@ name = "Engineering Storage"; req_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/firedoor, @@ -95329,7 +95339,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -95344,8 +95354,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/crew_quarters/cafeteria) "xNe" = ( @@ -95383,23 +95393,23 @@ /turf/open/floor/iron/grid/steel, /area/science/misc_lab/range) "xNK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "xNL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/carpet, /area/hallway/secondary/entry) @@ -95441,7 +95451,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/wood, /area/medical/exam_room) "xOt" = ( @@ -95503,13 +95515,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -95551,22 +95563,27 @@ /turf/open/floor/plating, /area/maintenance/disposal) "xPN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "xPP" = ( @@ -95575,8 +95592,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -95591,23 +95608,20 @@ /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) "xPU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/techmaint, /area/science/xenobiology) "xQc" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -95620,6 +95634,9 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "xQh" = ( @@ -95630,7 +95647,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "xQq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -95682,10 +95699,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "xRw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -95703,10 +95720,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/railing{ @@ -95760,10 +95777,10 @@ /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "xSr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -95798,6 +95815,20 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/locker) +"xSM" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/yellow, +/turf/open/floor/iron/grid/steel, +/area/hallway/primary/central) "xSV" = ( /turf/closed/wall/r_wall, /area/science/mixing) @@ -95824,10 +95855,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side, /area/crew_quarters/fitness/recreation) "xTl" = ( @@ -95844,8 +95875,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -95875,8 +95906,8 @@ /area/crew_quarters/fitness/recreation) "xUa" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -95885,10 +95916,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -95925,11 +95956,16 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "xUA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/chapel/main) +/turf/open/floor/iron, +/area/hallway/primary/aft) "xUB" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -95951,7 +95987,8 @@ /turf/closed/mineral, /area/engine/engine_room) "xVd" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 8 }, /turf/open/floor/iron, @@ -95995,7 +96032,7 @@ /turf/open/floor/engine, /area/science/xenobiology) "xVQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "xVU" = ( @@ -96032,8 +96069,8 @@ }, /area/docking/arrival) "xWn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -96052,7 +96089,7 @@ picked_color = "Burgundy" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ dir = 8 }, /obj/structure/lattice/catwalk/over, @@ -96084,9 +96121,6 @@ /obj/item/hand_labeler, /obj/item/hand_labeler, /obj/effect/spawner/lootdrop/gloves, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/item/radio/intercom{ pixel_y = 24 }, @@ -96116,7 +96150,7 @@ /turf/closed/mineral, /area/maintenance/aft) "xXd" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "xXj" = ( @@ -96153,8 +96187,8 @@ icon_state = "1-4" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -96203,7 +96237,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "xYp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/maintenance/aft) @@ -96228,16 +96262,16 @@ /area/lawoffice) "xYL" = ( /obj/effect/turf_decal/guideline/guideline_in/red, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_mid/purple, /obj/effect/turf_decal/guideline/guideline_out/yellow, /turf/open/floor/iron, /area/hallway/primary/port) "xYM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -96251,7 +96285,7 @@ /turf/open/floor/iron, /area/science/robotics/lab) "xYV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /turf/open/floor/iron, @@ -96266,16 +96300,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/storage) "xZi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -96304,7 +96338,7 @@ dir = 8 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/chair/fancy/bench/right{ @@ -96328,8 +96362,8 @@ pixel_x = -24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -96413,8 +96447,8 @@ /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/three, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -96481,7 +96515,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "yaP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "ybi" = ( @@ -96497,7 +96531,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/maintenance{ @@ -96540,8 +96574,8 @@ /turf/open/floor/iron/dark, /area/security/prison) "ycc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -96581,7 +96615,7 @@ /area/bridge) "yct" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) "ycD" = ( @@ -96594,8 +96628,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -96626,8 +96660,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -96635,10 +96669,10 @@ /turf/open/floor/iron/white, /area/science/research) "ydi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -96661,7 +96695,7 @@ /turf/open/floor/wood, /area/hallway/primary/port) "ydF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -96671,7 +96705,7 @@ /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -96704,10 +96738,10 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "ydT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -96781,10 +96815,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -96804,7 +96838,7 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/iron/dark/side{ @@ -96832,12 +96866,6 @@ /obj/machinery/door/airlock/external{ name = "Labour Shuttle Airlock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/bridge) "yfU" = ( @@ -96850,10 +96878,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "ygh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -96865,13 +96893,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "ygo" = ( @@ -96917,7 +96943,7 @@ /turf/open/floor/plating/asteroid, /area/maintenance/department/science) "yhh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/yellow{ dir = 1 }, @@ -96992,7 +97018,7 @@ name = "Engineering Access"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -97001,19 +97027,19 @@ /turf/open/floor/iron/techmaint, /area/engine/engineering) "yih" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, /area/maintenance/aft) "yin" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -97024,17 +97050,17 @@ /turf/closed/wall, /area/medical/break_room) "yis" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/quartermaster/miningdock) +/turf/open/floor/iron/sepia, +/area/science/shuttle) "yiv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -97055,6 +97081,9 @@ /obj/effect/turf_decal/siding/yellow/corner{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "yiB" = ( @@ -97062,8 +97091,8 @@ dir = 1; name = "Pure to Mix" }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) @@ -97097,17 +97126,20 @@ /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "yiN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plating{ - broken = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/maintenance/port) +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/science/lobby) "yiP" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -97132,10 +97164,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/bot_red, @@ -97160,7 +97192,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -97205,8 +97237,8 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -97221,16 +97253,22 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) +"yka" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/shuttledock) "ykq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/disposal) @@ -97239,9 +97277,7 @@ /area/security/nuke_storage) "yky" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating/airless, /area/space/nearstation) "ykA" = ( /obj/machinery/portable_atmospherics/canister/plasma, @@ -97286,10 +97322,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -97315,7 +97351,7 @@ /area/storage/primary) "ylB" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -97327,20 +97363,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/port) "ylJ" = ( /turf/open/floor/plating, /area/maintenance/aft) "ylR" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -97348,21 +97386,22 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "ylU" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/iron/sepia, +/area/science/shuttle) "ylW" = ( /turf/open/floor/engine, /area/science/xenobiology) "ymc" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -97370,6 +97409,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/sepia, /area/maintenance/disposal/incinerator) @@ -110639,7 +110681,7 @@ gvM gvM ayX vWx -xDa +dpH tlB nnx nnx @@ -110675,7 +110717,7 @@ gnn fOb aCf cTG -crB +ylU cCP ixm qgi @@ -110932,7 +110974,7 @@ dPp aZh aCf iPO -cTG +oKs aCf fyA aCf @@ -111152,8 +111194,8 @@ bbm bbm bbm xhP +gpP ezv -xDa tAB djY djY @@ -111189,7 +111231,7 @@ aCf jpU aCf vOz -cTG +yis aCf kHH kHH @@ -111388,7 +111430,7 @@ wxd mEI osV pFg -pFg +vcp sus guO mAW @@ -111410,7 +111452,7 @@ bbm bbm xhP nES -dpH +daD tAB bln aeL @@ -111443,10 +111485,10 @@ aKT qXb aCf fgs -spl +cTG aCf sJM -sJM +ibU aCf aCf aCf @@ -111604,7 +111646,7 @@ gIl tQh jAt klC -tqK +kFQ qLH tuT nnx @@ -111672,43 +111714,43 @@ tAB wru uMd uMd -vEQ +fBr wuF vJY loh nbR -aGh -vVr +aGR vVr vVr +lDv vVr vVr wuF -aGh +aGR aGR aHK vVr -apN +vVr aKY lZu iSP cTG iNi cTG -bAt -cTG +mEQ +dno cTG gGz blZ -spl +cTG ggi cTG +yis cTG -cDP vMr aCf -cyp -mpX +fwa +gGr cyp cyp cyp @@ -111867,9 +111909,9 @@ tuT csJ tuT jXV -ntM +kqb qLH -kGX +kqb jXV abN abN @@ -111899,7 +111941,7 @@ kHH kHH wxd qCS -jEp +hDG mCi wxd jYF @@ -111907,7 +111949,7 @@ jYF rLK xTE djY -xhU +aPF djY sIg djY @@ -111937,7 +111979,7 @@ bzu hEQ bzu bzu -bzu +aSh bzu bzu bzu @@ -111946,21 +111988,21 @@ tcf rlQ bzu uXZ -aLc +cCP tra rxE vMO hBg -rxE +aGh nti oLQ -rxE -rxE +aGh +aGh oJM baz bJJ bJJ -bJJ +nOV cLe lgv aCf @@ -112092,7 +112134,7 @@ kHH eFZ bng cyO -bvo +leT eFZ leT vHu @@ -112118,7 +112160,7 @@ gIl jdu jBZ ijw -kIC +juz lpS jXV qLH @@ -112164,10 +112206,10 @@ sNF sNF xTE qQu -ttK +dqK eHi -sMw -mXq +gzo +xFu lcE jOv bbm @@ -112180,11 +112222,11 @@ bbm bbm bbm wnn -qGW +meU xFu -mtJ -bar -cof +aUr +jnk +bUG ktv vEQ vVr @@ -112200,12 +112242,12 @@ kzj aKa vVr fHE +bns vVr -vVr -vVr -aKY -crB -cTG +flq +lSq +nfd +spl dvJ iNi cTG @@ -112375,15 +112417,15 @@ xTl wiX lJR gIR -dVO -fCG -fCG +xKt +xKt +xKt lVa -fCG -fCG -jbT -nNM -lvB +xKt +xKt +xKt +xKt +xKt xKt bYy nMw @@ -112422,7 +112464,7 @@ ltZ xTE jXJ xdT -tNJ +nyj djY djY xub @@ -112441,7 +112483,7 @@ xub djY djY ygc -bcO +rVk tNJ giY giY @@ -112476,7 +112518,7 @@ cAH aCf aCf aAg -pVM +qYA uRw tMF dku @@ -112635,12 +112677,12 @@ xPP kPS bgc xbV -aNs -xbV -xbV -xbV -shJ +uJJ xbV +tLw +bar +bar +bar yiy vit nMw @@ -112678,8 +112720,8 @@ svu wxd xTE tkJ -taV -tLB +xdT +cYI rSM okR gjq @@ -112698,7 +112740,7 @@ gjq xDF tip vQJ -bcO +rVk ffk giY csJ @@ -112733,7 +112775,7 @@ cRQ dMR aCf cRz -cTG +njs mOl aCf aCf @@ -112935,8 +112977,8 @@ eIY jQZ xTE pVk -taV -tNT +xdT +woI tNT gfc djY @@ -112954,7 +112996,7 @@ xhP djY hGA ygc -tNT +ktq bcO mCp giY @@ -112970,7 +113012,7 @@ nnx csJ vDW pLU -sYV +wJy oAk aNc aNc @@ -112979,7 +113021,7 @@ vDW bII phD aCf -jAj +qqw cRQ cRQ cRQ @@ -112990,7 +113032,7 @@ cRQ uYy aCf cQH -qYA +nmy mZp tyS yjt @@ -113193,8 +113235,8 @@ qGJ xTE aqg eAG -tLV -lSq +woI +tNT tNJ djY jzQ @@ -113211,7 +113253,7 @@ xWi djY wFe ygc -gGr +bTo oFD aIu iCy @@ -113227,16 +113269,16 @@ nnx vLM vDW eRp -sYV -aNc +sxS +uCQ aNc aNc dal vDW rov -ibU -nfd -dYU +crB +cAH +ibd cRQ cRQ cRQ @@ -113246,8 +113288,8 @@ cRQ cRQ wui cAH -dnd -cjs +bAt +cTG iSy xxN sDq @@ -113394,8 +113436,8 @@ cHU swD mnH jXV -kja -oxG +xKt +xKt xKt nQT qxZ @@ -113449,8 +113491,8 @@ hlY lqK taP pVe -taV -tNT +uQI +woI tNT tNJ djY @@ -113491,7 +113533,7 @@ fDo vaR vDW cje -bkO +crB cAH ibd cRQ @@ -113503,8 +113545,8 @@ cRQ cRQ wui cAH -cRz -dHZ +bAt +cTG cUI aCf aCf @@ -113706,8 +113748,8 @@ nit pGp taP ygc -taV -bfn +iDr +vfI rPG rJK gjq @@ -113726,7 +113768,7 @@ gjq kUo oDW ejq -bcO +rVk lfr xOV giY @@ -113748,7 +113790,7 @@ sYV vqA vDW ggr -bkO +crB aCf ojt cRQ @@ -113761,7 +113803,7 @@ cRQ wui aCf cTp -pVM +qYA dHl wrE kog @@ -113900,9 +113942,9 @@ leT aaC qLH fjp -guj -guj -guj +lqi +lqi +nNM guj guj kEJ @@ -113945,7 +113987,7 @@ jYF ltZ wxd ltZ -xMa +kye wOD lqK sxk @@ -113964,7 +114006,7 @@ lKW taP iIj taV -tNJ +mnW djY djY xub @@ -113983,7 +114025,7 @@ xub djY djY ygc -bcO +rVk tNJ djY nnx @@ -114168,7 +114210,7 @@ jXV qMq crI mUl -mbh +fHa cNC mbh mZc @@ -114221,9 +114263,9 @@ nvW taP uwJ mFs -tTj +ehY gzo -mXq +xFu gno rsb bbm @@ -114236,11 +114278,11 @@ bbm bbm bbm qEZ -wJv +meU xFu aUr jnk -cof +bUG tNJ djY nnx @@ -114262,7 +114304,7 @@ sYV aTQ vDW suE -bns +eah cAH ibd cRQ @@ -114406,7 +114448,7 @@ leT leT leT eFZ -vNZ +wXp pyE eFZ leT @@ -114427,7 +114469,7 @@ aKc aKc rnc uGH -qFL +cHX qLH jXV qLH @@ -114497,7 +114539,7 @@ xub djY xOV ygc -bcO +rVk hjV giY giY @@ -114663,7 +114705,7 @@ leT leT leT eFZ -vNZ +wXp cpJ eFZ eFZ @@ -114693,7 +114735,7 @@ lqp irW cJr rNc -irW +vxQ irW kQh irW @@ -114948,11 +114990,11 @@ jXV xKt xKt xKt -ylU +xKt cYB ftL xKt -hjw +xKt xKt xKt hss @@ -115011,7 +115053,7 @@ xub xpd djY ygc -bcO +rVk tNJ xOV giY @@ -115782,7 +115824,7 @@ xub giY giY toF -bcO +rVk tNT hDZ giY @@ -116029,7 +116071,7 @@ uMd uMd uMd uMd -vEQ +vWU uMd uMd uMd @@ -116039,7 +116081,7 @@ xuq uMd uMd vQJ -bcO +rVk tNT tLB uMd @@ -116281,7 +116323,7 @@ qgC qgC qgC qgC -qgC +uOP qgC qgC qgC @@ -116538,12 +116580,12 @@ bfn xuO xuO xuO -xuO +nDh bMi uZN xuO xuO -vEQ +bcm xuO wpP uZN @@ -116789,9 +116831,9 @@ xTE xTE xTE wxd -vEQ +fCG oUF -vEQ +tKM vbJ ric ric @@ -116810,7 +116852,7 @@ sGf abm abm ygc -nnM +jrC tNJ giY giY @@ -117299,7 +117341,7 @@ jYF wEv xTE lic -hDG +smW smW smW lFE @@ -117324,7 +117366,7 @@ vSU jpl sGf ygc -ccc +jrC owg giY nnx @@ -117500,11 +117542,11 @@ laU ahj lzb cIQ -ilC -nZE -eCP -xkx -xkx +fQE +oMG +kja +pIb +fgk xkx xkx mIo @@ -117544,7 +117586,7 @@ ezI yjx eje wtt -wtt +rtM wtt xfu qvN @@ -117753,7 +117795,7 @@ ieJ bRV ikD bRV -tLw +ikD sMH lzb eHv @@ -117807,7 +117849,7 @@ xbw qvN ueE jYF -dek +qKX jYF jYF ina @@ -118010,15 +118052,15 @@ ata qGE gGR qGE -hMs +gGR epX lzb dPX -fQE -oMG +qHN +nZE iJM lDu -pIb +xkx nvA xkx tfN @@ -118065,13 +118107,13 @@ wwM wwM jYF qKX -vYW +ltZ ltZ wxd xTE tcR slX -xNL +smW nMx kWT tPE @@ -118090,7 +118132,7 @@ vSj abm wKh gDK -qJg +wsg xwp wwp abm @@ -118322,13 +118364,13 @@ qbf vem ojm uXL -gSS +jYF wXd xuw xTE dsm smW -xNL +smW gUt xub uWO @@ -118579,7 +118621,7 @@ qbl wwM wxd wTk -rtM +jYF ueE wLV xTE @@ -118589,7 +118631,7 @@ lxN sOQ xub efp -qxA +dek xlo tbn mlt @@ -118825,9 +118867,9 @@ kSv mRd mRd uJr -mRd +bkO yjY -wdy +wdj lVu wwM xgF @@ -118836,7 +118878,7 @@ uBb wwM xfd vJt -nxn +jYF vTm vTm vTm @@ -119093,7 +119135,7 @@ xNe wwM xfd jOF -yiN +ltZ vTm hGN rzy @@ -119102,8 +119144,8 @@ fBc uxn lpb wmR -uWO -qxA +jBE +bqi tSL sXF iIf @@ -119118,7 +119160,7 @@ iPv abm kfc lQB -oKs +pSO xwM ira abm @@ -119550,7 +119592,7 @@ lmj lmj uOn qGE -xUA +gGR qGE gGR qGE @@ -119807,7 +119849,7 @@ xdh xdh xdh hmN -nmy +xdh hmN xdh hmN @@ -119817,8 +119859,8 @@ utU vva eNH tZn -kfh -fPv +nxn +ulg kfh fPv hsC @@ -120074,7 +120116,7 @@ pCt eSc qZq fHh -njs +qTO uNE qTO pZo @@ -120111,7 +120153,7 @@ mib haU wRF hvk -vmw +cDP gET lOZ iSr @@ -120130,9 +120172,9 @@ jjI vTm vTm xub -tPE +sMw tCZ -tPE +mXq qIc lYB djK @@ -120359,8 +120401,8 @@ aCG qPS yaA cRo -mib -mib +ttK +nTR rfs sis wpp @@ -120581,7 +120623,7 @@ aWs aWs aWs aWs -aWs +exQ ebH acb iws @@ -120590,7 +120632,7 @@ pGt baK ttO rIn -baL +eKL rIn htj gmj @@ -120838,7 +120880,7 @@ cfH hLe qIO qIO -qIO +xUA qIO qIO ycD @@ -120882,7 +120924,7 @@ mib osl wRF jSg -vmw +wdy eVr lOZ noc @@ -121627,10 +121669,10 @@ ioq jie alY aWs -xfb +aRi +uBI +dnd uBI -gWS -gkE uBI uBI icp @@ -121642,10 +121684,10 @@ lXX gWS uBI oVE -xfb -xUL +aRi xUL xUL +vaW xUL xUL xUL @@ -121660,7 +121702,7 @@ qdq dWI qdq sRH -nBk +lHw jky pHK bXF @@ -121688,7 +121730,7 @@ fql tDV xWN uxQ -xxw +jAj xxw xTM xUB @@ -121886,7 +121928,7 @@ mQm mQm vqQ aZY -fsR +shJ snS fsR fsR @@ -121917,7 +121959,7 @@ xTy uvX oUH tUE -ylD +woW ceL oqs hmI @@ -121939,7 +121981,7 @@ gRT vcZ vcZ nCL -uJW +tVL fJV iRW ppC @@ -122120,8 +122162,8 @@ wbc isW qqk pik -dKx -nOV +wbc +fTX kEn tpO rEf @@ -122155,7 +122197,7 @@ pam pBD qdH hrU -lDv +bep xfb rGA mjR @@ -122174,7 +122216,7 @@ jRG xnF wiT obP -nBk +aVr eYY sWq iic @@ -122404,7 +122446,7 @@ xvj hVJ xvj xvj -vtm +oww wdS vtm oMd @@ -122731,7 +122773,7 @@ mnv cYf gcH wtF -lni +gcH fLe mnv nnx @@ -122903,7 +122945,7 @@ lZy sqU aNY usf -oAX +aLc mCy wQQ ndk @@ -123153,7 +123195,7 @@ aRw tLH fXC xOq -ulg +pyK qKj faT rZN @@ -123181,12 +123223,12 @@ wYb vQh bfg qbo -pXj +eLh bfN bxd lMW -bfN -usI +tTj +hWc uag bEb vQh @@ -123396,8 +123438,8 @@ lLM dlt nek ijh -vRQ -vRQ +gkE +gkE vRQ kFY kWn @@ -123438,13 +123480,13 @@ wrM woY nXL cqG -bTo +mkn qlj qEk kqW rHB mkn -waz +uag skY vQh tGf @@ -123661,7 +123703,7 @@ pIN iwP ghQ vJo -uuW +cof gXr ceV ceV @@ -123759,7 +123801,7 @@ rds ipD uWG mnM -dno +tgi hXZ mnv nnx @@ -123998,7 +124040,7 @@ jJj uDn wcA eAE -eAE +apN pYZ vNz wem @@ -124014,9 +124056,9 @@ igF mnM mnM mnM -hBv +mnM iDD -uOP +tgi hXZ mnv nnx @@ -124182,7 +124224,7 @@ eiG iyX dvD fEu -eLh +iIH nIv fIY ddt @@ -124270,7 +124312,7 @@ cxh pIQ hlZ gIS -gIS +hlZ tPL tzR tgi @@ -124518,14 +124560,14 @@ wRY xmR vHt xpA -xZW +opF xxD vHt vGD xxw kIE igF -jhg +mnM sod aok gHG @@ -124756,7 +124798,7 @@ spb szp hfY viG -tPe +hBa eNJ tPe wFZ @@ -125198,7 +125240,7 @@ fCM chx qPC luL -eBn +vsb nWX dyy cWr @@ -125221,7 +125263,7 @@ xtj xLt uiJ iTZ -tNk +qPD qFh jQP kTW @@ -125292,7 +125334,7 @@ hhD xZW jof cXc -vHL +vGD vso wZH aEP @@ -125430,7 +125472,7 @@ hTY kHH kHH baI -abZ +bXh yky aob csJ @@ -125690,7 +125732,7 @@ xJu hSG aco acn -sqV +bXh csJ csJ kHH @@ -125943,7 +125985,7 @@ csJ csJ nnx nnx -sqV +bXh acn abN xJu @@ -126067,7 +126109,7 @@ eKv qEO wZH cHy -pHu +wSi tlp nFQ wZH @@ -126195,9 +126237,9 @@ nnx nnx aar nnx -dUK -sqV -cov +pqt +bXh +bXh bbZ bbZ csJ @@ -126234,7 +126276,7 @@ lrl etT suQ eSp -uuW +cof aYA weA ceV @@ -126325,7 +126367,7 @@ foc wZH nsM gvS -nTR +tlp vsm pLF xeN @@ -126454,7 +126496,7 @@ csJ nnx nnx csJ -sqV +bXh csJ abJ csJ @@ -126462,11 +126504,11 @@ nnx nnx csJ nnx -cov +bXh ahx nnx anu -vKJ +aCb arf oaI lLM @@ -126713,10 +126755,10 @@ nnx nnx bbZ csJ -crA -dUK +acn +pqt cer -vfD +amr csJ csJ pqt @@ -126967,21 +127009,21 @@ nnx nnx nnx bXh -sqV +bXh bXh bbZ aoW bXh -sqV -cov +bXh +bXh csJ bbZ bbZ asG -eew +aCb axD aCb -vKJ +aCb oaI jID jID @@ -127096,7 +127138,7 @@ fXt xGq wdh bSS -yis +tlp iwS wZH jyO @@ -127226,17 +127268,17 @@ csJ nnx nnx csJ -sqV +bXh csJ csJ csJ -cov +bXh tuT adt cib anE awy -vKJ +aCb gDc jID lLM @@ -127493,7 +127535,7 @@ aep cib sAP aCb -vKJ +aCb kHH jID boD @@ -127544,7 +127586,7 @@ lMx lMx dux vhU -vtm +oww wdS vtm thk @@ -127741,15 +127783,15 @@ nnx nnx nnx csJ -cov -sqV bXh -vKJ -eew +bXh +bXh +aCb +aCb acO baI dYM -vKJ +aCb kHH kHH jID @@ -127839,11 +127881,11 @@ dPJ onT rhV tWs -nBk +lHw vNv buH kiQ -nBk +lHw wtZ sxL xpe @@ -127888,7 +127930,7 @@ uYG mRN xjW sXI -bNA +xEK xEK olW vSc @@ -127995,7 +128037,7 @@ nnx nnx nnx nnx -cov +bXh aob jID hsU @@ -128047,15 +128089,15 @@ pAH pLE mji viY -cEi +dVO dwm aOW vhU xcx lMx -lMx +fqk lPU -lMx +gSS wzo vhU shm @@ -128153,7 +128195,7 @@ lGL mFm uWu nSV -tKM +nhq rOe xtK nnx @@ -128272,8 +128314,8 @@ jID xDU exh hmp -lLM -crQ +rvV +hUc lLM azC jID @@ -128309,7 +128351,7 @@ sjs sWe hiX eMO -jiS +eMO jiS dkF qRl @@ -128353,11 +128395,11 @@ xwa wYo hRv fOQ -nBk +aVr iJQ jad uoo -nBk +aVr cTx jad iJQ @@ -128507,7 +128549,7 @@ nnx nnx bbZ nnx -crA +acn nnx nnx aoW @@ -128622,7 +128664,7 @@ iYP isS isS isS -tPe +hBa vTc var sJa @@ -128761,7 +128803,7 @@ nnx nnx nnx nnx -sqV +bXh nnx nnx nnx @@ -129066,16 +129108,16 @@ wwZ xQt ayc mJM -wyE +mBc eAm -jOb +wyE aNW yio pHy -tIJ +aCH dJu nDT -jMU +aCH nGM nbx kzU @@ -129325,7 +129367,7 @@ ayc aNW qTJ faV -jOb +wyE uDr yio hIA @@ -129434,7 +129476,7 @@ lIP rGp bnZ czW -bRq +yka sAZ mNi otB @@ -129580,9 +129622,9 @@ ayc ayc ayc mJM -wyE +mBc gsD -jOb +wyE tyl yio vxK @@ -129654,7 +129696,7 @@ mKU qbd eUC sJa -fgk +uNj uNj xye cme @@ -129834,9 +129876,9 @@ xKN exq jOb lvh -oxU -lDE -lDE +gyd +gLs +gLs iGI bdu ivu @@ -130091,12 +130133,12 @@ dOC dOC pcC jUL -qSI +iOW sHX bdu aNW hef -jOb +wyE bhp xLB exq @@ -130169,7 +130211,7 @@ qbd gtO yfq dsX -kAx +xph fIf xJr lqQ @@ -130177,7 +130219,7 @@ uwE noj gDL yfq -uEa +tFJ nJU nJU uEa @@ -130326,7 +130368,7 @@ jID jID xyo jID -aRi +aVq asn jID lLM @@ -130353,7 +130395,7 @@ xKN mJM mJM mJM -jOb +wyE sHX mJM gyd @@ -130683,9 +130725,9 @@ rwz qjl wUH xph -xph +kAx cpO -xJW +hBv xph eBc jxi @@ -130870,7 +130912,7 @@ bdu bdu bdu bdu -jOb +wyE mJM kHY onN @@ -131139,7 +131181,7 @@ acQ acy kHY lir -qEh +mNG qEh nHu eYP @@ -131399,8 +131441,8 @@ kHY bIe ipf kHY -vtm -wdS +oww +mTv vtm vUR lnX @@ -131621,12 +131663,12 @@ vuQ lLM jID dkJ -ljI +fjm iES aDZ aDZ aDZ -sTj +eSr dOb lLM lLM @@ -131651,7 +131693,7 @@ acQ acQ jDF jWN -lyq +jWM jYl rXc fud @@ -131691,9 +131733,9 @@ fUO ssT ybT wYw -wVi -xPN -wVi +uxl +rfa +meF cuj dQo dQo @@ -131705,7 +131747,7 @@ dQo dQo cuj gee -jBE +wJL chI nCN vBG @@ -131724,7 +131766,7 @@ hRU gAu hRU bOU -ifo +oxG eCG vLF pAz @@ -131883,7 +131925,7 @@ boD lLM lLM boD -qnw +hBL jID lLM lLM @@ -131980,8 +132022,8 @@ kpU vIH wWQ vAl -vAl -vAl +kGs +tKe pbg piT piT @@ -132010,11 +132052,11 @@ onP guq rOP abg -hJd -hJd -hJd +vHL +vHL +hMs cZF -hJd +dYU hJd hJd oKb @@ -132204,10 +132246,10 @@ ule sUW xrI xDD -mju -uxl -amB -gHF +wYw +wVi +xPN +xSM cuj cuj cuj @@ -132265,11 +132307,11 @@ rBw kVV dVi ykJ -dVi +qTc tBr qTc gJw -qTc +dVi tBr qTc sMR @@ -132397,7 +132439,7 @@ jID aww jID jID -qnw +hBL jID lLM vuQ @@ -132462,8 +132504,8 @@ afi tPX qEG vuT -xSb -soH +vLw +kzY meF ulQ gVt @@ -132477,8 +132519,8 @@ eJJ wvE uuA wQP -chI -hZQ +hmf +yiN mow xlH wtm @@ -132719,7 +132761,7 @@ xMj xwv nnq azF -vLw +xSb amB meF mNx @@ -132731,7 +132773,7 @@ vHQ vHQ vHQ mgT -xqI +jhg kio chI chI @@ -132911,7 +132953,7 @@ boD lHA lHA jID -qnw +hBL jID jID jID @@ -133169,14 +133211,14 @@ vuQ boD jID qQM -ljI -ljI -ljI -ljI -ljI -ljI -ljI -ljI +fjm +fjm +fjm +fjm +fjm +fjm +fjm +fjm eSr jID qpX @@ -133434,7 +133476,7 @@ jID aww jID jID -qnw +hBL egU arN lLM @@ -133692,11 +133734,11 @@ lLM kFO jID qQM -ljI -ljI -ljI -ljI -ljI +fjm +fjm +fjm +fjm +fjm gzI vuQ kHY @@ -134292,7 +134334,7 @@ sQt wEL vpb fnV -ifo +ccc jOh ifo hmj @@ -134549,8 +134591,8 @@ vAl kpU vAl skf -vAl -vAl +kGs +dBF laN tQX xBI @@ -134807,7 +134849,7 @@ oDd pAj eKf sQL -pAj +hjw yeR pAj uum @@ -135058,7 +135100,7 @@ xLi wyH vOi sOA -pzW +liP bmp xSV xSV @@ -135770,7 +135812,7 @@ ieH kZF wVi tXk -wVi +kIC vyo lcA kue @@ -136343,7 +136385,7 @@ wBR cTl pCA xSV -wgV +waz myi qMM wgV @@ -136538,7 +136580,7 @@ dKc lRy msy xKa -mnr +mtJ nAF nPd jOy @@ -136549,7 +136591,7 @@ lkt qEl nel lvR -wEB +sLN prH xHi thD @@ -137009,7 +137051,7 @@ nnx vLM jID hAO -aVr +hAO jID csJ csJ @@ -137040,7 +137082,7 @@ wFC wFC wFC iEq -iON +xwy vEV xwy iTl @@ -137887,9 +137929,9 @@ gNA vKD ylR hfo -rdZ -lhz rVe +vfD +rdZ cYE wQe ccQ @@ -138602,7 +138644,7 @@ lgN kBd kuL brH -qHN +dJj lIc rPR wgE @@ -138614,7 +138656,7 @@ rDu cRX wCN qrx -opF +vJW vJW oZR wGi @@ -139642,8 +139684,8 @@ tTJ pKb wCN uUK -nBU -cxO +vYW +iON qNl xtz wUj @@ -139947,7 +139989,7 @@ vNt uzm uzm uzm -mTv +lge wrn lge uzm @@ -140205,7 +140247,7 @@ uzm uzm uzm lge -uzm +wWo gdG uzm uzm @@ -140393,7 +140435,7 @@ dKc jjx mrt cwc -iPN +cjs nBV lvm dTb @@ -140722,7 +140764,7 @@ mIf lgU sZm xYV -xVd +sRn gVp qtW obK @@ -141750,7 +141792,7 @@ xZT tqc pul smf -amZ +eew bcG xHa obK @@ -142005,7 +142047,7 @@ oCi jas xZT kRa -lqN +jPV mcv uEz gJx @@ -142703,7 +142745,7 @@ xtM yiC rPl rDU -rPl +axI oyC oyC orK @@ -143495,7 +143537,7 @@ kYn ssc kcu nIP -qEC +hnI llg oIH waG @@ -143731,7 +143773,7 @@ yiC kCd rPl rDU -rPl +axI xTa xTa xTa @@ -144011,8 +144053,8 @@ tax nJa wtw eOX -oqC -qDo +dKx +tLV oxb hqF wtw @@ -144056,12 +144098,12 @@ oRa wgX ksX fEQ -wgX +sqV hIw uzm ftI uzm -oiz +dUK uzm uzm jHm @@ -144325,7 +144367,7 @@ uzm uzm wrn ixv -lae +xVd oPF vIg uUs @@ -145337,7 +145379,7 @@ uUs uUs uUs cKm -suJ +xxG qfq tWH cKm @@ -145347,7 +145389,7 @@ sNW cKm crD qfq -suJ +xxG cKm crD qfq @@ -145502,14 +145544,14 @@ brZ dqz bYm dBX -bqi +hsp hsp cAa hsp dTc -axI -hsp hsp +pVM +fho hsp eDa hsp @@ -145766,7 +145808,7 @@ lTM trD xci szo -osY +tIJ osY eDN ePM @@ -145835,7 +145877,7 @@ tIV sPx nKw dGu -kMH +xXd xvk qyQ kXP @@ -146082,8 +146124,8 @@ kCh pSb wWM sEn -lMA -hYA +kMH +adz tIN sVM yes @@ -146092,8 +146134,8 @@ xuj mYb yes xoU -adz -lMO +iTF +nLQ qyQ kXP vro @@ -146273,7 +146315,7 @@ cIg dse qfj yeb -lWG +bPP cIg vKH jhs @@ -146324,7 +146366,7 @@ xjF cIi cIi uZI -vxQ +drn drn drn myd @@ -146350,7 +146392,7 @@ tMn yes wTv xuL -lMO +euk qyQ kXP vro @@ -147637,7 +147679,7 @@ jlC uxj ekA fFV -xXd +sQi vhC qNM lAv @@ -148671,7 +148713,7 @@ mdb vNM scz ose -cWM +vKJ dOV bGF rTd @@ -148690,7 +148732,7 @@ vOV rTo dap lZI -vtx +lqN rTo voV rTo @@ -148858,10 +148900,10 @@ bXT qFV vNw gDV -mEQ -nDh +hUj +sph vDB -hmf +sph hUj gDV vNw @@ -149118,7 +149160,7 @@ dle sXh wOP ygi -wOP +iUs xLW piQ vNw @@ -149204,7 +149246,7 @@ sXg rTo vtx wVv -vtx +lqN rTo trG nnx @@ -149372,11 +149414,11 @@ sJD kAa vNw fZp -liP +sph sph quP sph -fHa +sph aIG vNw sdb @@ -149444,7 +149486,7 @@ wjS oLf hvT iir -qDs +crA aPp eCp vRN @@ -149629,11 +149671,11 @@ eYk fgT vNw eXq -flq +yjG yjG fTA yjG -lqi +yjG gDJ vNw sdb @@ -149886,11 +149928,11 @@ eYn flo vNw fPc -flq +yjG fye fTA cvM -lqi +yjG icJ vNw qKz @@ -149957,7 +149999,7 @@ vOC jDH cjO rXm -xCJ +iWy rFB fnO iNF @@ -150143,11 +150185,11 @@ dog eyH vNw fPY -flq +yjG yjG auG yjG -lqi +yjG bPe vNw vdz @@ -150215,7 +150257,7 @@ dcZ nrk rXm vjj -bGF +myU rXm rXm rXm @@ -151753,7 +151795,7 @@ ssu vLM uln kmx -txE +vaY kTI rXm elg @@ -151960,7 +152002,7 @@ abN kHH kHH kHH -jZt +unp orP bQO pyl @@ -153272,10 +153314,10 @@ nnx wDO uMO fIq -uJJ -fwa -fwa -lHw +pMq +xvW +xvW +oiJ iQk scF cGp @@ -153532,7 +153574,7 @@ szw azG eYZ ykq -hBa +tTo rIs oiJ xPI diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 58ebdca6e83b2..ffc117d3a3bde 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -59,8 +59,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -101,10 +101,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -130,8 +130,8 @@ /area/quartermaster/warehouse) "abt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, @@ -261,14 +261,14 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "acF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -288,8 +288,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -297,10 +297,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/engine, @@ -326,8 +326,8 @@ icon_state = "2-4" }, /mob/living/simple_animal/bot/secbot/pingsky, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "adt" = ( @@ -393,7 +393,7 @@ /area/maintenance/port/aft) "aet" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating{ @@ -434,10 +434,10 @@ /area/security/main) "aeO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -508,7 +508,7 @@ /turf/closed/wall, /area/maintenance/port/aft) "afo" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/door/window/southleft{ dir = 1; name = "Maximum Security Test Chamber"; @@ -540,10 +540,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/engine, @@ -603,14 +603,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard) "afW" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/door/window/southleft{ name = "Maximum Security Test Chamber"; req_access_txt = "55" @@ -629,8 +629,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aga" = ( @@ -657,8 +656,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "agn" = ( @@ -681,10 +680,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -899,7 +898,6 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/fore) "ajC" = ( @@ -1043,8 +1041,8 @@ req_one_access_txt = "47"; name = "science Aft Maintenance Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, @@ -1093,10 +1091,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -1148,12 +1146,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "alA" = ( @@ -1231,10 +1226,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -1299,7 +1294,7 @@ /turf/closed/wall/r_wall/rust, /area/ai_monitored/security/armory) "amY" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -1322,10 +1317,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -1349,7 +1344,7 @@ /turf/closed/wall, /area/crew_quarters/heads/hor) "anB" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /turf/open/floor/iron/dark, @@ -1358,16 +1353,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "anF" = ( @@ -1383,10 +1375,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1555,10 +1547,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -1626,10 +1618,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1645,10 +1637,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -1667,8 +1659,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "apC" = ( @@ -1679,10 +1671,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -1717,10 +1709,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -1801,15 +1793,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/science/explab) "aqV" = ( /obj/effect/landmark/start/chaplain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -1886,18 +1878,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "arJ" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -2050,10 +2042,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -2088,8 +2080,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "atP" = ( @@ -2130,8 +2122,8 @@ /obj/effect/turf_decal/siding/wood/end{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -2156,25 +2148,16 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) +/area/science/mixing) "auI" = ( /obj/structure/table/wood, /obj/item/gavelblock, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/courtroom) "auL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) @@ -2192,10 +2175,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -2278,10 +2261,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -2336,10 +2319,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -2399,16 +2382,16 @@ /area/crew_quarters/heads/hos) "awv" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/plating, /area/engine/atmos) "aww" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/siding/dark/corner{ @@ -2480,10 +2463,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -2496,10 +2479,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -2631,10 +2614,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -2663,7 +2646,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/freezer, /area/security/prison) "azm" = ( @@ -2823,11 +2806,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -2911,7 +2894,7 @@ /area/engine/atmos) "aDp" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "aDz" = ( @@ -2923,10 +2906,10 @@ /area/engine/atmos) "aDB" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -3076,10 +3059,10 @@ /turf/closed/wall/rust, /area/maintenance/port) "aEC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -3109,6 +3092,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 + }, /turf/open/floor/iron, /area/engine/atmos) "aFc" = ( @@ -3130,11 +3116,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/sign/departments/medbay/alt{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/main) "aFm" = ( @@ -3181,18 +3167,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/sign/poster/contraband/grey_tide{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "aFP" = ( @@ -3218,8 +3204,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/port) "aFY" = ( @@ -3303,17 +3289,17 @@ /area/engine/break_room) "aGz" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /turf/open/floor/iron/dark, /area/engine/atmos) "aGA" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /turf/open/floor/iron/dark, /area/engine/atmos) "aGB" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /turf/open/floor/iron/dark, /area/engine/atmos) "aGK" = ( @@ -3327,8 +3313,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/plating{ burnt = 1 @@ -3376,113 +3362,113 @@ /turf/open/floor/iron/dark, /area/janitor) "aGU" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 4 }, /turf/open/floor/engine/n2, /area/engine/atmos) "aGV" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "aGW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 4 }, /turf/open/floor/engine/n2, /area/engine/atmos) "aGX" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 4 }, /turf/open/floor/engine/o2, /area/engine/atmos) "aGY" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "aGZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ dir = 4 }, /turf/open/floor/engine/o2, /area/engine/atmos) "aHa" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 4 }, /turf/open/floor/engine/air, /area/engine/atmos) "aHb" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) "aHc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 4 }, /turf/open/floor/engine/air, /area/engine/atmos) "aHd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 1 }, /turf/open/floor/engine/co2, /area/engine/atmos) "aHe" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, /area/engine/atmos) "aHf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 1 }, /turf/open/floor/engine/co2, /area/engine/atmos) "aHg" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 1 }, /turf/open/floor/engine/plasma, /area/engine/atmos) "aHh" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, +/obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/engine/atmos) "aHi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 1 }, /turf/open/floor/engine/plasma, /area/engine/atmos) "aHj" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 1 }, /turf/open/floor/engine/n2o, /area/engine/atmos) "aHk" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/engine/atmos) "aHl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 1 }, /turf/open/floor/engine/n2o, /area/engine/atmos) "aHm" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 1 }, /turf/open/floor/engine/vacuum, /area/engine/atmos) "aHn" = ( -/obj/machinery/air_sensor/atmos/mix_tank, +/obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/vacuum, /area/engine/atmos) "aHo" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 1 }, /turf/open/floor/engine/vacuum, @@ -3495,10 +3481,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/wood, @@ -3665,7 +3651,7 @@ "aIM" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/light{ dir = 4 }, @@ -3679,11 +3665,11 @@ /turf/closed/wall, /area/maintenance/central) "aIO" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/closed/wall, /area/engine/atmos) "aJk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/closed/wall/r_wall, @@ -3700,27 +3686,27 @@ /area/security/courtroom) "aJo" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "aJt" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "aJx" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "aJI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall, /area/engine/atmos) "aJJ" = ( @@ -3728,11 +3714,11 @@ /turf/closed/wall, /area/science/lab) "aJT" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space/basic, /area/space/nearstation) "aJZ" = ( @@ -3753,7 +3739,7 @@ /turf/open/floor/plating, /area/engine/break_room) "aKm" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/closed/wall/rust, /area/engine/atmos) "aKu" = ( @@ -3793,35 +3779,35 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) "aLs" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) "aLt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) "aLu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "aLv" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) "aLw" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) "aLx" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/closed/wall/r_wall, @@ -3863,8 +3849,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/central) @@ -3890,10 +3876,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -3905,7 +3891,7 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "aMB" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/structure/cable{ @@ -3920,7 +3906,7 @@ "aMI" = ( /obj/structure/table, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/item/paper_bin{ @@ -3928,7 +3914,7 @@ pixel_y = 4 }, /obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "aMR" = ( @@ -3936,7 +3922,7 @@ /turf/closed/wall, /area/engine/atmos) "aMT" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -3980,8 +3966,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -4086,7 +4072,7 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/remains/human, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) @@ -4125,14 +4111,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -4165,7 +4151,7 @@ /turf/closed/wall/rust, /area/medical/virology) "aPn" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -4191,9 +4177,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/plating{ broken = 1 }, @@ -4272,10 +4255,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/showroomfloor, @@ -4324,12 +4307,6 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -4433,7 +4410,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plating/airless{ +/turf/open/floor/plating{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/space/nearstation) @@ -4461,10 +4438,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating{ @@ -4531,7 +4508,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/sorting) "aVP" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -4548,18 +4525,18 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, /area/security/warden) "aWn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/plating, +/area/maintenance/port) "aWs" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/grassybush, @@ -4614,10 +4591,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -4715,10 +4692,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating{ @@ -4754,10 +4731,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -4767,7 +4744,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plating/airless{ +/turf/open/floor/plating{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/space/nearstation) @@ -4816,7 +4793,7 @@ /turf/open/floor/noslip/white, /area/security/prison) "aYQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -4827,6 +4804,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 10 + }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "aYT" = ( @@ -4873,8 +4856,8 @@ /area/science/lab) "aZk" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "aZr" = ( @@ -4940,7 +4923,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating{ + burnt = 1 + }, /area/space/nearstation) "aZS" = ( /turf/closed/wall/r_wall, @@ -4985,10 +4970,10 @@ name = "Control Room"; req_access_txt = "19; 61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -5008,7 +4993,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating{ + burnt = 1 + }, /area/space/nearstation) "baC" = ( /obj/effect/spawner/structure/window/reinforced, @@ -5028,6 +5015,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "baG" = ( @@ -5049,7 +5039,7 @@ /turf/closed/wall/rust, /area/security/checkpoint/science/research) "baX" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input, /obj/machinery/sparker/toxmix{ name = "chamber igniter"; pixel_x = -16 @@ -5095,10 +5085,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -5117,7 +5107,7 @@ }, /area/maintenance/port/fore) "bbt" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, +/obj/machinery/air_sensor/toxins_burn_chamber, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) @@ -5135,7 +5125,7 @@ /turf/open/floor/engine, /area/science/xenobiology) "bby" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "bbC" = ( @@ -5145,19 +5135,22 @@ /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/engine, /area/science/mixing/chamber) "bbD" = ( /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "bbE" = ( @@ -5175,7 +5168,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -5201,10 +5194,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -5217,10 +5210,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -5237,7 +5230,7 @@ /turf/open/floor/iron/dark, /area/science/storage) "bbX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/science/mixing/chamber) @@ -5250,10 +5243,6 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) -"bcf" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/science/mixing/chamber) "bco" = ( /obj/structure/table, /obj/item/stack/sheet/iron/ten{ @@ -5261,9 +5250,7 @@ }, /obj/item/assembly/prox_sensor, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "bcq" = ( /obj/structure/window/reinforced{ @@ -5297,13 +5284,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/science/robotics/lab) "bcL" = ( @@ -5450,10 +5437,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -5490,10 +5477,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -5530,7 +5517,7 @@ /turf/open/floor/iron/dark, /area/library) "bfP" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -5657,10 +5644,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -5746,10 +5733,10 @@ /area/teleporter) "biD" = ( /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/freezer, @@ -5764,8 +5751,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/medical/storage) @@ -5789,8 +5776,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, @@ -5931,7 +5918,7 @@ /area/quartermaster/storage) "bky" = ( /mob/living/simple_animal/butterfly, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -6023,8 +6010,8 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -6033,8 +6020,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, @@ -6071,10 +6058,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -6093,10 +6080,10 @@ /turf/open/floor/wood, /area/crew_quarters/locker) "blq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -6127,15 +6114,15 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "blE" = ( @@ -6226,8 +6213,7 @@ /area/library) "bmv" = ( /obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "bmy" = ( @@ -6242,7 +6228,7 @@ /area/hydroponics) "bmP" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" @@ -6255,7 +6241,7 @@ dir = 1; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -6288,7 +6274,7 @@ /area/quartermaster/storage) "bni" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6487,7 +6473,7 @@ /area/quartermaster/office) "boT" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) @@ -6548,10 +6534,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, @@ -6581,7 +6567,7 @@ /turf/closed/wall/rust, /area/maintenance/central) "bqi" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall/rust, @@ -6599,8 +6585,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "bqv" = ( @@ -6612,8 +6598,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) @@ -6652,10 +6638,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -6682,10 +6668,10 @@ /area/engine/atmos) "bqZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -6803,7 +6789,7 @@ /turf/open/floor/iron/dark, /area/bridge) "brZ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -7245,10 +7231,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -7289,8 +7275,8 @@ /area/library) "bvY" = ( /obj/effect/landmark/start/bartender, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -7320,10 +7306,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -7355,13 +7341,13 @@ /turf/open/floor/grass, /area/chapel/main) "bwv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/closed/wall/r_wall/rust, /area/engine/atmos) "bwx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -7424,7 +7410,7 @@ /area/chapel/main) "bwU" = ( /obj/structure/flora/grass/jungle, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/grass, @@ -7552,10 +7538,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -7582,10 +7568,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -7631,8 +7617,8 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "bzq" = ( @@ -7666,10 +7652,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -7690,9 +7676,6 @@ icon_state = "0-2" }, /obj/item/stack/cable_coil/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/plating{ broken = 1 }, @@ -7702,10 +7685,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -7830,7 +7813,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -7984,8 +7967,9 @@ /obj/machinery/door/airlock/external{ req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/fore) "bCA" = ( @@ -8041,7 +8025,7 @@ /area/solar/port/aft) "bDb" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/engine/atmos) "bDc" = ( @@ -8108,8 +8092,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -8194,10 +8178,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -8230,7 +8214,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -8285,10 +8269,14 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bFg" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "bFh" = ( @@ -8306,7 +8294,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -8334,8 +8322,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -8374,8 +8362,8 @@ /area/maintenance/aft) "bGb" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 }, /turf/open/space/basic, /area/space/nearstation) @@ -8387,7 +8375,7 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "bGj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -8402,12 +8390,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "bGo" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall, @@ -8439,10 +8427,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -8458,8 +8446,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -8499,7 +8487,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -8508,7 +8496,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "bHn" = ( @@ -8570,8 +8558,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -8622,7 +8610,7 @@ /turf/closed/wall, /area/quartermaster/warehouse) "bIe" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/closed/wall/rust, /area/engine/atmos) "bIf" = ( @@ -8648,7 +8636,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -8740,7 +8728,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -8834,8 +8822,8 @@ name = "aft camera" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -8861,10 +8849,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -8884,13 +8872,13 @@ /area/crew_quarters/locker) "bLy" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -8900,10 +8888,10 @@ /turf/closed/wall/rust, /area/crew_quarters/fitness/recreation) "bMi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -8919,10 +8907,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -8954,10 +8942,10 @@ name = "Gravity Generator Chamber"; req_one_access_txt = "19; 61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -9000,11 +8988,9 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, /area/quartermaster/exploration_dock) "bNm" = ( /obj/structure/sign/warning/pods, @@ -9044,10 +9030,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -9064,10 +9050,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -9115,8 +9101,8 @@ req_access_txt = null; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/brig/aft) @@ -9163,10 +9149,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -9205,10 +9191,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -9302,10 +9288,10 @@ /area/maintenance/starboard/fore) "bRc" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" @@ -9425,10 +9411,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -9565,18 +9551,25 @@ /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) "bUL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) "bUM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 +/obj/structure/girder, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 }, -/turf/closed/wall, -/area/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/port/aft) "bUP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -9612,13 +9605,13 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "bUX" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/rust, /area/engine/atmos) "bUY" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -9679,7 +9672,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -9688,15 +9681,15 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, /area/science/robotics/lab) "bWo" = ( /obj/structure/disposalpipe/junction/flip, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral{ @@ -9706,7 +9699,7 @@ /area/storage/primary) "bWq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -9717,10 +9710,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -9738,10 +9731,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -9760,10 +9753,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -9775,10 +9768,10 @@ /obj/machinery/computer/cryopod{ pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -9811,9 +9804,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/execution/transfer) "bYG" = ( @@ -9836,18 +9831,18 @@ "bYN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/starboard/fore) "bZc" = ( /obj/effect/turf_decal/arrows, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -9873,7 +9868,7 @@ "bZy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/aft) "bZD" = ( /obj/machinery/button/door{ @@ -9899,10 +9894,10 @@ c_tag = "Xenobiology Closet"; name = "xenobiology camera" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -9922,7 +9917,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -9931,7 +9926,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -9984,7 +9979,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -10168,7 +10162,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, @@ -10345,7 +10339,7 @@ /turf/open/floor/circuit/red, /area/ai_monitored/turret_protected/ai) "cek" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -10447,8 +10441,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cfo" = ( @@ -10457,10 +10451,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -10473,16 +10467,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cfL" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /obj/structure/lattice/catwalk, @@ -10575,10 +10569,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -10677,7 +10671,7 @@ /area/space/nearstation) "chS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -10703,10 +10697,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -10746,7 +10740,7 @@ "cix" = ( /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -10776,10 +10770,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -10857,10 +10851,10 @@ /turf/open/space/basic, /area/solar/starboard/fore) "cjm" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 8 }, /turf/open/space/basic, /area/space/nearstation) @@ -10882,7 +10876,7 @@ /area/engine/atmos) "cjt" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/engineering) "cju" = ( @@ -10942,7 +10936,7 @@ /area/space/nearstation) "cki" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, @@ -10996,7 +10990,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "ckE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -11005,10 +10999,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -11020,10 +11014,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -11042,8 +11036,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "clb" = ( @@ -11063,10 +11057,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11087,14 +11081,14 @@ }, /area/maintenance/port/aft) "clu" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) "clw" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space/basic, @@ -11121,16 +11115,16 @@ /turf/open/floor/iron/dark, /area/hallway/primary/fore) "clC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "clE" = ( @@ -11152,10 +11146,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -11189,7 +11183,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -11315,10 +11309,10 @@ /area/space/nearstation) "cnh" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/prison, @@ -11366,7 +11360,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "cnx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -11390,7 +11384,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -11400,7 +11394,7 @@ /turf/closed/wall/r_wall, /area/maintenance/solars/port/aft) "cok" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -11457,7 +11451,7 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/foyer) "coS" = ( @@ -11498,8 +11492,8 @@ /turf/open/floor/engine, /area/engine/gravity_generator) "cpE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -11533,10 +11527,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating{ @@ -11637,10 +11631,10 @@ /turf/open/space/basic, /area/solar/port/fore) "crn" = ( -/turf/open/floor/plating{ - broken = 1 +/turf/open/floor/catwalk_floor{ + initial_gas_mix = "TEMP=2.7" }, -/area/space/nearstation) +/area/quartermaster/warehouse) "crq" = ( /obj/structure/sign/warning/nosmoking, /turf/closed/wall/rust, @@ -11659,12 +11653,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/quartermaster/miningoffice) "crx" = ( @@ -11695,7 +11683,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; @@ -11718,11 +11706,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -11766,7 +11754,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -11841,9 +11829,9 @@ }, /area/ai_monitored/turret_protected/ai_upload) "ctl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -11860,11 +11848,11 @@ }, /area/maintenance/port/aft) "ctq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -11877,7 +11865,7 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos) "cts" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/machinery/light_switch{ @@ -11947,7 +11935,7 @@ /turf/open/space/basic, /area/solar/port/aft) "ctT" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/camera/directional/east{ c_tag = "Atmospherics Entrance"; name = "atmospherics camera" @@ -11957,9 +11945,9 @@ /turf/open/floor/iron, /area/engine/atmos) "cui" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space/basic, @@ -11982,8 +11970,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) @@ -11995,8 +11983,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -12085,7 +12073,7 @@ /area/gateway) "cwo" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space/basic, @@ -12128,7 +12116,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -12140,7 +12127,7 @@ /area/maintenance/port) "cwV" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -12171,7 +12158,9 @@ /obj/item/wallframe/light_fixture/small{ pixel_y = -14 }, -/turf/open/floor/catwalk_floor, +/turf/open/floor/catwalk_floor{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/warehouse) "cxo" = ( /obj/effect/spawner/room/tenxten, @@ -12202,18 +12191,17 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "cxR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/rust, /area/engine/atmos) "cxT" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall, @@ -12223,10 +12211,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -12259,10 +12247,10 @@ /area/maintenance/port) "cza" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -12288,7 +12276,7 @@ /turf/open/space/basic, /area/solar/starboard/aft) "czt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -12326,10 +12314,10 @@ /area/crew_quarters/heads/hos) "czW" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -12360,7 +12348,7 @@ /area/maintenance/port) "cAh" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cAi" = ( @@ -12369,7 +12357,6 @@ /area/maintenance/fore) "cAj" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/fore) "cAm" = ( @@ -12404,10 +12391,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -12427,7 +12414,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12456,9 +12443,6 @@ /turf/open/space/basic, /area/solar/port/aft) "cAQ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, /obj/machinery/computer/station_alert{ dir = 8 }, @@ -12480,10 +12464,9 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "cAU" = ( @@ -12507,8 +12490,8 @@ /turf/closed/wall, /area/maintenance/fore) "cBe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) "cBf" = ( @@ -12567,7 +12550,7 @@ }, /area/maintenance/port/aft) "cBz" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall/rust, /area/engine/atmos) "cBA" = ( @@ -12575,11 +12558,11 @@ /turf/open/floor/plating, /area/engine/atmos) "cBB" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "cBC" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "cBI" = ( @@ -12588,7 +12571,7 @@ }, /area/maintenance/port/aft) "cBV" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall, /area/maintenance/disposal/incinerator) "cBW" = ( @@ -12622,7 +12605,7 @@ /area/solar/port/aft) "cCd" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/space, /area/maintenance/disposal/incinerator) "cCk" = ( @@ -12767,8 +12750,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -12782,7 +12765,7 @@ /area/space/nearstation) "cDA" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating/airless, /area/space/nearstation) "cDC" = ( @@ -12802,8 +12785,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -12965,13 +12948,13 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "cFc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -13118,10 +13101,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "cGj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -13170,7 +13153,6 @@ }, /area/maintenance/fore) "cGD" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "External Freight Airlock" }, @@ -13204,10 +13186,10 @@ icon_state = "4-8" }, /obj/item/kitchen/rollingpin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -13284,6 +13266,15 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "cHN" = ( @@ -13295,10 +13286,10 @@ /area/maintenance/port) "cHQ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -13394,10 +13385,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -13432,10 +13423,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -13581,24 +13572,24 @@ "cJa" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "cJo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/color_adapter/layer2{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/engineering) +/turf/open/floor/iron/dark, +/area/engine/atmos) "cJr" = ( /turf/closed/wall/r_wall, /area/security/execution/education) @@ -13628,10 +13619,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -13643,10 +13634,10 @@ /area/security/execution/education) "cJW" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -13659,10 +13650,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/prison, @@ -13684,7 +13675,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "cKy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -13778,10 +13769,10 @@ /turf/open/space/basic, /area/solar/port/aft) "cLt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -13795,7 +13786,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /obj/structure/disposalpipe/trunk{ @@ -13820,7 +13811,7 @@ /turf/open/floor/plating, /area/maintenance/port) "cLO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/siding/dark/corner, @@ -13830,16 +13821,14 @@ /turf/open/floor/iron/dark/textured, /area/ai_monitored/security/armory) "cMl" = ( -/obj/machinery/igniter{ - id = "Incinerator" - }, -/obj/machinery/air_sensor/atmos/incinerator_tank{ +/obj/machinery/air_sensor/incinerator_tank{ pixel_x = -32; pixel_y = -32 }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "cMn" = ( @@ -13849,14 +13838,14 @@ /turf/open/floor/engine, /area/engine/engineering) "cMr" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/engineering) "cMs" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -13888,10 +13877,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -13902,8 +13891,8 @@ req_access_txt = "29" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) @@ -13924,10 +13913,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/hallway/secondary/entry) "cNr" = ( @@ -13944,7 +13933,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cNs" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/machinery/airalarm/directional/south{ @@ -13961,10 +13950,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -13975,8 +13964,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNH" = ( @@ -13994,14 +13983,14 @@ /turf/open/space/basic, /area/solar/port/aft) "cNM" = ( +/obj/structure/cable, /obj/machinery/power/turbine{ luminosity = 2 }, -/obj/structure/cable, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "cNN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -14170,10 +14159,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -14183,8 +14172,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light/small{ dir = 8 }, @@ -14207,8 +14196,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/lab) @@ -14223,19 +14212,15 @@ /turf/open/space/basic, /area/space/nearstation) "cPc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/machinery/light/small{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics Tank - N2"; + name = "atmospherics camera" }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/open/floor/engine/o2, +/area/engine/atmos) "cPt" = ( /obj/machinery/light{ dir = 8 @@ -14252,10 +14237,12 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -14415,10 +14402,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -14445,10 +14432,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -14483,8 +14470,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/engine, @@ -14502,11 +14489,11 @@ }, /area/maintenance/port/aft) "cRf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner, @@ -14531,7 +14518,7 @@ "cRo" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -14561,10 +14548,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -14576,8 +14563,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "cSh" = ( @@ -14591,10 +14578,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -14698,8 +14685,8 @@ color = "#c6ae0f"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -14709,17 +14696,13 @@ /turf/open/floor/iron, /area/security/courtroom) "cTE" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron/dark, -/area/security/execution/transfer) +/turf/open/floor/plating, +/area/maintenance/port/aft) "cTG" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -14751,10 +14734,10 @@ name = "hydroponics Maintenance"; req_access_txt = "35" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -14840,10 +14823,10 @@ name = "exploration Maintenance Access"; req_one_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -14863,8 +14846,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -14881,8 +14864,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -14919,7 +14902,7 @@ /obj/structure/window/plasma/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable{ @@ -14933,7 +14916,7 @@ }, /area/engine/supermatter) "cYc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -15000,7 +14983,7 @@ "cYM" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "cYW" = ( @@ -15011,10 +14994,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -15023,8 +15006,8 @@ /area/maintenance/port/fore) "cZc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/sign/directions/evac{ dir = 4; pixel_x = 32 @@ -15044,7 +15027,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -15116,10 +15099,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -15185,7 +15168,7 @@ /area/hallway/primary/aft) "dbO" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/red, @@ -15284,10 +15267,10 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -15306,10 +15289,10 @@ /area/security/prison) "dcS" = ( /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -15319,7 +15302,7 @@ dir = 1 }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/engine, @@ -15373,10 +15356,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -15394,10 +15377,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/camera/directional/south{ c_tag = "AI Upload Transit Access"; name = "command camera" @@ -15413,10 +15396,10 @@ /obj/machinery/door/airlock/public/glass{ name = "Medbay" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -15435,10 +15418,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -15474,10 +15457,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -15529,9 +15512,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -15551,10 +15534,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -15600,8 +15583,8 @@ /area/hallway/primary/starboard) "dio" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) "div" = ( @@ -15659,8 +15642,8 @@ /area/crew_quarters/bar/atrium) "djk" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -15685,15 +15668,8 @@ /turf/open/floor/plating, /area/maintenance/fore) "djL" = ( -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -22 - }, -/turf/open/floor/engine{ - initial_gas_mix = "n2=100;TEMP=80"; - name = "mainframe floor" - }, -/area/tcommsat/server) +/turf/open/floor/plating/airless, +/area/quartermaster/warehouse) "djS" = ( /obj/machinery/light{ dir = 1 @@ -15754,6 +15730,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "dly" = ( @@ -15798,10 +15777,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -15855,10 +15834,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -15888,10 +15867,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red, @@ -15911,10 +15890,10 @@ /area/security/courtroom) "dnN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -15928,8 +15907,8 @@ req_access_txt = "47" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/science/explab) @@ -15941,10 +15920,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -15974,10 +15953,10 @@ /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -15998,10 +15977,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/tcommsat/computer) "dpg" = ( @@ -16010,8 +15992,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -16033,17 +16015,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/corner{ dir = 8 }, /area/hallway/primary/port) "dpy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -16115,8 +16097,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "dqV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) "drB" = ( @@ -16132,10 +16114,10 @@ /turf/open/floor/iron, /area/hydroponics) "dsa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -16162,7 +16144,7 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/plating{ burnt = 1 }, @@ -16182,13 +16164,12 @@ /turf/open/floor/iron, /area/security/brig) "dsD" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ - dir = 8; - icon_state = "inje_map-2" - }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/engine/engineering) "dsJ" = ( @@ -16210,10 +16191,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -16236,8 +16217,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating{ @@ -16256,8 +16237,8 @@ name = "Bar Storage"; req_access_txt = "25" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -16287,8 +16268,8 @@ /turf/open/floor/iron/dark, /area/security/detectives_office) "dtB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -16326,7 +16307,7 @@ /turf/open/floor/iron/dark, /area/janitor) "duu" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -16357,17 +16338,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/engine/atmos) "dwp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -16377,8 +16354,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "dxc" = ( @@ -16433,10 +16410,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningoffice) "dxP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -16475,7 +16452,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -16512,8 +16489,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -16543,7 +16520,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "dzT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -16551,7 +16528,7 @@ c_tag = "Recovery Room"; name = "medical camera" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -16560,10 +16537,10 @@ "dzY" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating{ @@ -16644,10 +16621,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating{ @@ -16706,8 +16683,6 @@ name = "Arrival Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) @@ -16733,10 +16708,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -16745,7 +16720,7 @@ /turf/open/floor/iron/showroomfloor, /area/security/main) "dCc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -16782,18 +16757,18 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, /area/security/detectives_office) "dCz" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16807,11 +16782,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/plating{ broken = 1 @@ -16858,14 +16833,14 @@ /turf/open/floor/iron, /area/hallway/primary/port) "dDB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1; color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/virology) "dDF" = ( @@ -16884,10 +16859,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -16896,10 +16871,7 @@ /turf/open/floor/iron/dark, /area/maintenance/starboard) "dDM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/camera/directional/south{ c_tag = "Atmospherics Aft Tanks"; name = "atmospherics camera" @@ -16911,6 +16883,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "dDP" = ( @@ -16923,10 +16898,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -16940,9 +16915,8 @@ /area/quartermaster/warehouse) "dDZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/airless, -/area/maintenance/port/aft) +/area/quartermaster/warehouse) "dEg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16960,14 +16934,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/starboard) "dEC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -16988,11 +16962,16 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "dEN" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics Tank - Air"; - name = "atmospherics camera" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/engine/air, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, /area/engine/atmos) "dES" = ( /obj/machinery/door/airlock/highsecurity{ @@ -17016,8 +16995,8 @@ pixel_x = 28 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -17065,7 +17044,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -17084,17 +17063,17 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "dGk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -17170,8 +17149,8 @@ /turf/open/floor/iron/dark, /area/chapel/main) "dHk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17200,7 +17179,7 @@ /area/quartermaster/exploration_dock) "dHB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -17233,8 +17212,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "dIS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -17249,16 +17228,14 @@ /turf/open/floor/iron/dark, /area/medical/medbay/central) "dJn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "dJr" = ( /obj/machinery/light{ dir = 8 @@ -17318,8 +17295,8 @@ "dKE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -17394,6 +17371,9 @@ name = "engineering camera" }, /obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/plating{ broken = 1 }, @@ -17411,10 +17391,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -17434,18 +17414,16 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, /area/quartermaster/exploration_dock) "dLX" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/engine, @@ -17459,10 +17437,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -17475,8 +17453,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -17660,10 +17638,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -17687,10 +17665,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -17699,16 +17677,13 @@ /area/maintenance/starboard/fore) "dQU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dQW" = ( @@ -17731,10 +17706,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -17760,8 +17735,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, @@ -17825,18 +17800,11 @@ /turf/open/floor/iron, /area/security/main) "dSP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/quartermaster/miningoffice) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "dSS" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/service, @@ -17952,8 +17920,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -17965,8 +17931,6 @@ shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -18004,9 +17968,6 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "dVE" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, /obj/machinery/meter, /obj/machinery/light{ dir = 8 @@ -18017,6 +17978,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "dVF" = ( @@ -18051,7 +18013,7 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/toilet/restrooms) "dVX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -18084,10 +18046,10 @@ /obj/structure/noticeboard{ pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -18112,10 +18074,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -18124,11 +18086,11 @@ /turf/open/floor/iron/showroomfloor, /area/security/main) "dXe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/item/wrench, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, /turf/open/floor/iron, /area/engine/atmos) "dXB" = ( @@ -18143,8 +18105,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -18204,14 +18166,20 @@ /turf/open/floor/iron/dark, /area/maintenance/port/aft) "dYR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) "dZd" = ( @@ -18311,8 +18279,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -18322,17 +18290,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/aft) "eaL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -18381,8 +18349,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -18392,10 +18360,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -18464,7 +18432,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "ebZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -18482,7 +18450,7 @@ /turf/open/floor/iron/freezer, /area/security/prison) "ecC" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -18554,10 +18522,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -18565,7 +18533,7 @@ }, /area/maintenance/starboard) "edi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, @@ -18592,8 +18560,8 @@ /area/medical/medbay/central) "edB" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -18616,10 +18584,10 @@ /turf/open/floor/iron/showroomfloor, /area/science/robotics/lab) "edP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -18628,7 +18596,7 @@ /turf/open/floor/iron/showroomfloor, /area/security/main) "edQ" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -18654,10 +18622,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -18724,8 +18692,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -18790,8 +18758,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "egH" = ( @@ -18840,9 +18808,7 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "ehm" = ( /obj/structure/cable/yellow{ @@ -18887,13 +18853,13 @@ pixel_x = 28 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/science/xenobiology) "eiK" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -18914,10 +18880,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -19010,13 +18976,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -19025,7 +18991,6 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "ejL" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "External Freight Airlock" }, @@ -19079,7 +19044,7 @@ /turf/open/floor/iron, /area/quartermaster/storage) "ekG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -19091,7 +19056,7 @@ /obj/machinery/light_switch{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -19112,9 +19077,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -19195,10 +19157,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -19211,8 +19173,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -19228,10 +19190,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -19247,7 +19209,7 @@ }, /obj/item/analyzer, /obj/structure/rack, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -19325,7 +19287,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/purple, @@ -19343,11 +19305,9 @@ "eny" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -19360,8 +19320,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) @@ -19378,10 +19338,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -19399,13 +19359,13 @@ /turf/open/floor/plating, /area/bridge) "eoQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/holopad{ pixel_y = -16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/dark_green/opposingcorners, @@ -19466,10 +19426,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -19483,10 +19443,10 @@ dir = 8 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/purple, @@ -19501,10 +19461,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -19538,8 +19498,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/science/storage) "eqG" = ( @@ -19576,10 +19536,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -19590,8 +19550,8 @@ "etk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -19606,10 +19566,10 @@ "etJ" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -19631,7 +19591,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -19694,8 +19654,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/item/crowbar, @@ -19707,10 +19667,10 @@ /turf/open/floor/iron/showroomfloor, /area/medical/storage) "evl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -19719,8 +19679,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "evu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19777,10 +19737,10 @@ /turf/open/floor/iron/dark, /area/science/aft) "ewj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -19825,10 +19785,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -19837,10 +19794,10 @@ /area/maintenance/solars/port/fore) "exh" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -19888,10 +19845,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -19907,7 +19864,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -19925,10 +19882,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -19971,10 +19928,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -20002,10 +19959,10 @@ }, /area/maintenance/starboard/fore) "ezB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -20050,7 +20007,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/stack/rods/ten, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/aft) "eAv" = ( /obj/effect/decal/cleanable/dirt, @@ -20091,8 +20048,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/fore) @@ -20128,7 +20085,7 @@ dir = 1 }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/courtroom) @@ -20153,9 +20110,6 @@ /turf/open/floor/iron/dark, /area/security/brig/aft) "eCL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -20169,15 +20123,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/quartermaster/storage) "eDh" = ( @@ -20215,16 +20160,12 @@ /turf/open/floor/iron, /area/hallway/primary/central) "eEo" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/turf/open/floor/plating, +/area/maintenance/port/aft) "eEB" = ( /obj/item/radio/intercom{ pixel_y = 22 @@ -20283,12 +20224,12 @@ "eGj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, /obj/machinery/airalarm/directional/west{ pixel_x = -23 }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "eGw" = ( @@ -20296,8 +20237,8 @@ pixel_x = 32 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -20319,10 +20260,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -20335,10 +20276,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating{ @@ -20351,16 +20292,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "eHU" = ( @@ -20413,7 +20344,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -20427,10 +20358,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -20463,7 +20394,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -20475,10 +20406,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -20500,10 +20431,10 @@ "eJO" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -20539,7 +20470,6 @@ /turf/open/floor/iron, /area/security/courtroom) "eKG" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Brig Shuttle Airlock"; req_one_access_txt = "63" @@ -20547,12 +20477,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -20600,10 +20524,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -20682,10 +20606,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/aft) "eMB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -20768,8 +20692,8 @@ /area/hydroponics) "eOj" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -20783,8 +20707,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard) @@ -20825,10 +20749,7 @@ /area/hallway/primary/port) "ePn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/bot, @@ -20883,15 +20804,12 @@ name = "Quartermaster"; req_access_txt = "41" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/quartermaster/qm) "eQI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20899,13 +20817,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "eQM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/engine, @@ -20938,8 +20857,8 @@ /area/vacant_room/commissary) "eQT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -20957,10 +20876,10 @@ /turf/open/floor/iron, /area/security/brig) "eRd" = ( -/obj/machinery/computer/atmos_control/tank/mix_tank{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -20985,8 +20904,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -21059,8 +20978,8 @@ /area/crew_quarters/kitchen) "eSq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -21075,17 +20994,20 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "eTx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "eTC" = ( @@ -21094,8 +21016,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "eTF" = ( @@ -21195,7 +21117,7 @@ name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -21213,7 +21135,7 @@ "eVQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/holopad, @@ -21225,14 +21147,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/fore) "eWp" = ( @@ -21318,10 +21234,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -21354,8 +21270,8 @@ /turf/open/floor/iron/dark, /area/security/warden) "eWR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -21365,8 +21281,8 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "eWX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/public/glass{ name = "visitation Area" }, @@ -21381,8 +21297,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -21400,10 +21316,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -21441,23 +21357,21 @@ /area/hallway/primary/port) "eXO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "eYj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -21482,7 +21396,6 @@ /turf/open/floor/iron/dark, /area/hallway/primary/port) "eYo" = ( -/obj/machinery/door/firedoor, /obj/structure/door_assembly/door_assembly_ext{ anchored = 1 }, @@ -21493,7 +21406,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/airless, /area/quartermaster/warehouse) "eYs" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -21503,19 +21416,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/stripes/corner{ dir = 6 }, /turf/open/floor/engine, /area/engine/engineering) "eYu" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/maintenance/port/aft) "eYx" = ( @@ -21552,10 +21459,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating{ @@ -21602,7 +21509,7 @@ /turf/open/floor/iron/dark, /area/medical/chemistry) "eZx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -21623,10 +21530,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown, @@ -21641,10 +21548,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -21736,10 +21643,10 @@ /turf/open/floor/iron/dark, /area/science/explab) "fcs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -21771,13 +21678,13 @@ /area/quartermaster/warehouse) "fcK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -21792,14 +21699,12 @@ /turf/open/floor/iron, /area/security/prison) "fda" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 1; - external_pressure_bound = 120; - name = "server vent" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "fdc" = ( @@ -21842,10 +21747,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -21876,7 +21781,7 @@ /area/maintenance/starboard) "fes" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, @@ -21968,9 +21873,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -22004,7 +21906,7 @@ name = "Justice Shutter" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22089,12 +21991,17 @@ }, /area/maintenance/starboard) "fhM" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron, +/area/engine/atmos) "fhN" = ( /obj/machinery/computer/shuttle_flight/mining{ dir = 8; @@ -22106,7 +22013,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningoffice) "fhV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/cable{ icon_state = "1-2" }, @@ -22116,10 +22023,10 @@ /turf/open/floor/engine, /area/engine/engineering) "fib" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22143,16 +22050,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "fiy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -22165,8 +22072,8 @@ /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/freezer, /area/medical/virology) "fiV" = ( @@ -22259,6 +22166,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/execution/transfer) "fka" = ( @@ -22266,6 +22174,10 @@ c_tag = "Atmospherics Tank - N2O"; name = "atmospherics camera" }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/engine/n2o, /area/engine/atmos) "fkh" = ( @@ -22339,10 +22251,10 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22361,7 +22273,7 @@ /turf/open/floor/iron, /area/gateway) "flz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -22406,15 +22318,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) @@ -22424,10 +22327,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -22464,8 +22367,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/science/storage) @@ -22477,7 +22380,7 @@ /area/engine/supermatter) "fnG" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -22491,8 +22394,8 @@ "fnN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -22505,7 +22408,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -22522,12 +22425,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/aft) "fob" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -22540,24 +22442,23 @@ /turf/open/floor/iron, /area/quartermaster/office) "fod" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "fol" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Server Access"; req_one_access_txt = "30;70" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/server) "fps" = ( @@ -22577,8 +22478,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22596,13 +22497,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -22647,13 +22548,9 @@ /area/security/prison) "fqA" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fqB" = ( @@ -22672,10 +22569,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -22747,9 +22644,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating{ burnt = 1 @@ -22845,12 +22744,12 @@ req_one_access_txt = "10;24" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "fto" = ( @@ -22861,8 +22760,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -22928,10 +22827,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -22946,12 +22845,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -22964,10 +22857,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -23079,7 +22972,7 @@ /area/medical/genetics/cloning) "fxw" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/door/airlock/atmos/glass{ @@ -23138,7 +23031,7 @@ /turf/open/floor/catwalk_floor, /area/quartermaster/warehouse) "fyV" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -23159,10 +23052,10 @@ /turf/open/floor/iron/dark, /area/security/warden) "fzk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/dark_green/opposingcorners, @@ -23192,7 +23085,7 @@ "fzP" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -23213,10 +23106,10 @@ "fAm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -23238,10 +23131,10 @@ /area/maintenance/starboard/fore) "fAp" = ( /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/purple{ @@ -23281,8 +23174,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -23304,8 +23197,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -23321,10 +23214,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/camera/directional/west{ @@ -23342,10 +23235,10 @@ icon_state = "4-8" }, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -23375,7 +23268,7 @@ "fCS" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -23389,10 +23282,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -23423,7 +23316,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "fEp" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -23466,10 +23359,10 @@ /obj/machinery/holopad{ pixel_y = -16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/showroomfloor, @@ -23483,12 +23376,6 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/security/execution/transfer) "fFV" = ( @@ -23496,7 +23383,7 @@ /obj/structure/window/plasma/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/structure/cable{ @@ -23586,7 +23473,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/maintenance/port/aft) "fHe" = ( /obj/effect/landmark/start/assistant, @@ -23623,7 +23510,7 @@ /turf/open/floor/iron/dark, /area/security/brig) "fHv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -23647,8 +23534,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -23668,10 +23555,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -23680,10 +23567,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -23707,10 +23594,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -23767,10 +23654,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -23825,18 +23712,17 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) "fKl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille/broken, -/turf/open/floor/plating{ - broken = 1 - }, -/area/maintenance/port/aft) +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/old, +/obj/item/pickaxe, +/turf/open/floor/plating/asteroid/airless, +/area/space/nearstation) "fKt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -23846,10 +23732,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "fLj" = ( @@ -23858,7 +23744,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -23926,10 +23812,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -23958,12 +23844,6 @@ /area/crew_quarters/kitchen) "fNh" = ( /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -24038,12 +23918,12 @@ /area/maintenance/port/fore) "fNU" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" }, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "fNY" = ( @@ -24051,7 +23931,7 @@ /obj/structure/window/plasma/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/cable{ @@ -24138,9 +24018,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -24149,9 +24026,7 @@ "fPs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "fPx" = ( /obj/structure/table, @@ -24174,8 +24049,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "fPD" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -24202,9 +24077,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/iron, /area/engine/atmos) "fQt" = ( @@ -24260,10 +24132,10 @@ /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "fRf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -24290,10 +24162,10 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/siding/white/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/showroomfloor, @@ -24319,8 +24191,8 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "fSi" = ( @@ -24337,7 +24209,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -24386,10 +24258,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "fTn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -24483,10 +24355,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -24536,8 +24408,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) "fVI" = ( @@ -24545,10 +24417,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -24571,8 +24443,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ broken = 1 @@ -24586,11 +24458,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/plating{ burnt = 1 @@ -24640,10 +24509,10 @@ /area/teleporter) "fXi" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -24659,16 +24528,12 @@ /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "fXG" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Departure Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -24733,9 +24598,6 @@ /obj/machinery/light/small, /obj/effect/landmark/xeno_spawn, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/light_switch{ pixel_x = 1; pixel_y = -24 @@ -24743,6 +24605,10 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4; + hide = 0 + }, /turf/open/floor/plating{ burnt = 1 }, @@ -24825,7 +24691,7 @@ }, /area/docking/arrival) "gaQ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/machinery/meter, @@ -24836,7 +24702,7 @@ dir = 10 }, /turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) +/area/science/mixing) "gaY" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, @@ -24861,10 +24727,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, @@ -24897,10 +24763,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -24917,10 +24783,10 @@ }, /area/maintenance/port) "gdf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -24930,7 +24796,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -25011,8 +24877,8 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -25049,10 +24915,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -25085,10 +24951,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -25104,18 +24970,19 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/maintenance/port/aft) "gfq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "gfz" = ( @@ -25149,8 +25016,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard) @@ -25159,8 +25026,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -25183,8 +25050,8 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -25200,8 +25067,8 @@ name = "Traffic Control"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) @@ -25211,10 +25078,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -25288,7 +25155,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -25353,13 +25220,13 @@ /turf/open/floor/prison, /area/security/prison) "gjx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera/directional/north{ @@ -25369,7 +25236,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/virology) "gkv" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /obj/machinery/meter, @@ -25410,15 +25277,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) "glq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -25487,10 +25354,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/box, @@ -25523,13 +25390,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "gnn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -25540,8 +25407,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "gnC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/item/radio/intercom{ freerange = 1; @@ -25566,7 +25433,7 @@ /area/ai_monitored/storage/eva) "gnH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "gnK" = ( @@ -25574,8 +25441,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -25675,20 +25542,18 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "gpF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 - }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "gpP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -25705,10 +25570,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -25822,7 +25687,7 @@ }, /area/maintenance/port) "gsc" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /obj/structure/cable{ @@ -25833,10 +25698,10 @@ /area/engine/engineering) "gse" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25849,8 +25714,8 @@ req_access_txt = "58" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25919,7 +25784,7 @@ /area/maintenance/port/aft) "gtt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -26017,7 +25882,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -26042,7 +25907,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -26071,16 +25935,18 @@ icon_state = "4-8" }, /obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/plating/airless, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, /area/docking/arrival) "gwl" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26102,11 +25968,13 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "gwD" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "gwI" = ( @@ -26116,13 +25984,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -26132,17 +26000,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "gxf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -26167,8 +26035,8 @@ /area/maintenance/fore) "gxG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, @@ -26183,8 +26051,8 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "gyd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26200,10 +26068,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -26309,10 +26177,10 @@ /turf/open/floor/iron/dark, /area/medical/morgue) "gAT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -26333,8 +26201,8 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) "gBB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "gBG" = ( @@ -26364,9 +26232,6 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "gCq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -26379,6 +26244,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/science/server) "gCJ" = ( @@ -26396,10 +26264,10 @@ /turf/open/floor/iron, /area/quartermaster/exploration_dock) "gCN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -26418,7 +26286,7 @@ /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/fore) @@ -26477,11 +26345,11 @@ /turf/open/space/basic, /area/solar/starboard/fore) "gFj" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron/dark, /area/engine/atmos) "gFB" = ( @@ -26515,7 +26383,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -26552,7 +26420,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -26575,7 +26443,7 @@ name = "Medbay Storage"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -26584,7 +26452,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -26641,7 +26509,7 @@ "gIc" = ( /obj/machinery/gravity_generator/main/station, /obj/effect/decal/cleanable/greenglow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -26665,8 +26533,8 @@ }, /area/maintenance/starboard) "gIx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) @@ -26726,7 +26594,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk{ environment_smash = 0 }, -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid, /area/quartermaster/warehouse) "gKd" = ( /obj/machinery/clonepod/prefilled, @@ -26811,7 +26679,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/iron, @@ -26826,10 +26694,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -26840,14 +26708,14 @@ /obj/machinery/door/airlock/medical/glass{ name = "Cryopod Room" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/crew_quarters/cryopods) "gLl" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/siding/dark/corner{ @@ -26922,7 +26790,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -26964,10 +26832,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -27004,10 +26872,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -27023,10 +26891,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -27088,10 +26956,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -27129,9 +26997,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/iron, /area/hallway/primary/aft) "gQo" = ( @@ -27145,6 +27010,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/security/execution/transfer) "gQG" = ( @@ -27166,10 +27032,10 @@ }, /area/docking/arrival) "gRe" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -27218,7 +27084,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -27269,10 +27135,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -27309,7 +27175,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -27336,13 +27202,14 @@ /turf/open/floor/iron/dark, /area/hallway/primary/fore) "gTi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "gTk" = ( @@ -27385,8 +27252,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gUd" = ( @@ -27475,10 +27342,10 @@ name = "Infirmary"; req_one_access_txt = "1;34" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -27494,18 +27361,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/aft) "gVs" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/primary/fore) @@ -27529,10 +27396,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -27552,8 +27419,8 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -27566,10 +27433,6 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) "gWI" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Mix" - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -27583,17 +27446,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/hor) "gXb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "gXA" = ( @@ -27642,10 +27505,9 @@ /area/security/checkpoint/medical) "gYm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/execution/transfer) "gYr" = ( @@ -27660,15 +27522,15 @@ name = "Filter Chamber" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/dark, /area/maintenance/aft) "gYX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green{ @@ -27718,8 +27580,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -27796,7 +27658,7 @@ /turf/open/floor/iron, /area/quartermaster/storage) "haW" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/machinery/meter, /obj/structure/disposalpipe/segment{ dir = 9 @@ -27829,7 +27691,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating{ broken = 1 }, @@ -27845,7 +27707,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "hbo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/carpet/red, @@ -27882,10 +27744,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -27915,7 +27777,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -27975,10 +27837,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating{ @@ -28041,12 +27903,8 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "hdA" = ( -/obj/machinery/computer/turbine_computer{ - dir = 1; - id = "incineratorturbine" - }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/button/door/incinerator_vent_atmos_aux{ @@ -28057,13 +27915,16 @@ pixel_x = -8; pixel_y = -36 }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = 8; - pixel_y = -36 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_y = -32; + pixel_x = 7 + }, +/obj/machinery/computer/turbine_computer{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) "hdC" = ( @@ -28110,8 +27971,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, @@ -28120,10 +27981,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -28131,7 +27992,7 @@ /turf/open/floor/iron, /area/bridge) "heK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -28164,13 +28025,17 @@ pixel_x = 28; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "hfL" = ( @@ -28181,10 +28046,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -28240,7 +28105,7 @@ }, /area/docking/arrival) "hhY" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light{ dir = 4 }, @@ -28265,8 +28130,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ dir = 8 }, @@ -28288,8 +28153,8 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) "hiX" = ( @@ -28366,10 +28231,10 @@ /turf/open/floor/plating, /area/maintenance/port) "hlu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -28426,8 +28291,8 @@ color = "#666666"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -28540,11 +28405,11 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -28561,7 +28426,6 @@ /turf/open/floor/plating, /area/maintenance/starboard) "hnu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -28569,6 +28433,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "hnw" = ( @@ -28624,8 +28489,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/event_spawn, /turf/open/floor/plating{ burnt = 1 @@ -28646,7 +28511,7 @@ /turf/open/floor/iron/dark, /area/science/lab) "hoB" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/cable{ icon_state = "1-4" }, @@ -28663,7 +28528,7 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -28676,10 +28541,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -28716,9 +28581,6 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "hqk" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/item/radio/intercom{ pixel_x = -28 @@ -28726,6 +28588,9 @@ /obj/item/radio/intercom{ pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "hqq" = ( @@ -28749,10 +28614,10 @@ /area/medical/medbay/lobby) "hqx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -28767,10 +28632,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -28783,7 +28648,7 @@ "hqT" = ( /obj/effect/spawner/room/fivexfour, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/aft) "hqW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -28832,14 +28697,12 @@ "hrN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "hrV" = ( /obj/machinery/camera{ @@ -28852,7 +28715,7 @@ /area/science/shuttledock) "hsm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -28861,19 +28724,16 @@ /turf/open/floor/iron/showroomfloor, /area/science/mixing) "hss" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/catwalk_floor, -/area/maintenance/starboard/fore) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/port/aft) "hsx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -28905,8 +28765,8 @@ c_tag = "Fore Hallway Vault"; name = "fore camera" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -28952,10 +28812,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -28964,13 +28824,22 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "htB" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics Tank - O2"; - name = "atmospherics camera" +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/engine/o2, -/area/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "htS" = ( +/obj/machinery/light/small{ + dir = 1 + }, /obj/machinery/camera/directional/north{ c_tag = "Atmospherics Tank - N2"; name = "atmospherics camera" @@ -28978,16 +28847,16 @@ /turf/open/floor/engine/n2, /area/engine/atmos) "huc" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "huf" = ( @@ -28998,10 +28867,10 @@ /obj/item/wallframe/light_fixture/small{ pixel_y = -14 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -29013,8 +28882,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "hum" = ( @@ -29041,10 +28910,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -29053,8 +28922,8 @@ "huI" = ( /obj/machinery/airalarm/directional/east, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, @@ -29063,7 +28932,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -29074,8 +28943,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -29089,10 +28958,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -29220,7 +29089,7 @@ pixel_y = -24; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -29234,10 +29103,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -29271,10 +29140,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -29304,30 +29173,19 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/port) "hyX" = ( -/obj/machinery/door/airlock/external{ - name = "External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/turf/open/floor/plating{ + burnt = 1 }, -/turf/open/floor/iron/dark, /area/maintenance/starboard) "hzg" = ( /turf/open/floor/plating{ @@ -29345,8 +29203,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -29380,10 +29238,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating{ @@ -29395,8 +29253,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; name = "Cloning Lab"; @@ -29433,10 +29291,10 @@ /obj/machinery/light_switch{ pixel_y = -21 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -29461,10 +29319,10 @@ /area/security/courtroom) "hBB" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/holopad, @@ -29525,13 +29383,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/explab) "hDA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/light, @@ -29601,8 +29459,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -29634,10 +29492,10 @@ /turf/open/floor/iron/showroomfloor, /area/quartermaster/exploration_prep) "hEG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -29700,9 +29558,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating{ broken = 1 @@ -29716,8 +29576,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -29737,10 +29597,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -29764,10 +29624,12 @@ /area/quartermaster/warehouse) "hGV" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/quartermaster/storage) "hHf" = ( @@ -29797,10 +29659,10 @@ /area/quartermaster/warehouse) "hHN" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -29838,6 +29700,7 @@ /obj/item/radio/intercom{ pixel_y = 22 }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/science/server) "hIF" = ( @@ -29854,10 +29717,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -29865,8 +29728,8 @@ }, /area/maintenance/starboard/aft) "hJd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -29888,6 +29751,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "hKa" = ( @@ -29947,15 +29813,15 @@ dir = 8; name = "Waste to Filter" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "hKz" = ( @@ -30000,10 +29866,18 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/library) +"hLd" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + hide = 0 + }, +/turf/open/floor/iron, +/area/engine/atmos) "hLz" = ( /obj/structure/table, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/item/storage/toolbox/emergency{ @@ -30096,7 +29970,7 @@ dir = 1; name = "Distro to Waste" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -30114,13 +29988,13 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hos) "hNt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/sign/departments/chemistry{ pixel_x = 32 }, @@ -30140,10 +30014,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/dark_green/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -30184,10 +30058,10 @@ /area/medical/medbay/central) "hOu" = ( /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/item/radio/intercom{ @@ -30290,7 +30164,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8; color = "#486091" @@ -30348,10 +30222,10 @@ pixel_x = -24 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -30386,10 +30260,10 @@ name = "Cargo Office"; req_one_access_txt = "31;48" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -30407,10 +30281,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -30424,10 +30298,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -30445,22 +30319,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/engine/atmos) "hSH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) "hTB" = ( @@ -30518,8 +30390,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -30530,8 +30402,8 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/primary/port) @@ -30544,8 +30416,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/courtroom) @@ -30574,16 +30446,16 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "hVi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -30592,7 +30464,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -30646,10 +30518,7 @@ /turf/open/floor/iron, /area/security/main) "hWk" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/button/door{ id = "atmosventplasma"; name = "Emergency Plasma Vent Toggle"; @@ -30662,6 +30531,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "hWv" = ( @@ -30706,17 +30578,17 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, /area/maintenance/aft) "hWL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30788,20 +30660,16 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, /area/maintenance/aft) "hXx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/maintenance/port/aft) @@ -30826,12 +30694,13 @@ /obj/machinery/camera{ dir = 8 }, -/obj/machinery/airalarm/server{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_prep) "hXZ" = ( @@ -30839,7 +30708,7 @@ dir = 1; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -30869,10 +30738,10 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "hYj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -30902,8 +30771,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/wood{ broken = 1 }, @@ -30912,8 +30781,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -30957,24 +30824,21 @@ name = "Engineering External Airlock"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "iaP" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "iaT" = ( @@ -31019,9 +30883,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/plating{ burnt = 1 @@ -31032,10 +30895,10 @@ dir = 4; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -31052,8 +30915,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -31127,10 +30990,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -31184,7 +31047,7 @@ req_access_txt = "12" }, /obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/maintenance/port/aft) "iez" = ( /obj/effect/decal/cleanable/dirt, @@ -31202,8 +31065,8 @@ req_access_txt = "19" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/bridge) @@ -31291,16 +31154,14 @@ dir = 8 }, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/button/door{ id = "explorerstorage"; name = "Storage Shutter Toggle"; pixel_x = -25; req_access_txt = "49" }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/quartermaster/exploration_dock) "igj" = ( /obj/machinery/door/poddoor/preopen{ @@ -31327,10 +31188,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "igz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -31376,8 +31237,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -31403,13 +31264,13 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 6 }, /turf/open/floor/iron/showroomfloor, @@ -31515,10 +31376,10 @@ dir = 4 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -31579,10 +31440,10 @@ /area/medical/storage) "ikV" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -31599,10 +31460,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -31639,7 +31500,7 @@ /turf/open/floor/iron/showroomfloor, /area/science/explab) "ilL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -31648,7 +31509,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -31690,14 +31551,14 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "imK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/medical/genetics) "ing" = ( @@ -31706,8 +31567,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -31812,15 +31673,12 @@ /area/ai_monitored/turret_protected/aisat_interior) "ioW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ioY" = ( @@ -31835,15 +31693,6 @@ /area/quartermaster/warehouse) "ipi" = ( /obj/machinery/light/small, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/quartermaster/storage) "ipk" = ( @@ -31899,18 +31748,15 @@ /area/engine/break_room) "iqb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "iqv" = ( @@ -31944,7 +31790,7 @@ }, /area/maintenance/port/fore) "iqU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/light, @@ -31958,10 +31804,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -31974,10 +31820,14 @@ /area/security/brig) "irJ" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) +"irO" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/engine/supermatter) "irP" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -32016,10 +31866,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -32034,10 +31884,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -32077,20 +31927,9 @@ /turf/open/floor/iron/dark, /area/hydroponics) "itv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/maintenance/fore) -"itL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/maintenance/port/aft) "itO" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -32173,10 +32012,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -32206,10 +32045,10 @@ id = "brigfrontdoor"; name = "Front Security Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -32250,8 +32089,8 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "iww" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, /turf/open/floor/catwalk_floor, /area/engine/atmos) @@ -32289,6 +32128,9 @@ "ixT" = ( /obj/machinery/rnd/server, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "ixZ" = ( @@ -32297,8 +32139,8 @@ name = "Holding Area"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) @@ -32320,10 +32162,10 @@ /turf/open/floor/iron, /area/security/brig) "iyq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -32347,7 +32189,7 @@ /area/hydroponics) "iza" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/maintenance/fore) "izd" = ( @@ -32366,8 +32208,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -32424,22 +32266,22 @@ /area/medical/medbay/central) "izO" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "Plasma to Pure" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/engine/atmos) "izZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -32470,18 +32312,18 @@ /area/hallway/primary/fore) "iAw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard) "iAC" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -32530,10 +32372,10 @@ /area/quartermaster/warehouse) "iBb" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/cell_charger, @@ -32571,8 +32413,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -32582,17 +32424,17 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "iBn" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/light, @@ -32629,10 +32471,10 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -32662,17 +32504,17 @@ /turf/open/floor/iron, /area/bridge) "iBZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/engine, -/area/engine/engineering) +/turf/open/floor/iron, +/area/engine/atmos) "iCd" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/oil, @@ -32692,8 +32534,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/theatre) "iCW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, @@ -32728,16 +32570,14 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "iDM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, -/turf/open/floor/plating{ - burnt = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "iDS" = ( /obj/item/radio/intercom{ @@ -32746,10 +32586,10 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "iEg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -32772,11 +32612,11 @@ /turf/open/floor/plating, /area/maintenance/fore) "iEL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/virology{ id_tag = "ViroA"; name = "Quarantine Cell" @@ -32812,15 +32652,15 @@ }, /area/quartermaster/exploration_dock) "iEY" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "iFj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -32844,12 +32684,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "iFz" = ( @@ -32860,8 +32698,8 @@ dir = 8; pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -32878,7 +32716,7 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "iFI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -32916,6 +32754,19 @@ luminosity = 2 }, /area/quartermaster/warehouse) +"iFW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "iGe" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -32946,16 +32797,16 @@ pixel_x = -20; pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) +/area/science/mixing) "iGM" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32971,8 +32822,8 @@ }, /area/security/execution/education) "iGX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_green{ dir = 8 }, @@ -32982,7 +32833,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -33004,10 +32855,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -33126,10 +32977,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -33144,17 +32995,16 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/lobby) "iKk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, /area/medical/virology) "iKq" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external/glass{ name = "External Freight Airlock" }, @@ -33294,11 +33144,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating{ broken = 1 }, @@ -33323,17 +33168,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/port) "iNp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -33346,16 +33191,13 @@ pixel_y = 22 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/solars/starboard/fore) "iNz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/structure/cable/yellow{ @@ -33365,7 +33207,7 @@ /area/engine/engineering) "iNK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -33386,12 +33228,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -33458,10 +33294,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/sorting) "iOM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -33508,7 +33344,7 @@ /obj/machinery/computer/crew{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, @@ -33517,8 +33353,8 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/port/aft) @@ -33539,12 +33375,12 @@ "iQx" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/button/ignition/incinerator/toxmix{ - pixel_x = -6; - pixel_y = 30 + pixel_x = -8; + pixel_y = 36 }, /obj/machinery/button/door/incinerator_vent_toxmix{ pixel_x = 8; - pixel_y = 30 + pixel_y = 36 }, /obj/machinery/power/apc{ areastring = "/area/science/mixing/chamber"; @@ -33558,8 +33394,11 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, +/obj/machinery/airlock_controller/incinerator_toxmix{ + pixel_y = 26 + }, /turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) +/area/science/mixing) "iQD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -33567,10 +33406,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -33627,10 +33466,10 @@ "iSa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/decal/cleanable/blood/old, @@ -33665,7 +33504,7 @@ }, /area/hallway/primary/fore) "iSt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -33689,7 +33528,7 @@ /turf/open/floor/iron/freezer, /area/security/prison) "iTq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33698,7 +33537,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -33733,7 +33572,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "iTH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -33748,7 +33587,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "iUg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/structure/cable/yellow{ @@ -33772,10 +33611,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -33787,10 +33626,10 @@ name = "Toxins Storage"; req_access_txt = "8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -33839,8 +33678,8 @@ /turf/open/floor/iron, /area/engine/break_room) "iUN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood/end{ dir = 1 }, @@ -33865,7 +33704,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -33883,7 +33722,7 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "iVE" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/machinery/meter, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33948,24 +33787,15 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "iWz" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "iWC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -34001,10 +33831,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -34025,7 +33852,7 @@ /turf/open/floor/iron, /area/engine/atmos) "iXg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -34034,7 +33861,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -34116,8 +33943,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/medical/storage) @@ -34154,10 +33981,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -34205,10 +34032,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -34216,7 +34043,7 @@ }, /area/maintenance/starboard/fore) "jch" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -34233,10 +34060,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -34244,11 +34071,12 @@ }, /area/maintenance/port) "jcC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/iron, -/area/security/execution/transfer) +/area/engine/atmos) "jcF" = ( /obj/item/reagent_containers/cup/soda_cans/dr_gibb, /turf/open/floor/plating, @@ -34272,10 +34100,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34339,10 +34167,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -34390,13 +34218,13 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jeX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -34412,10 +34240,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -34429,10 +34257,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -34444,10 +34272,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -34489,8 +34317,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -34524,10 +34352,10 @@ /obj/structure/sign/directions/evac{ pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -34596,7 +34424,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -34640,10 +34468,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -34686,10 +34514,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -34706,10 +34534,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -34721,8 +34549,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/central) "jkh" = ( @@ -34734,7 +34562,7 @@ }, /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/airalarm/kitchen_cold_room{ +/obj/machinery/airalarm{ dir = 1; pixel_y = 24 }, @@ -34747,12 +34575,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -34783,22 +34606,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/aft) "jle" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -34810,10 +34633,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -34859,17 +34682,14 @@ name = "Prison External Airlock"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /turf/open/floor/iron/dark, /area/maintenance/port/aft) "jlW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -34918,10 +34738,10 @@ }, /area/maintenance/fore) "jnH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/dark{ @@ -34967,15 +34787,10 @@ /area/crew_quarters/heads/captain) "jol" = ( /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jor" = ( @@ -35015,10 +34830,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35029,10 +34844,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -35065,8 +34880,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -35075,10 +34890,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -35111,7 +34926,7 @@ }, /area/science/robotics/mechbay) "jrd" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -35129,8 +34944,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -35154,8 +34969,8 @@ /area/docking/arrival) "jsj" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/bridge) @@ -35202,8 +35017,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -35231,7 +35046,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -35263,10 +35078,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/chair/stool/bar/directional/west, @@ -35289,7 +35104,13 @@ /area/medical/medbay/central) "jtU" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, /area/maintenance/port/aft) "jtY" = ( /obj/effect/turf_decal/tile/neutral{ @@ -35302,7 +35123,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/box, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 }, /turf/open/floor/plating/airless, @@ -35314,13 +35135,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "jvr" = ( @@ -35344,10 +35165,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -35514,10 +35335,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -35531,8 +35352,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/central) @@ -35546,24 +35367,22 @@ }, /area/quartermaster/warehouse) "jyJ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/closet/cardboard, +/obj/structure/grille/broken, +/turf/open/floor/plating{ + broken = 1 }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/area/maintenance/fore) "jyV" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Storage" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -35612,7 +35431,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "jzO" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -35632,8 +35451,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -35654,10 +35473,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, @@ -35689,9 +35508,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -35701,8 +35517,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -35774,17 +35590,18 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "jBV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, +/obj/machinery/meter/monitored/waste_loop, /turf/open/floor/iron, /area/engine/atmos) "jCh" = ( @@ -35846,16 +35663,6 @@ "jCA" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "jDh" = ( @@ -35863,10 +35670,10 @@ pixel_y = 24 }, /obj/effect/landmark/start/chaplain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -35899,10 +35706,10 @@ /area/storage/primary) "jEm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -35946,7 +35753,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -35973,10 +35780,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -35985,7 +35792,7 @@ /turf/open/floor/engine, /area/security/nuke_storage) "jFa" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/machinery/meter, @@ -36002,9 +35809,6 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/airalarm/directional/south, /turf/open/floor/plating{ broken = 1 @@ -36045,10 +35849,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -36064,10 +35868,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -36103,7 +35907,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -36119,17 +35923,17 @@ /turf/open/floor/circuit/telecomms, /area/science/xenobiology) "jGx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/engine/atmos) "jGM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/prison, @@ -36172,7 +35976,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark/telecomms, @@ -36197,10 +36001,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/engine, @@ -36227,7 +36031,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -36238,7 +36042,7 @@ "jHZ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/dark/opposingcorners, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/iron/dark, /area/medical/cryo) "jIf" = ( @@ -36248,10 +36052,10 @@ /obj/structure/noticeboard{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -36283,10 +36087,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -36360,8 +36164,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -36370,15 +36174,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "jKB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -36391,10 +36195,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -36419,10 +36223,10 @@ /turf/open/floor/iron, /area/bridge) "jLI" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -36437,10 +36241,10 @@ /turf/open/floor/iron/showroomfloor, /area/security/execution/education) "jLL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) @@ -36451,10 +36255,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -36477,10 +36281,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -36505,8 +36309,8 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "jMr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -36531,7 +36335,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "jMG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -36565,12 +36369,12 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "jNn" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/atmos) "jNv" = ( @@ -36633,8 +36437,8 @@ /area/crew_quarters/bar) "jOV" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ pixel_x = 24 @@ -36645,10 +36449,6 @@ "jOZ" = ( /obj/structure/closet/emcloset/anchored, /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -36677,10 +36477,10 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -36693,10 +36493,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -36704,7 +36504,7 @@ }, /area/maintenance/aft) "jQr" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /obj/machinery/meter, @@ -36718,7 +36518,7 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/port/fore) @@ -36752,7 +36552,7 @@ dir = 8; pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -36810,8 +36610,8 @@ }, /area/docking/arrival) "jSa" = ( -/obj/machinery/meter/atmos/distro_loop, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/meter/monitored/distro_loop, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -36820,8 +36620,8 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "jSb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36864,14 +36664,14 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, /area/ai_monitored/storage/satellite) "jTA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -36885,7 +36685,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -36933,9 +36733,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -36963,8 +36763,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -36990,10 +36790,10 @@ req_access_txt = "1"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -37019,12 +36819,15 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "jVH" = ( @@ -37059,10 +36862,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -37112,7 +36915,7 @@ /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -37132,7 +36935,7 @@ dir = 8; color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/medical/virology) "jYc" = ( @@ -37140,10 +36943,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -37193,12 +36996,12 @@ /turf/open/floor/iron/dark, /area/security/brig) "jZm" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "jZM" = ( @@ -37211,9 +37014,7 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/quartermaster/exploration_dock) "jZU" = ( /obj/effect/decal/cleanable/cobweb, @@ -37224,10 +37025,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating{ @@ -37242,13 +37043,13 @@ /area/hallway/primary/fore) "kat" = ( /obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -37285,7 +37086,7 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "kaO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/item/clothing/neck/stethoscope{ pixel_y = 5 }, @@ -37293,7 +37094,7 @@ pixel_y = 6 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/reagent_containers/spray/cleaner, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37308,8 +37109,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) "kcw" = ( @@ -37320,22 +37121,16 @@ c_tag = "Toxins Burn Chamber"; name = "science camera" }, -/obj/machinery/airalarm/mixingchamber{ - dir = 4; - pixel_x = 24 - }, /obj/machinery/light/small{ dir = 4 }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "kcS" = ( /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/execution/transfer) "kcT" = ( @@ -37348,10 +37143,10 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "kcV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37384,8 +37179,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/ai_monitored/turret_protected/aisat/atmos) "keb" = ( @@ -37415,10 +37210,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -37437,10 +37232,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "keS" = ( @@ -37483,8 +37278,8 @@ req_access_txt = "28" }, /obj/structure/fans/tiny/invisible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/central) @@ -37543,12 +37338,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -37566,6 +37355,16 @@ /obj/machinery/fax/cargo, /turf/open/floor/iron, /area/quartermaster/storage) +"kgU" = ( +/obj/machinery/door/airlock/external{ + name = "External Freight Airlock" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/warehouse) "khe" = ( /obj/machinery/door/airlock/maintenance{ name = "research Lab Maintenance"; @@ -37574,8 +37373,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard) @@ -37642,8 +37441,8 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "kjw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -37701,7 +37500,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -37800,12 +37599,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/dark, /area/engine/atmos) "kkX" = ( @@ -37818,8 +37618,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) "kla" = ( @@ -37864,10 +37666,10 @@ }, /area/maintenance/port) "klz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -37912,10 +37714,10 @@ /turf/open/floor/iron/dark, /area/construction/mining/aux_base) "kmh" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -37956,10 +37758,10 @@ /obj/machinery/newscaster{ pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -38076,7 +37878,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -38097,11 +37899,15 @@ "koL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating{ broken = 1 }, @@ -38114,10 +37920,10 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "koS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "kpA" = ( @@ -38275,7 +38081,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /turf/open/floor/engine, @@ -38293,9 +38099,6 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "krz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 10 @@ -38306,6 +38109,9 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/science/server) "krC" = ( @@ -38319,10 +38125,10 @@ /area/engine/engineering) "krO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -38390,7 +38196,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "ksL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -38450,10 +38256,10 @@ }, /area/maintenance/port/aft) "kvl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/airalarm/directional/south, @@ -38474,7 +38280,7 @@ dir = 4; color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/showroomfloor, @@ -38527,8 +38333,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ broken = 1 @@ -38576,10 +38382,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -38692,10 +38498,10 @@ "kyu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -38735,16 +38541,12 @@ /turf/open/floor/iron/showroomfloor, /area/medical/genetics) "kzl" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -38767,10 +38569,10 @@ id_tag = "Cell"; name = "Cell 1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -38819,10 +38621,10 @@ /turf/open/floor/iron, /area/hydroponics) "kAF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -38875,7 +38677,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "kBa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -38897,8 +38699,6 @@ }, /area/science/shuttledock) "kBQ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4, /obj/machinery/power/smes/engineering, /obj/structure/sign/warning/electricshock{ pixel_x = 32 @@ -38928,10 +38728,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -38969,7 +38769,7 @@ /turf/open/floor/iron, /area/security/prison) "kEm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/structure/cable/yellow{ @@ -39000,6 +38800,12 @@ /area/hydroponics) "kEU" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "kEZ" = ( @@ -39026,10 +38832,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -39082,9 +38888,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -39102,10 +38908,10 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/engine, @@ -39115,10 +38921,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -39129,8 +38935,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -39144,7 +38950,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -39155,10 +38961,10 @@ }, /area/maintenance/central) "kHa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -39168,10 +38974,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "kHg" = ( @@ -39190,9 +38996,9 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "kHp" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "kHs" = ( @@ -39230,7 +39036,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/fore) @@ -39250,18 +39056,12 @@ /turf/open/floor/iron/dark, /area/construction/mining/aux_base) "kIl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/plating, +/area/maintenance/port/aft) "kJb" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/yellow, @@ -39272,10 +39072,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -39361,8 +39161,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) @@ -39386,26 +39186,18 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "kLH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) "kLO" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/fore) "kLS" = ( @@ -39431,10 +39223,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating{ @@ -39465,10 +39257,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39504,10 +39296,10 @@ /area/hallway/primary/aft) "kNK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -39544,8 +39336,8 @@ /turf/open/floor/iron/showroomfloor, /area/security/warden) "kOc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -39617,7 +39409,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/chemistry) "kQs" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -39728,7 +39520,7 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -39741,7 +39533,7 @@ /obj/structure/window/plasma/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/structure/cable{ @@ -39790,8 +39582,8 @@ /area/hallway/secondary/exit/departure_lounge) "kTb" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -39804,14 +39596,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/fore) "kTS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -39872,6 +39664,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + hide = 0 + }, /turf/open/floor/iron, /area/engine/atmos) "kUJ" = ( @@ -39924,10 +39720,10 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -39942,7 +39738,7 @@ icon_state = "left"; name = "Fitness Ring" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -39979,9 +39775,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -39999,8 +39792,8 @@ }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -40031,7 +39824,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/aft) "kZz" = ( /obj/machinery/holopad, @@ -40050,7 +39843,7 @@ /turf/open/floor/iron/dark, /area/hydroponics) "lar" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/structure/cable/yellow{ @@ -40063,10 +39856,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -40085,23 +39878,21 @@ }, /area/quartermaster/warehouse) "laK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "laQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -40115,7 +39906,7 @@ dir = 8; color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/medical/virology) "lbQ" = ( @@ -40178,8 +39969,8 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -40271,10 +40062,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -40293,10 +40084,10 @@ /area/hallway/primary/aft) "ldK" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -40305,18 +40096,18 @@ /turf/open/floor/iron/dark, /area/hallway/primary/fore) "ldR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "ldW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -40367,10 +40158,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -40385,8 +40176,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard) @@ -40421,10 +40212,10 @@ pixel_y = null; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/sink{ dir = 8; pixel_x = -14; @@ -40470,10 +40261,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/engine, @@ -40588,10 +40379,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -40606,10 +40397,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -40624,12 +40415,6 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "lhK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -40643,7 +40428,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison/shielded) "lhZ" = ( @@ -40651,10 +40436,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating{ @@ -40686,7 +40471,7 @@ /area/hallway/primary/starboard) "lir" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "liw" = ( @@ -40703,9 +40488,6 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/starboard) "liC" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -40715,6 +40497,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "liP" = ( @@ -40742,8 +40525,8 @@ name = "e.v.a. Maintenance"; req_access_txt = "18" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/aft) @@ -40786,10 +40569,6 @@ /area/security/execution/education) "lkr" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, /turf/open/floor/catwalk_floor, /area/maintenance/disposal) "llh" = ( @@ -40826,7 +40605,7 @@ /turf/open/floor/iron/dark, /area/maintenance/central) "lmg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -40889,9 +40668,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "lnA" = ( @@ -40921,13 +40700,13 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -40938,10 +40717,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -40960,10 +40739,10 @@ name = "exploration Shuttle Dock"; req_one_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -40983,10 +40762,10 @@ name = "bar Maintenance"; req_access_txt = "25" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -41021,10 +40800,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -41040,8 +40819,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -41053,8 +40832,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/port) @@ -41078,8 +40857,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -41100,10 +40879,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -41112,13 +40891,13 @@ /area/maintenance/fore) "lrG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) "lrJ" = ( @@ -41166,10 +40945,10 @@ /area/science/shuttledock) "lsD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -41187,8 +40966,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/disposal) @@ -41314,8 +41093,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -41385,7 +41164,7 @@ /turf/open/floor/iron/dark, /area/gateway) "lvC" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -41491,19 +41270,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/aft) "lxu" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/holopad, @@ -41534,7 +41313,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -41542,8 +41321,8 @@ /area/hallway/primary/starboard) "lxY" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/security/detectives_office) "lyb" = ( @@ -41584,10 +41363,10 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -41596,7 +41375,7 @@ /turf/open/floor/iron, /area/security/brig) "lzC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -41606,7 +41385,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/light_switch{ @@ -41623,10 +41402,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -41635,7 +41414,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ @@ -41720,8 +41499,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -41752,10 +41531,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -41825,10 +41604,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -41866,8 +41645,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41887,10 +41666,10 @@ /area/hallway/primary/port) "lDu" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41921,10 +41700,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -41937,7 +41716,7 @@ "lEK" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41952,17 +41731,13 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/starboard/fore) "lER" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Mix to Gas" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -42002,10 +41777,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -42044,7 +41819,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lFM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -42072,10 +41847,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 @@ -42174,8 +41949,8 @@ /turf/open/floor/iron/dark, /area/security/main) "lIf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42200,25 +41975,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"lIY" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external{ - name = "Departure Shuttle Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/secondary/exit/departure_lounge) "lJb" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -42309,10 +42065,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -42333,8 +42089,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/primary/fore) @@ -42362,7 +42118,8 @@ icon_state = "0-4" }, /turf/open/floor/plating{ - burnt = 1 + burnt = 1; + initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/server) "lLq" = ( @@ -42376,10 +42133,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -42429,7 +42186,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; name = "Nitrogen Outlet" @@ -42457,12 +42214,6 @@ /turf/open/floor/plating, /area/maintenance/port) "lNf" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/security/execution/transfer) "lNs" = ( @@ -42490,10 +42241,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -42502,10 +42253,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -42542,18 +42293,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/engine, /area/tcommsat/computer) "lPe" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/cardboard, /obj/structure/grille/broken, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/fore) "lPo" = ( @@ -42584,10 +42337,10 @@ /area/engine/break_room) "lQw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/research) @@ -42617,10 +42370,10 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "lQP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -42647,7 +42400,10 @@ "lRg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, /area/maintenance/port/aft) "lRn" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -42669,15 +42425,15 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/security/brig) "lRr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -42701,7 +42457,7 @@ /turf/open/floor/plating, /area/security/prison) "lRy" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /obj/structure/cable{ @@ -42715,7 +42471,7 @@ "lRW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -42762,8 +42518,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "lTO" = ( @@ -42790,7 +42546,7 @@ /obj/item/storage/toolbox/emergency{ pixel_y = 5 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/aft) "lUc" = ( /obj/machinery/door/airlock/maintenance{ @@ -42823,8 +42579,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -42862,10 +42618,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42922,8 +42678,8 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "lVM" = ( @@ -42952,10 +42708,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -42965,10 +42721,6 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "lWL" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/wrench, -/obj/item/crowbar/red, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; @@ -42981,6 +42733,11 @@ c_tag = "Server Room"; name = "science camera" }, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, +/obj/effect/mapping_helpers/atmos_auto_connect, +/obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/showroomfloor, /area/science/server) "lWX" = ( @@ -42999,10 +42756,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine, @@ -43013,10 +42770,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating{ @@ -43028,10 +42785,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -43039,10 +42796,10 @@ }, /area/maintenance/fore) "lXB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -43071,7 +42828,6 @@ /area/security/execution/education) "lXP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller/directional/east, /obj/machinery/light/small{ dir = 8 }, @@ -43080,10 +42836,10 @@ "lXX" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -43094,8 +42850,8 @@ name = "Security Hallway" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/primary/aft) @@ -43127,10 +42883,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -43163,6 +42919,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "lZo" = ( @@ -43193,8 +42951,6 @@ shuttledocked = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -43208,8 +42964,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -43223,7 +42979,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "mad" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron/dark, @@ -43249,10 +43005,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -43284,8 +43040,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -43312,10 +43068,12 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -43329,13 +43087,13 @@ /turf/open/floor/iron, /area/security/main) "mbc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "mbp" = ( @@ -43362,10 +43120,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -43383,15 +43141,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/central) "mcn" = ( @@ -43425,8 +43180,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -43434,14 +43189,14 @@ /turf/open/floor/iron, /area/crew_quarters/heads/chief) "mcq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -43462,10 +43217,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -43534,8 +43289,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -43581,7 +43336,7 @@ /area/crew_quarters/fitness/recreation) "mew" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/sign/poster/contraband/missing_gloves{ @@ -43713,15 +43468,15 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "mgE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "mgF" = ( @@ -43729,15 +43484,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "mgJ" = ( @@ -43747,10 +43493,10 @@ /obj/machinery/door/airlock/public/glass{ name = "visitation Area" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -43769,10 +43515,10 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mgS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -43797,7 +43543,7 @@ /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "mhw" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -43838,10 +43584,15 @@ /turf/open/floor/iron/dark, /area/hydroponics) "mix" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/fore) +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics Tank - N2"; + name = "atmospherics camera" + }, +/turf/open/floor/engine/air, +/area/engine/atmos) "miH" = ( /obj/machinery/door/airlock/medical{ id_tag = "Shower_2"; @@ -43856,10 +43607,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -43919,8 +43670,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -43947,8 +43698,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ broken = 1 @@ -43982,10 +43733,10 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -44020,15 +43771,12 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/engine/atmos) "mmC" = ( @@ -44045,10 +43793,10 @@ /area/medical/virology) "mmK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -44059,10 +43807,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -44104,8 +43852,8 @@ /area/hallway/primary/central) "mnO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/research) @@ -44129,8 +43877,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) "mnX" = ( @@ -44139,12 +43887,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plating{ burnt = 1 }, @@ -44239,10 +43988,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -44278,8 +44027,8 @@ name = "Engineering Foyer" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/engine/break_room) @@ -44287,10 +44036,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) "mqd" = ( @@ -44325,7 +44074,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -44360,7 +44109,7 @@ /area/bridge) "mro" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -44369,10 +44118,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -44409,7 +44158,7 @@ "msH" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/office) @@ -44435,18 +44184,18 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/medical/surgery) "msN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -44454,8 +44203,8 @@ }, /area/maintenance/aft) "msV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -44490,7 +44239,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -44509,7 +44258,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -44537,7 +44286,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -44589,7 +44338,7 @@ "mvp" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44627,10 +44376,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -44686,8 +44435,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -44701,8 +44450,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -44776,13 +44525,13 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -44794,10 +44543,10 @@ /turf/closed/wall, /area/security/brig/aft) "mzL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -44891,10 +44640,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44939,8 +44688,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -44965,10 +44714,10 @@ pixel_x = -28; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral{ @@ -44994,7 +44743,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -45087,9 +44836,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, /obj/structure/sign/warning/xeno_mining{ pixel_y = 32 }, @@ -45132,13 +44878,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "mDZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -45168,16 +44917,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/port/aft) "mFy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45199,7 +44948,7 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "mFJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/item/radio/intercom{ @@ -45241,10 +44990,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -45261,8 +45010,8 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45286,9 +45035,6 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "mGY" = ( @@ -45304,10 +45050,10 @@ }, /obj/effect/turf_decal/box, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -45338,7 +45084,7 @@ "mHw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/maintenance/port/aft) "mHC" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -45360,8 +45106,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -45390,8 +45136,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -45404,10 +45150,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -45438,8 +45184,8 @@ name = "command camera" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -45452,10 +45198,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -45495,13 +45241,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -45518,8 +45264,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) @@ -45553,7 +45299,7 @@ /turf/open/floor/iron, /area/security/brig) "mMc" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -45570,8 +45316,8 @@ /area/security/brig) "mMI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45592,7 +45338,7 @@ /turf/open/floor/iron, /area/security/checkpoint/supply) "mMY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -45689,10 +45435,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -45755,9 +45501,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/sign/warning/xeno_mining{ pixel_y = -32 }, @@ -45809,10 +45552,10 @@ name = "atmospherics sorting disposal pipe"; sortType = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -45848,10 +45591,10 @@ /area/gateway) "mUa" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -45903,10 +45646,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -45933,8 +45676,7 @@ /turf/open/floor/iron/dark, /area/security/prison/shielded) "mVu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -45958,10 +45700,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -45982,10 +45724,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -45997,7 +45739,7 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) "mWA" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/machinery/meter, @@ -46022,10 +45764,10 @@ dir = 4 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -46034,10 +45776,10 @@ /area/crew_quarters/toilet/restrooms) "mWT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/research) @@ -46060,7 +45802,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) @@ -46086,10 +45828,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -46129,14 +45871,14 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "mXU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig/aft) "mXX" = ( @@ -46154,10 +45896,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -46177,13 +45919,13 @@ /obj/structure/sign/painting/library{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner, @@ -46215,10 +45957,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -46295,8 +46037,8 @@ /area/quartermaster/warehouse) "nbd" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -46343,10 +46085,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -46409,10 +46151,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -46424,10 +46166,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -46437,8 +46179,8 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/toilet/restrooms) "ncp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "ncQ" = ( @@ -46462,6 +46204,9 @@ req_access_txt = "13" }, /obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/maintenance/disposal) "ndS" = ( @@ -46471,7 +46216,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) "nen" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -46498,8 +46243,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) "nfD" = ( @@ -46522,10 +46267,10 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "nfM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -46569,9 +46314,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/sign/departments/minsky/medical/virology/virology1{ @@ -46588,10 +46333,10 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -46658,14 +46403,12 @@ "nha" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ - broken = 1 + burnt = 1 }, /area/maintenance/port/aft) "nhh" = ( @@ -46676,7 +46419,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -46751,14 +46494,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard/aft) "niL" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -46793,13 +46536,13 @@ /turf/open/floor/engine, /area/security/nuke_storage) "njx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -46808,7 +46551,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/genetics/cloning) "njE" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/machinery/meter, @@ -46846,10 +46589,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -46873,10 +46616,10 @@ name = "ce sorting disposal pipe"; sortType = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow, @@ -46897,7 +46640,7 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "nlp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -46931,13 +46674,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/catwalk_floor, /area/tcommsat/computer) "nlK" = ( @@ -46991,10 +46730,10 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "nmx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -47008,10 +46747,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -47020,7 +46759,7 @@ /area/maintenance/port/fore) "nmU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -47086,8 +46825,8 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "nnV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -47105,8 +46844,8 @@ security_level = 6 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/bridge) @@ -47146,8 +46885,8 @@ /area/quartermaster/warehouse) "npe" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -47166,8 +46905,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "npj" = ( @@ -47198,8 +46937,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/grille_or_trash, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -47233,10 +46972,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -47287,10 +47026,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -47381,10 +47120,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/item/radio/intercom{ @@ -47414,8 +47153,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "nuL" = ( @@ -47555,8 +47294,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -47577,7 +47316,7 @@ /area/crew_quarters/fitness/recreation) "nxx" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, @@ -47585,7 +47324,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "nxC" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -47599,10 +47338,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -47625,10 +47364,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -47681,8 +47420,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, @@ -47713,18 +47452,22 @@ /area/quartermaster/storage) "nAs" = ( /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "nAz" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "nAG" = ( @@ -47736,10 +47479,10 @@ /area/maintenance/disposal/incinerator) "nAR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -47752,10 +47495,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating{ @@ -47797,10 +47540,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral, @@ -47824,6 +47567,10 @@ c_tag = "Atmospherics Tank - Mix"; name = "atmospherics camera" }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/engine/vacuum, /area/engine/atmos) "nBZ" = ( @@ -47856,10 +47603,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, @@ -47887,14 +47634,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/starboard/aft) "nDx" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/engine, /area/engine/engineering) "nDG" = ( @@ -47905,8 +47652,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -47941,10 +47688,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -47987,13 +47734,12 @@ }, /area/security/execution/education) "nFK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -48046,10 +47792,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -48110,10 +47856,10 @@ /area/maintenance/starboard/fore) "nIb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -48138,8 +47884,8 @@ /area/engine/atmos) "nIt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -48157,7 +47903,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -48239,10 +47985,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -48421,12 +48167,6 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -48445,8 +48185,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -48470,10 +48210,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -48482,9 +48222,6 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "nNi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/lattice/catwalk, /turf/open/floor/plating/asteroid/airless, /area/space/nearstation) @@ -48523,10 +48260,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -48538,8 +48275,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -48573,11 +48310,11 @@ /turf/open/floor/iron/dark, /area/maintenance/port) "nOC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -48591,7 +48328,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -48604,10 +48341,10 @@ /area/maintenance/port/fore) "nON" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light{ @@ -48647,8 +48384,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -48664,12 +48401,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -48757,10 +48488,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -48799,10 +48530,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -48842,8 +48573,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -48857,10 +48588,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -48873,7 +48604,7 @@ /area/quartermaster/warehouse) "nTc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -48892,10 +48623,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -48988,7 +48719,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -49035,10 +48766,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -49110,10 +48841,10 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -49124,7 +48855,7 @@ /turf/open/floor/iron, /area/security/brig) "nWI" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -49206,7 +48937,7 @@ /area/science/robotics/lab) "nYq" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -49241,14 +48972,14 @@ /turf/open/floor/iron/dark, /area/quartermaster/sorting) "nYS" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "nYU" = ( @@ -49336,20 +49067,16 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/starboard) -"nZu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/fore) "nZC" = ( /obj/item/kirbyplants{ icon_state = "plant-16" @@ -49367,10 +49094,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -49434,10 +49161,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -49460,7 +49187,7 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "oaz" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -49503,7 +49230,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "obT" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -49561,10 +49288,10 @@ name = "Security Office"; req_one_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -49587,10 +49314,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -49629,10 +49356,10 @@ /turf/open/floor/iron/dark, /area/chapel/main) "odn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -49689,10 +49416,7 @@ /turf/open/floor/iron/dark, /area/bridge) "oeK" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/button/door{ id = "atmosventco2"; name = "Emergency CO2 Vent Toggle"; @@ -49706,6 +49430,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "oeU" = ( @@ -49772,10 +49499,10 @@ name = "chapel Maintenance"; req_one_access_txt = "22" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -49784,10 +49511,10 @@ /turf/open/floor/iron/dark, /area/chapel/main) "ogw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/grass, @@ -49820,10 +49547,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -49873,6 +49600,10 @@ c_tag = "Atmospherics Tank - Plasma"; name = "atmospherics camera" }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/engine/plasma, /area/engine/atmos) "oik" = ( @@ -49888,10 +49619,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -49948,19 +49679,19 @@ /turf/open/floor/iron/dark, /area/quartermaster/sorting) "oiN" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "oiP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -50000,6 +49731,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/plating{ burnt = 1 }, @@ -50042,12 +49776,13 @@ /turf/open/floor/engine, /area/science/xenobiology) "okY" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating{ burnt = 1 }, @@ -50071,8 +49806,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -50089,8 +49824,8 @@ /area/security/brig/aft) "omi" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -50123,10 +49858,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/ai_monitored/turret_protected/aisat/atmos) "omS" = ( @@ -50240,10 +49973,20 @@ }, /area/maintenance/port/aft) "onN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"ooi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ooJ" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -50360,8 +50103,8 @@ /turf/open/floor/iron/dark/corner, /area/hallway/primary/port) "opP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -50384,7 +50127,7 @@ /turf/open/floor/iron/dark, /area/security/brig/aft) "oqt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light{ dir = 8 }, @@ -50403,8 +50146,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/main) "oqC" = ( @@ -50414,7 +50157,7 @@ /turf/open/floor/iron, /area/security/courtroom) "oqE" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/closed/wall, @@ -50430,19 +50173,17 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "oqP" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "oqS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, -/turf/open/floor/plating{ - broken = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/aft) "orr" = ( /obj/effect/turf_decal/siding/wood, @@ -50450,10 +50191,10 @@ /area/security/prison) "orv" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50462,7 +50203,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -50517,10 +50258,10 @@ /area/docking/arrival) "otk" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/explab) @@ -50613,13 +50354,13 @@ req_access_txt = "39" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -50645,10 +50386,10 @@ /area/quartermaster/exploration_dock) "ouv" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -50672,23 +50413,33 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/quartermaster/warehouse) +"ouF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating{ + broken = 1 + }, +/area/maintenance/fore) "ouM" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/machinery/door/airlock/external{ name = "Engineering External Airlock"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "ouT" = ( @@ -50696,7 +50447,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/wardrobe/green, /turf/open/floor/plating{ - broken = 1 + burnt = 1 }, /area/maintenance/port/aft) "ouU" = ( @@ -50728,16 +50479,13 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "ovl" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Unfiltered & Air to Mix" - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "ovr" = ( @@ -50762,8 +50510,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -50773,8 +50521,8 @@ /turf/open/floor/iron, /area/quartermaster/storage) "owi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50800,8 +50548,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/detectives_office) "owT" = ( @@ -50809,7 +50557,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -50893,10 +50641,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -50915,7 +50663,7 @@ "oxu" = ( /obj/structure/table, /obj/machinery/keycard_auth, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, @@ -50923,7 +50671,7 @@ "oxv" = ( /obj/structure/girder/displaced, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -51015,10 +50763,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -51029,10 +50777,10 @@ "ozx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -51056,10 +50804,10 @@ /area/storage/primary) "oAN" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -51077,8 +50825,8 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "oAZ" = ( @@ -51093,7 +50841,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "oBa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -51125,10 +50873,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating{ @@ -51215,13 +50963,13 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -51230,10 +50978,10 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -51293,10 +51041,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/greenglow/filled, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -51400,30 +51148,21 @@ /area/solar/starboard/fore) "oFU" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/execution/transfer) "oFW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/storage) "oGh" = ( @@ -51512,10 +51251,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -51582,7 +51321,7 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "oIZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/landmark/start/atmospheric_technician, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -51623,10 +51362,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -51649,10 +51388,10 @@ name = "Brig"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -51667,10 +51406,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "oJX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/table/glass, @@ -51737,7 +51476,7 @@ pixel_x = 8 }, /obj/item/geiger_counter, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -51768,14 +51507,14 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "oKV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -51804,7 +51543,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; name = "O2 to Airmix" @@ -51826,10 +51565,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -51872,10 +51611,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -52033,7 +51772,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "oPI" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -52091,7 +51830,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "oQC" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -52124,8 +51863,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "oRh" = ( @@ -52203,10 +51942,10 @@ "oSG" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -52264,7 +52003,7 @@ name = "Meatbag Pacifier"; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) @@ -52289,10 +52028,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -52379,7 +52118,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -52424,15 +52163,15 @@ }, /area/security/execution/education) "oXu" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "oXz" = ( @@ -52460,10 +52199,10 @@ /area/medical/morgue) "oXS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/break_room) @@ -52487,25 +52226,25 @@ "oYy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/port/aft) "oYK" = ( /obj/structure/flora/rock/pile, -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid, /area/quartermaster/warehouse) "oYL" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -52551,10 +52290,10 @@ "oZd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/light/small, @@ -52574,7 +52313,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) "oZM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -52588,10 +52327,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -52599,12 +52338,10 @@ }, /area/maintenance/fore) "pao" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "paw" = ( @@ -52686,8 +52423,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -52697,7 +52434,7 @@ /turf/open/floor/iron, /area/janitor) "pcb" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -52707,7 +52444,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -52718,10 +52455,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating{ @@ -52820,8 +52557,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -52844,10 +52581,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -52901,8 +52638,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -52911,10 +52648,10 @@ /obj/machinery/door/airlock/public/glass{ name = "Art Cabinet" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -52927,10 +52664,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -53001,8 +52738,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -53111,7 +52848,7 @@ }, /area/hallway/primary/fore) "pjx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -53126,8 +52863,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/chapel/office) @@ -53192,10 +52929,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating{ @@ -53218,13 +52955,13 @@ /obj/machinery/airalarm/directional/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating{ @@ -53335,10 +53072,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -53464,8 +53201,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -53538,10 +53275,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -53583,10 +53320,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -53604,7 +53341,7 @@ name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -53631,8 +53368,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) @@ -53665,10 +53402,10 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -53677,25 +53414,20 @@ /area/maintenance/starboard) "prW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) "psa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/chair, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "psd" = ( -/obj/machinery/power/compressor{ - comp_id = "incineratorturbine"; - dir = 1; - luminosity = 2 - }, /obj/machinery/camera/directional/west{ c_tag = "Turbine Chamber" }, @@ -53703,6 +53435,11 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/power/compressor{ + comp_id = "incineratorturbine"; + dir = 1; + luminosity = 2 + }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "psm" = ( @@ -53710,7 +53447,7 @@ id = "Xenolab"; name = "Containment Chamber Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/engine, @@ -53734,10 +53471,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -53752,10 +53489,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -53765,7 +53502,7 @@ /area/maintenance/aft) "psG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating{ broken = 1 }, @@ -53783,8 +53520,8 @@ /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/science/mixing/chamber) "ptG" = ( @@ -53846,10 +53583,10 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) "puZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -53859,8 +53596,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "pvs" = ( @@ -53884,10 +53621,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -54015,15 +53752,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/west, /turf/open/floor/plating{ burnt = 1 }, /area/maintenance/starboard/aft) "pwS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -54051,10 +53788,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -54098,8 +53835,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -54149,10 +53886,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -54188,12 +53925,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -54247,13 +53978,13 @@ /area/science/xenobiology) "pzZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ dir = 8 }, /turf/open/floor/iron/dark, @@ -54272,18 +54003,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) "pAB" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ - dir = 10 - }, /obj/machinery/power/smes/engineering, /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -54337,7 +54062,7 @@ c_tag = "Engineering Foyer"; name = "engineering camera" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -54364,10 +54089,10 @@ /turf/open/floor/prison, /area/security/prison) "pBV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -54387,10 +54112,10 @@ "pBX" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -54470,10 +54195,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow, @@ -54540,7 +54265,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -54554,8 +54279,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "pFw" = ( @@ -54579,10 +54304,10 @@ name = "Xenobiology Closet"; req_access_txt = "47" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -54609,10 +54334,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -54633,9 +54358,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "pGG" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, /obj/machinery/button/door{ id = "engsm"; name = "Radiation Shutters Toggle"; @@ -54646,6 +54368,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "pHm" = ( @@ -54656,10 +54379,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating{ @@ -54707,10 +54430,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -54759,7 +54482,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "pIs" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -54768,10 +54491,10 @@ /turf/open/floor/iron, /area/engine/atmos) "pID" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -54790,7 +54513,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -54815,15 +54538,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) "pJN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on, -/turf/open/floor/plating{ - broken = 1 - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, +/turf/open/floor/plating/airless, /area/engine/atmos) "pJP" = ( /obj/effect/turf_decal/bot, @@ -54898,7 +54619,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -54944,7 +54665,7 @@ /area/engine/atmos) "pLn" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -54969,7 +54690,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -55055,10 +54776,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -55067,7 +54788,7 @@ /area/maintenance/fore) "pNQ" = ( /obj/item/kirbyplants, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral, @@ -55081,7 +54802,6 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/lobby) "pOn" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/structure/sign/poster/contraband/missing_gloves{ pixel_x = 32 }, @@ -55170,8 +54890,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "pPX" = ( @@ -55194,16 +54914,13 @@ }, /area/hallway/primary/starboard) "pQK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, /obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "pQP" = ( @@ -55212,7 +54929,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/medical/genetics/cloning) "pQS" = ( @@ -55232,12 +54949,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "pRk" = ( @@ -55315,8 +55030,8 @@ c_tag = "Port Hallway Vendors"; name = "port camera" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -55431,10 +55146,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -55447,10 +55162,10 @@ }, /obj/effect/turf_decal/tile/dark_green/opposingcorners, /obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -55460,10 +55175,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -55484,8 +55199,8 @@ /area/medical/medbay/lobby) "pVJ" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/courtroom) "pVX" = ( @@ -55540,9 +55255,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/plating{ burnt = 1 }, @@ -55580,7 +55292,7 @@ "pXJ" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/iron/dark, /area/maintenance/port/aft) "pXK" = ( @@ -55656,10 +55368,7 @@ /area/maintenance/port/fore) "pYK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -55669,7 +55378,7 @@ /turf/open/floor/iron, /area/quartermaster/storage) "pYL" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -55695,11 +55404,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/server{ - dir = 4; - pixel_x = 22 - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 4 }, /turf/open/floor/iron/dark/telecomms, @@ -55742,8 +55447,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qan" = ( @@ -55783,8 +55488,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -55845,7 +55550,7 @@ /turf/open/floor/iron/dark, /area/medical/virology) "qbM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -55872,9 +55577,6 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/toilet/restrooms) "qbY" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, /obj/item/radio/intercom{ pixel_y = 22 }, @@ -55882,6 +55584,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "qca" = ( @@ -55925,8 +55630,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "qcg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -55962,10 +55667,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -55979,7 +55684,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -55997,7 +55702,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "qdn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -56032,7 +55737,6 @@ /area/science/robotics/lab) "qdP" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "qdW" = ( @@ -56063,7 +55767,7 @@ /area/docking/arrival) "qeq" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/item/storage/toolbox/emergency, @@ -56084,11 +55788,10 @@ /area/chapel/office) "qeV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder/displaced, -/turf/open/floor/plating{ - burnt = 1 +/turf/open/floor/catwalk_floor{ + initial_gas_mix = "TEMP=2.7" }, -/area/maintenance/port/aft) +/area/quartermaster/warehouse) "qfj" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -56159,8 +55862,8 @@ req_access_txt = "12" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56189,8 +55892,8 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -56221,8 +55924,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -56339,8 +56042,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -56355,8 +56057,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -56401,8 +56103,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/lab) @@ -56439,7 +56141,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/storage) "qkn" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -56515,8 +56217,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/medical{ name = "Operating Theatre A"; req_access_txt = "45" @@ -56541,8 +56243,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -56580,8 +56282,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -56606,8 +56308,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/science/lab) @@ -56626,7 +56328,7 @@ }, /area/maintenance/starboard/aft) "qnp" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -56644,7 +56346,7 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) "qoh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -56674,6 +56376,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8; + hide = 0 + }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "qoK" = ( @@ -56686,10 +56392,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "qpa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -56723,12 +56429,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/disposal) "qpr" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -56798,10 +56504,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "qqs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -56829,8 +56535,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -56848,10 +56552,10 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/junction/yjunction, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -56874,10 +56578,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -56890,10 +56594,10 @@ /obj/machinery/firealarm{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -56913,7 +56617,7 @@ dir = 4; color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -57074,10 +56778,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/purple{ @@ -57090,7 +56794,7 @@ /area/quartermaster/exploration_prep) "quy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -57143,8 +56847,8 @@ "qvr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 }, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -57174,9 +56878,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "qwf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, /turf/open/floor/iron/dark/telecomms, /area/science/server) "qwj" = ( @@ -57188,8 +56890,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/library) @@ -57215,10 +56917,10 @@ name = "dormitories sorting disposal pipe"; sortType = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -57240,8 +56942,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -57256,8 +56958,8 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark/corner, /area/hallway/primary/starboard) @@ -57269,8 +56971,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -57336,7 +57038,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "qzt" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex{ @@ -57393,10 +57095,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -57427,10 +57129,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -57564,8 +57266,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -57588,10 +57290,10 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "qCJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -57622,8 +57324,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/oxygen_tank{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -57632,17 +57334,17 @@ /area/engine/atmos) "qDL" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/iron/showroomfloor, /area/engine/atmos) "qDP" = ( @@ -57679,10 +57381,10 @@ /area/security/courtroom) "qEG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -57700,7 +57402,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -57740,17 +57442,13 @@ }, /area/tcommsat/server) "qFE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/engine/atmos) "qGg" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix Bypass" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -57760,14 +57458,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "qGu" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -57781,8 +57480,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -57820,7 +57519,7 @@ name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -57835,8 +57534,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -57906,10 +57605,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating{ @@ -57929,10 +57628,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -57981,7 +57680,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "qJK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/blood/old, @@ -58041,8 +57740,8 @@ /area/hallway/primary/fore) "qKx" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58070,9 +57769,11 @@ /turf/open/floor/iron/dark, /area/science/mixing) "qLD" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "qLM" = ( @@ -58080,10 +57781,10 @@ pixel_y = 22 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -58114,10 +57815,10 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/showroomfloor, @@ -58134,10 +57835,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -58154,10 +57855,10 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -58166,16 +57867,18 @@ /area/maintenance/starboard) "qMZ" = ( /obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/research) "qNb" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE"; + pixel_y = 32 + }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard) "qNt" = ( @@ -58188,7 +57891,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hor) "qNA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/blood/old, @@ -58207,6 +57910,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "qNN" = ( @@ -58243,8 +57949,8 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/security/detectives_office) "qOK" = ( @@ -58270,10 +57976,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -58286,13 +57992,13 @@ "qPy" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -58304,8 +58010,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -58315,7 +58021,7 @@ /turf/open/floor/iron/showroomfloor, /area/science/aft) "qQD" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/cable{ @@ -58434,10 +58140,10 @@ /area/maintenance/disposal/incinerator) "qSD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -58468,16 +58174,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/showroomfloor, /area/quartermaster/exploration_prep) "qTe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58523,10 +58229,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/main) @@ -58540,7 +58246,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plating/airless{ +/turf/open/floor/plating{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) @@ -58566,21 +58272,25 @@ /turf/open/floor/iron/dark, /area/quartermaster/warehouse) "qVf" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, -/obj/machinery/airalarm/engine{ - pixel_y = -24 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, -/area/engine/supermatter) +/area/engine/engineering) "qVh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/disposalpipe/segment{ dir = 10 @@ -58627,10 +58337,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -58652,10 +58362,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "qWi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -58739,7 +58449,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -58759,10 +58469,7 @@ /turf/open/floor/iron/dark, /area/gateway) "qXC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ @@ -58794,7 +58501,7 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) @@ -58806,9 +58513,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -58844,10 +58548,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -58871,8 +58575,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -58905,10 +58609,10 @@ /area/chapel/main) "rap" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58932,7 +58636,7 @@ }, /area/quartermaster/warehouse) "raJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58942,7 +58646,7 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -59135,12 +58839,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -59184,10 +58882,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -59206,10 +58904,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating{ @@ -59254,10 +58952,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59338,8 +59036,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -59349,8 +59047,11 @@ name = "Engineering External Airlock"; req_one_access_txt = "10;24" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "rhW" = ( @@ -59403,10 +59104,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -59419,8 +59120,8 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark/corner, /area/hallway/primary/port) @@ -59458,10 +59159,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -59502,10 +59203,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -59623,7 +59324,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "rmi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, @@ -59635,8 +59336,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central) @@ -59662,7 +59363,7 @@ /area/maintenance/port) "rmO" = ( /obj/effect/turf_decal/box/corners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -59713,10 +59414,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -59777,8 +59478,8 @@ /turf/open/floor/plating, /area/medical/chemistry) "roF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59824,8 +59525,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/nuke_storage) @@ -59861,10 +59562,10 @@ /area/hallway/primary/aft) "rql" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -59877,10 +59578,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -59890,8 +59591,8 @@ /turf/open/floor/iron/dark, /area/hallway/primary/aft) "rqu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "rqw" = ( @@ -59973,8 +59674,8 @@ /area/ai_monitored/turret_protected/aisat/atmos) "rss" = ( /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -60004,10 +59705,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -60060,8 +59761,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "rtm" = ( @@ -60112,7 +59813,7 @@ /turf/open/floor/iron/dark, /area/library) "rui" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -60121,10 +59822,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -60168,7 +59869,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -60218,7 +59919,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "rwe" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ @@ -60250,10 +59951,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -60309,8 +60010,8 @@ name = "Autopsy"; req_access_txt = "4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/detectives_office) @@ -60321,6 +60022,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4; + hide = 0 + }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "rxP" = ( @@ -60412,10 +60117,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60446,10 +60151,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light/small{ @@ -60509,10 +60214,10 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "rCh" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/landmark/start/atmospheric_technician, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -60535,7 +60240,7 @@ /turf/open/floor/iron/dark, /area/science/server) "rCI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/noticeboard{ @@ -60568,10 +60273,10 @@ name = "Aft Security Blast Door" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/security{ @@ -60731,8 +60436,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -60762,7 +60467,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -60793,7 +60498,7 @@ }, /area/maintenance/starboard) "rIO" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -60852,25 +60557,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, /area/maintenance/fore) "rJu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ - dir = 5 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/corner{ dir = 9 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Mix" + }, /turf/open/floor/engine, /area/engine/engineering) "rJv" = ( @@ -60878,10 +60581,10 @@ dir = 4; color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/showroomfloor, @@ -60911,7 +60614,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "rKm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/landmark/start/atmospheric_technician, @@ -60936,7 +60639,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -60950,11 +60653,11 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating{ burnt = 1 @@ -60964,10 +60667,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -60984,13 +60687,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard) "rKJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -61000,7 +60703,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -61026,10 +60729,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -61067,10 +60770,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -61154,10 +60857,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -61202,7 +60905,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -61212,13 +60915,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -61278,8 +60981,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -61299,10 +61002,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "rPj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -61376,22 +61079,19 @@ /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "rQd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, -/area/security/execution/transfer) +/area/engine/atmos) "rQx" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/rust, /area/quartermaster/exploration_dock) "rRo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -61497,8 +61197,8 @@ /area/science/lab) "rSw" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "rSM" = ( @@ -61541,7 +61241,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -61559,10 +61259,10 @@ /area/security/prison) "rTZ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61599,7 +61299,6 @@ /turf/open/floor/iron/showroomfloor, /area/science/explab) "rVw" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -61607,6 +61306,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "rVD" = ( @@ -61646,10 +61350,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -61663,7 +61367,7 @@ /turf/open/floor/iron/dark, /area/science/aft) "rWz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, @@ -61691,10 +61395,10 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/cmo) "rXo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -61722,10 +61426,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "rXH" = ( @@ -61754,8 +61458,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) @@ -61771,7 +61473,7 @@ "rYi" = ( /obj/effect/landmark/start/janitor, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -61830,8 +61532,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -61842,10 +61544,10 @@ name = "Quartermaster"; req_access_txt = "41" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -61901,10 +61603,10 @@ dir = 4 }, /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -61944,16 +61646,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/port) "sar" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -61997,8 +61697,8 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ burnt = 1 @@ -62031,7 +61731,6 @@ /turf/open/floor/iron/dark, /area/security/warden) "sbN" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Brig Shuttle Airlock"; req_one_access_txt = "63" @@ -62039,9 +61738,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -62065,10 +61761,10 @@ }, /area/maintenance/port/aft) "sdk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -62080,9 +61776,11 @@ /turf/open/floor/iron, /area/security/brig) "sdp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "sdA" = ( @@ -62102,6 +61800,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "sdC" = ( @@ -62110,11 +61809,11 @@ /turf/open/floor/iron, /area/engine/break_room) "sdO" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/atmos) "sem" = ( @@ -62152,10 +61851,10 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "seB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -62173,10 +61872,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -62215,7 +61914,7 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "sfl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/light, @@ -62298,10 +61997,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -62309,10 +62008,10 @@ }, /area/maintenance/central) "sgL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -62348,20 +62047,20 @@ /turf/open/floor/iron, /area/engine/break_room) "sht" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "shu" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "shv" = ( @@ -62442,10 +62141,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -62470,8 +62169,8 @@ /area/ai_monitored/turret_protected/aisat/foyer) "siJ" = ( /obj/effect/spawner/randomvend/snack, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -62553,7 +62252,7 @@ /area/science/explab) "skG" = ( /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -62566,8 +62265,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -62577,14 +62276,14 @@ id = "cell"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/prison/shielded) "slz" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -62604,10 +62303,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -62632,8 +62331,8 @@ /obj/structure/sign/departments/medbay/alt{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "smq" = ( @@ -62641,10 +62340,6 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/light_switch{ pixel_y = -20 }, @@ -62671,8 +62366,8 @@ /area/quartermaster/exploration_prep) "snf" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -62744,7 +62439,7 @@ /turf/open/floor/iron/dark, /area/security/execution/education) "snC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "snM" = ( @@ -62764,10 +62459,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -62793,7 +62488,7 @@ dir = 4; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -62890,16 +62585,16 @@ /turf/open/floor/iron, /area/quartermaster/qm) "sqI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 9 }, /turf/open/floor/wood, /area/crew_quarters/bar) "sqP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62960,12 +62655,12 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "ssm" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "sss" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/engine, /area/science/xenobiology) "ssy" = ( @@ -63002,8 +62697,8 @@ id = "transittube"; name = "Transit Tube Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/bridge) @@ -63014,10 +62709,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -63054,10 +62749,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, @@ -63071,7 +62766,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "stJ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/engine/engineering) @@ -63112,7 +62807,7 @@ /turf/open/floor/plating, /area/science/shuttledock) "svx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine{ @@ -63122,8 +62817,8 @@ /area/tcommsat/server) "svy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -63170,10 +62865,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -63192,10 +62887,10 @@ /turf/open/floor/iron, /area/engine/break_room) "swF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -63232,10 +62927,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -63268,10 +62963,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -63312,12 +63007,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -63332,8 +63021,8 @@ pixel_x = 32 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/primary/aft) @@ -63357,10 +63046,10 @@ req_access_txt = "17"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -63386,10 +63075,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -63425,8 +63114,8 @@ /turf/open/floor/iron, /area/janitor) "syT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -63436,7 +63125,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "syX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/dark/corner{ @@ -63507,10 +63196,10 @@ pixel_x = 28 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "szH" = ( @@ -63572,8 +63261,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -63611,7 +63300,7 @@ }, /area/maintenance/fore) "sBc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/cable{ icon_state = "1-8" }, @@ -63632,8 +63321,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, @@ -63649,10 +63338,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -63661,8 +63350,8 @@ /turf/open/floor/iron/dark, /area/maintenance/fore) "sCp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/bridge) "sCK" = ( @@ -63778,9 +63467,6 @@ /turf/open/floor/iron/dark, /area/security/main) "sFc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -63793,6 +63479,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engineering) "sFi" = ( @@ -63832,8 +63521,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -63881,8 +63570,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/atmos) @@ -63903,10 +63592,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -63948,10 +63637,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -63999,7 +63688,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Air to Mix" @@ -64014,7 +63703,7 @@ /turf/open/floor/iron/showroomfloor, /area/engine/atmos) "sIA" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/north{ @@ -64039,10 +63728,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "sJa" = ( @@ -64052,8 +63741,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -64103,7 +63792,7 @@ /obj/machinery/door/airlock/medical{ name = "Medbay Storage" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/port) @@ -64126,7 +63815,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "sKO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -64174,10 +63863,10 @@ "sLD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -64189,7 +63878,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -64205,10 +63894,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -64243,13 +63932,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -64338,8 +64020,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64349,8 +64031,8 @@ /area/maintenance/port/aft) "sNK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/explab) @@ -64389,10 +64071,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -64430,8 +64112,8 @@ /turf/open/floor/iron, /area/hallway/primary/port) "sOY" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -64450,7 +64132,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/showroomfloor, @@ -64472,12 +64154,12 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/medical/genetics/cloning) "sPC" = ( @@ -64570,10 +64252,10 @@ name = "aft camera" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "sQZ" = ( @@ -64585,7 +64267,7 @@ dir = 8; name = "Xenobiology Positive Pressure Distribution Pump" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -64624,10 +64306,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -64636,7 +64318,7 @@ /turf/open/floor/iron/dark, /area/lawoffice) "sRy" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /obj/structure/lattice/catwalk, @@ -64691,8 +64373,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -64737,10 +64419,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -64756,8 +64438,8 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library) "sSN" = ( @@ -64771,10 +64453,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -64799,10 +64481,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -64819,7 +64501,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "sUr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -64855,10 +64537,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -64920,8 +64602,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/camera{ dir = 8 }, @@ -64969,10 +64651,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -65004,10 +64686,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -65079,10 +64761,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -65133,26 +64815,26 @@ /area/ai_monitored/storage/eva) "sYL" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 5 }, /turf/open/space/basic, /area/space/nearstation) "sZh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) "sZm" = ( /obj/effect/turf_decal/box/corners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -65232,11 +64914,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -65268,7 +64950,7 @@ /turf/open/floor/iron/dark, /area/security/brig/aft) "taP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -65291,16 +64973,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/plating{ broken = 1 }, @@ -65339,10 +65011,10 @@ name = "command Maintenance"; req_one_access_txt = "17;19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -65356,7 +65028,7 @@ /turf/open/floor/iron/dark, /area/science/research) "tco" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -65382,7 +65054,6 @@ /turf/open/floor/plating, /area/maintenance/fore) "tcZ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Server Room"; req_access_txt = "61" @@ -65393,12 +65064,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/engine, /area/tcommsat/server) "tdi" = ( @@ -65410,8 +65082,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/science/explab) @@ -65439,10 +65111,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -65602,8 +65274,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -65715,10 +65387,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "tjS" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/button/door{ id = "atmosventn2o"; name = "Emergency N2O Vent Toggle"; @@ -65728,6 +65397,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "tjX" = ( @@ -65768,10 +65440,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -65847,8 +65519,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/crew_quarters/cryopods) @@ -65904,10 +65576,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -65917,13 +65589,13 @@ name = "Observation" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -65937,10 +65609,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -65980,8 +65652,8 @@ /turf/open/floor/iron/dark, /area/storage/tcom) "tmV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction{ dir = 1 }, @@ -66028,7 +65700,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "tor" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating{ @@ -66055,8 +65727,8 @@ req_one_access_txt = "10;24;5" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/iron/dark, /area/maintenance/starboard) "toU" = ( @@ -66094,7 +65766,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -66116,7 +65788,6 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "tqL" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "External Freight Airlock" }, @@ -66140,12 +65811,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/plating{ broken = 1 }, @@ -66155,7 +65820,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -66206,8 +65871,13 @@ "tsj" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "tsF" = ( @@ -66220,13 +65890,13 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) "tsQ" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -66300,10 +65970,10 @@ name = "kitchen Maintenance"; req_access_txt = "28" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -66407,10 +66077,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "txo" = ( @@ -66422,8 +66092,8 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -66436,6 +66106,9 @@ /area/maintenance/port/fore) "txH" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/plating{ broken = 1 }, @@ -66445,8 +66118,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -66456,6 +66129,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "tyj" = ( @@ -66465,7 +66141,7 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "tyl" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -66497,10 +66173,10 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -66573,10 +66249,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66608,10 +66284,10 @@ /obj/machinery/door/airlock/public/glass{ name = "Locker Room" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -66624,7 +66300,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -66653,7 +66329,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) "tBE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -66684,8 +66360,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -66792,10 +66467,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -66819,10 +66494,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/execution/transfer) "tCV" = ( @@ -66831,8 +66505,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -66899,10 +66573,10 @@ /area/hallway/primary/starboard) "tEI" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -66914,7 +66588,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/catwalk_floor, +/turf/open/floor/catwalk_floor{ + initial_gas_mix = "TEMP=2.7" + }, /area/quartermaster/warehouse) "tFf" = ( /obj/structure/rack, @@ -66947,8 +66623,8 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66981,10 +66657,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -67056,14 +66732,11 @@ /turf/open/floor/wood, /area/security/prison) "tHj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" +/turf/open/floor/plating{ + burnt = 1 }, /area/maintenance/port/aft) "tHq" = ( @@ -67096,10 +66769,10 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -67109,8 +66782,8 @@ /area/security/brig) "tHU" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "tIc" = ( @@ -67128,7 +66801,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -67166,10 +66839,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -67189,10 +66862,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -67234,10 +66907,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -67282,7 +66955,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/components/unary/tank/plasma, +/obj/machinery/atmospherics/components/tank/plasma, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) @@ -67290,10 +66963,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/holopad, @@ -67329,8 +67002,8 @@ /area/security/prison) "tNj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -67386,10 +67059,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -67437,7 +67110,7 @@ /area/quartermaster/warehouse) "tPr" = ( /obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -67453,7 +67126,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -67467,10 +67140,10 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -67479,7 +67152,7 @@ /turf/open/floor/iron, /area/security/brig) "tPK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -67491,7 +67164,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "tPU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -67508,10 +67181,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -67572,9 +67245,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -67709,8 +67379,8 @@ dir = 10 }, /obj/structure/altar_of_gods, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) @@ -67748,12 +67418,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -67768,8 +67432,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -67787,8 +67451,7 @@ /turf/open/floor/iron/dark, /area/vacant_room/commissary) "tZd" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -67799,6 +67462,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "tZn" = ( @@ -67809,10 +67473,10 @@ /turf/open/floor/iron/showroomfloor, /area/medical/chemistry) "tZs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -67837,10 +67501,10 @@ /area/quartermaster/office) "tZO" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -67874,7 +67538,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "uan" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -67896,19 +67560,15 @@ "uap" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/structure/sign/warning/securearea{ - desc = "A warning sign which reads 'BOMB RANGE"; - name = "BOMB RANGE"; - pixel_y = 32 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -24 +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard) @@ -67923,10 +67583,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -67937,16 +67597,14 @@ "ubj" = ( /obj/item/beacon, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "ubl" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) "ubr" = ( @@ -67975,7 +67633,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -67993,10 +67651,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -68051,8 +67709,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -68066,7 +67724,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -68118,8 +67776,8 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68139,8 +67797,8 @@ /area/crew_quarters/heads/captain) "uds" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "udu" = ( @@ -68162,10 +67820,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -68201,16 +67859,16 @@ /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "uek" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -68266,10 +67924,6 @@ "ufp" = ( /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = -24 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -68286,7 +67940,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -68305,7 +67959,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ufY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -68317,8 +67971,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/air_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/air_tank{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -68335,7 +67989,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -68346,10 +68000,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -68376,7 +68030,7 @@ /turf/open/floor/iron/dark, /area/library) "uhY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -68499,8 +68153,8 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -68556,14 +68210,14 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ @@ -68614,10 +68268,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -68691,10 +68345,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -68766,8 +68420,8 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68805,7 +68459,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -68814,7 +68468,7 @@ /turf/open/floor/iron/showroomfloor, /area/science/storage) "unV" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron, @@ -68831,10 +68485,10 @@ /area/maintenance/central) "uof" = ( /obj/effect/decal/cleanable/food/flour, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -68849,10 +68503,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/power/apc/auto_name/directional/west{ @@ -68871,7 +68525,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -68927,10 +68581,10 @@ /turf/open/floor/iron, /area/engine/atmos) "uoU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -69056,13 +68710,13 @@ dir = 1; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner, @@ -69076,8 +68730,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -69103,8 +68757,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/tcommsat/computer) @@ -69176,8 +68830,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/central) @@ -69229,10 +68883,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -69268,7 +68922,7 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "uty" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/structure/disposalpipe/segment, @@ -69286,10 +68940,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/grille_or_trash, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -69314,10 +68968,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -69346,10 +69000,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -69371,10 +69025,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -69405,10 +69059,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -69417,10 +69071,6 @@ /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "uvr" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4, /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -69441,10 +69091,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/green{ @@ -69465,8 +69115,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -69497,10 +69147,10 @@ /area/engine/gravity_generator) "uvY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -69548,30 +69198,30 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "uwT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) +/area/science/mixing) "uwV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "uxd" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/medical/medbay/central) @@ -69602,10 +69252,10 @@ /turf/open/floor/engine, /area/engine/engineering) "uyd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -69740,8 +69390,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "uBc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -69761,10 +69411,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -69779,10 +69429,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -69828,10 +69478,6 @@ /turf/open/floor/iron/dark, /area/medical/cryo) "uEa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -69873,10 +69519,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -69886,7 +69532,7 @@ /turf/open/floor/iron/showroomfloor, /area/quartermaster/exploration_prep) "uFb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -69896,7 +69542,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -69918,10 +69564,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -69950,7 +69596,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -70044,8 +69690,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -70056,8 +69702,8 @@ /area/science/shuttledock) "uIM" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "uJg" = ( @@ -70130,8 +69776,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -70146,10 +69792,10 @@ /turf/open/floor/wood, /area/security/prison) "uJE" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -70186,10 +69832,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -70239,10 +69885,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -70268,8 +69914,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/central) @@ -70279,8 +69925,8 @@ name = "Brig Control"; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -70341,10 +69987,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -70561,18 +70207,18 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "uOE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/engine/engineering) "uOX" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -70618,10 +70264,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -70637,9 +70283,7 @@ dir = 8 }, /obj/structure/lattice/catwalk, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating, /area/quartermaster/exploration_dock) "uQe" = ( /obj/structure/rack, @@ -70652,10 +70296,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/junction/flip{ @@ -70666,10 +70310,10 @@ "uQm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -70702,8 +70346,8 @@ icon_state = "1-2" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "uQB" = ( @@ -70768,7 +70412,9 @@ /area/engine/engineering) "uRS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "uRT" = ( @@ -70812,19 +70458,12 @@ /turf/closed/wall, /area/maintenance/port/aft) "uSM" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Departure Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -70901,9 +70540,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -70932,10 +70568,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -70971,7 +70607,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -70990,10 +70626,10 @@ /area/security/execution/transfer) "uVT" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -71005,7 +70641,7 @@ /turf/open/floor/iron/showroomfloor, /area/science/shuttledock) "uWl" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/machinery/meter, /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -71017,12 +70653,12 @@ name = "Atmospherics Connector"; req_one_access_txt = "10;24;5" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/port) "uWK" = ( @@ -71079,7 +70715,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/foyer) "uXG" = ( @@ -71088,10 +70724,10 @@ dir = 6 }, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating{ @@ -71107,7 +70743,7 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/aft) "uXQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -71163,14 +70799,14 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, -/area/science/mixing/chamber) +/area/science/mixing) "uYK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -71211,13 +70847,13 @@ /area/crew_quarters/heads/cmo) "vaB" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -71231,7 +70867,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -71272,10 +70908,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -71284,10 +70920,10 @@ "vbt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -71305,7 +70941,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -71328,10 +70964,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -71355,10 +70991,10 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -71373,8 +71009,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating/airless, /area/space/nearstation) "vcy" = ( @@ -71389,10 +71025,10 @@ /area/maintenance/port) "vcL" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -71421,20 +71057,11 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai_upload) "vdi" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/engine/engineering) "vdn" = ( @@ -71453,8 +71080,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard) @@ -71462,7 +71089,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -71489,10 +71116,10 @@ pixel_x = 32; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -71536,22 +71163,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) -"vfL" = ( -/obj/machinery/door/airlock/external{ - name = "Prison External Airlock"; - req_access_txt = "2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/maintenance/port/aft) "vfO" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -71559,8 +71170,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "vfP" = ( @@ -71694,8 +71305,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -71717,8 +71328,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/detectives_office) @@ -71761,8 +71372,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -71819,10 +71430,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -71870,13 +71481,17 @@ /obj/machinery/holopad, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "vkG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71891,7 +71506,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/floor/iron, @@ -71909,18 +71524,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/security/nuke_storage) "vlF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, @@ -71948,8 +71563,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -71999,10 +71614,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -72086,7 +71701,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -72103,7 +71718,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -72115,9 +71730,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/science/lab) "vnY" = ( @@ -72138,13 +71753,13 @@ /turf/open/floor/iron/dark, /area/science/aft) "vok" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner, @@ -72234,7 +71849,7 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "vre" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -72334,9 +71949,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/plating{ burnt = 1 }, @@ -72377,10 +71989,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/machinery/light_switch{ pixel_x = -21; pixel_y = 23 @@ -72421,6 +72033,10 @@ c_tag = "Atmospherics Tank - CO2"; name = "atmospherics camera" }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/engine/co2, /area/engine/atmos) "vuM" = ( @@ -72431,12 +72047,12 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "vuR" = ( @@ -72447,11 +72063,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/plating{ burnt = 1 @@ -72464,7 +72077,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -72491,10 +72104,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -72513,10 +72126,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -72531,10 +72144,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -72543,10 +72156,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/fore) "vvF" = ( @@ -72557,10 +72168,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -72600,13 +72211,13 @@ pixel_y = 31 }, /obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -72657,13 +72268,16 @@ /area/maintenance/starboard) "vwD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "vwS" = ( @@ -72680,10 +72294,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -72714,15 +72328,15 @@ "vxp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "vxz" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -72733,27 +72347,26 @@ /area/medical/genetics) "vxJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "vxK" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Unfiltered & Air to Mix" + }, /turf/open/floor/iron/showroomfloor, /area/engine/atmos) "vxO" = ( @@ -72767,10 +72380,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -72810,10 +72423,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -72835,7 +72448,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningoffice) "vyn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -72860,10 +72473,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -72916,10 +72529,10 @@ name = "EVA Room"; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -72974,7 +72587,7 @@ /turf/open/floor/iron/dark, /area/science/explab) "vAo" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -72987,7 +72600,7 @@ /turf/open/floor/plating, /area/medical/virology) "vAE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/item/kirbyplants{ @@ -73028,9 +72641,6 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "vBC" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -73106,10 +72716,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -73124,8 +72734,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/janitor) @@ -73161,7 +72771,7 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "vEf" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/machinery/meter, @@ -73182,8 +72792,8 @@ /area/maintenance/starboard/aft) "vEC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -73205,8 +72815,8 @@ id_tag = "Cell"; name = "Cell 1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/prison) @@ -73235,11 +72845,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = -24; pixel_y = 6 }, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "vFm" = ( @@ -73247,10 +72859,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -73266,10 +72878,10 @@ /obj/machinery/light_switch{ pixel_y = -27 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -73283,8 +72895,8 @@ name = "prison Processing"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -73318,10 +72930,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -73338,8 +72950,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -73397,12 +73009,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -73447,10 +73053,10 @@ /area/bridge) "vHK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -73472,13 +73078,13 @@ "vIG" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -73523,10 +73129,10 @@ /area/science/xenobiology) "vJq" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/computer/atmos_control/plasma_tank{ dir = 1 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -73588,8 +73194,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) @@ -73696,8 +73302,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -73718,10 +73324,10 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating{ @@ -73833,9 +73439,6 @@ /area/janitor) "vOC" = ( /obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ - pixel_y = 26 - }, /obj/machinery/light/small{ dir = 1 }, @@ -73845,16 +73448,21 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) +/area/science/mixing) "vOG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -73921,10 +73529,10 @@ name = "Security Office"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -73944,8 +73552,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/execution/transfer) "vQN" = ( @@ -73977,8 +73585,8 @@ /turf/open/floor/iron, /area/engine/atmos) "vRk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -74074,10 +73682,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -74097,8 +73705,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -74144,10 +73752,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -74181,10 +73789,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -74196,7 +73804,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -74215,8 +73823,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -74238,7 +73846,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/structure/chair/fancy/comfy{ color = "#596479"; @@ -74258,10 +73866,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -74282,10 +73890,7 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -74311,10 +73916,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -74324,8 +73929,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/security/glass{ name = "Research Security Post"; @@ -74341,13 +73946,13 @@ /turf/open/floor/plating/asteroid/airless, /area/space/nearstation) "vWQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral, @@ -74391,10 +73996,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/plating{ broken = 1 }, @@ -74466,10 +74067,10 @@ /area/crew_quarters/heads/captain) "vYE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -74507,7 +74108,7 @@ /turf/open/floor/iron/dark, /area/science/robotics/mechbay) "vZr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -74549,9 +74150,9 @@ /obj/machinery/door/airlock/external{ req_access_txt = "13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/maintenance/fore) "vZI" = ( @@ -74561,10 +74162,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/engine, @@ -74580,10 +74181,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -74604,7 +74205,7 @@ }, /area/maintenance/starboard/fore) "waD" = ( -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid, /area/quartermaster/warehouse) "waG" = ( /obj/structure/chair/office/light{ @@ -74613,7 +74214,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -74635,8 +74236,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "wce" = ( @@ -74647,8 +74248,8 @@ /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -74691,17 +74292,17 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_prep) "wdD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -74781,10 +74382,10 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating{ @@ -74792,8 +74393,8 @@ }, /area/maintenance/starboard) "wfb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/green, @@ -74802,12 +74403,6 @@ /turf/open/floor/glass/reinforced, /area/bridge) "wfn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -74826,7 +74421,7 @@ pixel_x = 32; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -74856,7 +74451,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "wgk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /obj/machinery/light{ @@ -74934,7 +74529,7 @@ /turf/open/floor/iron/dark, /area/science/research) "why" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/machinery/meter, @@ -74999,10 +74594,10 @@ /area/engine/engineering) "wim" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -75019,10 +74614,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -75058,10 +74653,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -75080,12 +74675,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -75118,13 +74707,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -75136,7 +74725,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/item/rcl/pre_loaded, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -75200,8 +74789,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, @@ -75230,10 +74819,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -75322,10 +74911,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating{ @@ -75352,7 +74941,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/box, @@ -75408,8 +74997,8 @@ name = "security Maintenance"; req_access_txt = "12;63" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -75434,10 +75023,10 @@ /area/crew_quarters/bar/atrium) "wov" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -75451,8 +75040,8 @@ /area/security/checkpoint/supply) "woO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, /obj/structure/disposalpipe/segment{ dir = 4 @@ -75467,11 +75056,11 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "wpf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/showroomfloor, @@ -75519,13 +75108,13 @@ /turf/open/floor/iron, /area/crew_quarters/heads/chief) "wqt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -75585,10 +75174,10 @@ "wqR" = ( /obj/effect/landmark/event_spawn, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -75602,7 +75191,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -75658,10 +75247,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -75702,10 +75291,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -75739,7 +75328,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -75759,10 +75348,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -75795,10 +75384,10 @@ /area/engine/break_room) "wuV" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -75810,10 +75399,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -75850,10 +75439,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -75867,16 +75456,16 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "wvN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/atmos) "wvO" = ( @@ -75884,8 +75473,8 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "wvX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig/aft) "wwc" = ( @@ -75899,10 +75488,10 @@ /turf/open/floor/prison, /area/security/prison) "wwh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/main) "wwk" = ( @@ -75913,16 +75502,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "wwl" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -75936,10 +75525,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -76024,13 +75613,13 @@ /area/security/prison) "wyz" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ @@ -76049,10 +75638,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -76080,10 +75669,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating{ @@ -76097,7 +75686,7 @@ }, /area/quartermaster/warehouse) "wzv" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -76111,7 +75700,7 @@ /turf/open/floor/iron, /area/engine/atmos) "wzC" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76171,16 +75760,16 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) "wAI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -76220,24 +75809,15 @@ /area/hallway/secondary/exit/departure_lounge) "wBn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, /area/hallway/primary/port) "wBv" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /obj/machinery/light/small/directional/south, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) @@ -76256,7 +75836,7 @@ /obj/structure/closet/crate{ opened = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/iron/dark, @@ -76289,10 +75869,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -76318,10 +75898,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -76346,6 +75926,9 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/maintenance/disposal) "wDe" = ( @@ -76371,7 +75954,7 @@ /area/crew_quarters/heads/cmo) "wDi" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/iron/dark, /area/medical/cryo) "wDv" = ( @@ -76382,10 +75965,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -76426,8 +76009,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -76450,11 +76033,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "wFa" = ( @@ -76469,7 +76051,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, @@ -76547,11 +76129,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -76575,8 +76157,8 @@ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 }, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -76621,7 +76203,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -76650,10 +76232,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76734,10 +76316,6 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -76754,8 +76332,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -76795,10 +76373,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating{ @@ -76828,7 +76406,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -76839,8 +76417,8 @@ name = "Engineering"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -76867,10 +76445,10 @@ /area/ai_monitored/turret_protected/ai) "wMt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76892,10 +76470,10 @@ /area/crew_quarters/toilet/restrooms) "wML" = ( /obj/machinery/door/airlock/highsecurity, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76958,8 +76536,8 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "wOP" = ( @@ -77040,10 +76618,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -77157,8 +76735,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -77167,7 +76743,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -77182,13 +76758,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/execution/transfer) "wQV" = ( @@ -77197,10 +76773,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -77252,10 +76828,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -77273,8 +76849,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ burnt = 1 }, @@ -77363,7 +76939,7 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -77490,10 +77066,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -77513,18 +77089,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "wUK" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77541,7 +77117,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -77601,10 +77177,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -77639,8 +77215,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/central) @@ -77662,10 +77238,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -77680,8 +77256,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, @@ -77708,10 +77284,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77722,20 +77298,20 @@ }, /area/maintenance/port/aft) "wXa" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner{ dir = 9 }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to Gas" + }, /turf/open/floor/engine, /area/engine/engineering) "wXo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -77780,7 +77356,7 @@ /obj/machinery/light_switch{ pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, @@ -77795,10 +77371,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -77846,8 +77422,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "wYL" = ( @@ -77863,8 +77439,8 @@ icon_state = "1-2" }, /obj/item/crowbar/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -77873,10 +77449,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) @@ -77918,17 +77494,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/science/explab) "wZY" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -77947,7 +77523,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -77985,8 +77561,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "xbb" = ( @@ -78003,10 +77579,11 @@ /turf/open/floor/iron, /area/security/courtroom) "xbl" = ( +/obj/effect/turf_decal/sand/plating, /turf/open/floor/plating{ - broken = 1 + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/maintenance/port/aft) +/area/space/nearstation) "xbm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -78033,10 +77610,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating{ @@ -78059,7 +77636,7 @@ /turf/open/floor/iron/dark, /area/medical/medbay/central) "xbz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -78071,10 +77648,10 @@ /turf/open/floor/iron, /area/engine/atmos) "xbG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -78097,10 +77674,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -78133,7 +77710,7 @@ name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "O2 to Pure" @@ -78176,10 +77753,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "xcD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -78190,8 +77767,8 @@ /area/hydroponics) "xcO" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/prison, @@ -78219,8 +77796,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -78229,10 +77806,10 @@ /turf/open/floor/iron, /area/engine/break_room) "xdr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wood/end{ @@ -78291,10 +77868,7 @@ "xel" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor, @@ -78340,10 +77914,10 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -78362,7 +77936,6 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "xeJ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "External Freight Airlock" }, @@ -78394,10 +77967,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -78407,7 +77980,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ broken = 1 }, @@ -78463,7 +78036,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "xfD" = ( -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -78491,9 +78064,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/maintenance/fore) @@ -78640,8 +78210,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -78652,11 +78222,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/catwalk_floor, /area/maintenance/central) @@ -78673,29 +78240,22 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/engine/break_room) "xiD" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -78705,7 +78265,7 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/red, @@ -78716,7 +78276,7 @@ /area/crew_quarters/locker) "xiU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -78827,8 +78387,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/starboard) "xlC" = ( @@ -78844,10 +78404,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -78855,13 +78415,6 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "xlW" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller/directional/south, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "xmc" = ( @@ -78873,10 +78426,10 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "xmd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -78961,10 +78514,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -79031,13 +78584,7 @@ /turf/open/floor/iron/showroomfloor, /area/security/main) "xoe" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -79051,15 +78598,15 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai_upload) "xoA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "xoK" = ( /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) @@ -79123,16 +78670,16 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/cmo) "xpw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark/corner, /area/hallway/primary/starboard) @@ -79173,10 +78720,10 @@ /turf/open/floor/prison, /area/security/prison) "xql" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/security{ @@ -79214,10 +78761,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating{ @@ -79241,8 +78788,8 @@ specialfunctions = 4 }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -79299,10 +78846,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -79315,10 +78862,10 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -79343,7 +78890,6 @@ /turf/open/space/basic, /area/maintenance/central) "xsb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -79368,13 +78914,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "xsx" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_prep) "xsK" = ( @@ -79429,10 +78975,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating{ @@ -79544,10 +79090,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -79564,7 +79110,7 @@ /area/tcommsat/server) "xvK" = ( /obj/structure/reagent_dispensers/watertank, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) @@ -79583,7 +79129,7 @@ name = "Toxins Launch Room"; req_access_txt = "8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/science/mixing) @@ -79619,10 +79165,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -79634,10 +79180,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -79652,13 +79198,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/engine, /area/security/nuke_storage) "xwI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/cable{ icon_state = "1-8" }, @@ -79671,10 +79217,10 @@ /turf/open/floor/engine, /area/engine/engineering) "xwJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -79697,8 +79243,8 @@ }, /area/security/prison) "xxa" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -79746,10 +79292,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -79777,17 +79323,17 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/maintenance/aft) "xye" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -79811,10 +79357,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -79884,10 +79430,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -79908,7 +79454,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ @@ -79918,8 +79464,10 @@ /turf/open/floor/plating, /area/maintenance/central) "xAt" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "xAU" = ( @@ -79933,7 +79481,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -79989,8 +79537,8 @@ /area/crew_quarters/locker) "xCA" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "xCB" = ( @@ -80004,10 +79552,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -80045,7 +79593,7 @@ /turf/open/floor/iron/showroomfloor, /area/science/aft) "xDw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -80082,7 +79630,7 @@ /obj/machinery/door/window/northleft{ name = "Justice Windoor" }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /turf/open/floor/iron/dark, @@ -80112,8 +79660,8 @@ name = "Tool Storage" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/storage/primary) @@ -80229,12 +79777,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "xGo" = ( @@ -80268,10 +79810,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -80315,12 +79857,8 @@ /turf/open/floor/plating, /area/medical/storage) "xHI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "xIf" = ( @@ -80337,8 +79875,8 @@ /area/maintenance/starboard/fore) "xIF" = ( /obj/effect/turf_decal/siding/wood/end, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/wood{ broken = 1 @@ -80354,12 +79892,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/surgery) -"xIV" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, -/turf/closed/wall/rust, -/area/engine/atmos) "xIZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, @@ -80375,10 +79907,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -80461,8 +79993,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/starboard/aft) @@ -80474,10 +80006,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -80558,10 +80090,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -80596,10 +80128,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -80620,10 +80152,10 @@ dir = 4 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -80638,15 +80170,6 @@ burnt = 1 }, /area/maintenance/port/fore) -"xOD" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/turf/open/floor/catwalk_floor, -/area/security/execution/transfer) "xON" = ( /obj/machinery/computer/holodeck/prison, /obj/effect/turf_decal/stripes/line{ @@ -80666,8 +80189,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/lattice/catwalk, /turf/open/floor/plating{ burnt = 1 @@ -80686,10 +80209,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating{ @@ -80734,10 +80257,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -80780,7 +80303,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/start/geneticist, @@ -80788,7 +80311,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -80821,8 +80344,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -80852,8 +80375,8 @@ req_access_txt = "3"; security_level = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -80953,10 +80476,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, @@ -80995,7 +80518,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -81012,8 +80535,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -81042,10 +80565,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -81059,10 +80582,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -81131,10 +80654,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -81153,12 +80676,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/maintenance/port) "xVx" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Air to Mix" @@ -81207,10 +80730,10 @@ /area/security/brig/aft) "xVW" = ( /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -81254,10 +80777,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -81275,10 +80798,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -81295,10 +80818,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -81336,10 +80859,10 @@ /turf/open/floor/iron, /area/security/brig/aft) "xXr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -81374,25 +80897,20 @@ /turf/open/floor/plating, /area/science/mixing) "xXH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/storage) "xYb" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "xYi" = ( @@ -81461,10 +80979,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -81473,10 +80991,10 @@ /obj/item/radio/intercom{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -81548,8 +81066,8 @@ /area/science/xenobiology) "ycI" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/aft) "ycS" = ( @@ -81578,6 +81096,10 @@ "ydc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + hide = 0 + }, /turf/open/floor/iron, /area/engine/atmos) "yde" = ( @@ -81645,12 +81167,6 @@ /turf/open/floor/iron/dark, /area/teleporter) "yeZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ - dir = 4 - }, /obj/machinery/power/terminal{ dir = 4 }, @@ -81721,8 +81237,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -81751,10 +81267,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -81776,7 +81292,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -81793,15 +81309,15 @@ /turf/open/floor/iron/dark, /area/security/brig/aft) "ygS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/atmos) "yhg" = ( @@ -81809,7 +81325,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -81836,7 +81352,6 @@ /turf/open/floor/grass, /area/security/prison) "yhr" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Departure Shuttle Airlock" }, @@ -81853,13 +81368,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "yhw" = ( @@ -81893,10 +81408,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -81952,10 +81467,10 @@ /turf/open/floor/iron/dark, /area/storage/tech) "yij" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -81974,7 +81489,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "yim" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -82024,7 +81539,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "yiG" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -82039,10 +81554,10 @@ /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "yiV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -82184,8 +81699,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -82196,10 +81711,10 @@ /area/tcommsat/server) "ylH" = ( /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -82211,8 +81726,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ broken = 1 @@ -95023,7 +94538,7 @@ efH ajd qYh qYh -oOp +ooi qYh ajd ajd @@ -95282,7 +94797,7 @@ qvc qYh cnm cnm -jtU +cnm hqT ajd ngd @@ -95539,8 +95054,8 @@ vLu qYh cnm cnm -jtU -jtU +cnm +eEo lgG cMC cMC @@ -95792,12 +95307,12 @@ cnm hMh ajd aFN -cnm -bIu -jtU -jtU -jtU +ycI jtU +ycI +cTE +hss +kIl ajd ajd ajd @@ -96051,13 +95566,13 @@ qAh uek qCI ajx -jtU +cnm lRg -jtU -jtU +cnm +cnm idS -jtU -jtU +cnm +cnm ajd cmU aeU @@ -96308,13 +95823,13 @@ ajd uek oLv ajx -dDZ -jtU -jtU -jtU +cHX +cnm +cnm +cnm ajd mHw -jtU +cnm ajd cmU coy @@ -96528,14 +96043,14 @@ amA amA amA aeu -cmU +xbl amR amA amA csB slP amA -crP +aWn aEw agp aQU @@ -96571,7 +96086,7 @@ cJr cJr cJr eAp -jtU +cnm ajd cmU aeU @@ -96828,7 +96343,7 @@ dgY oWY cJr kZj -jtU +cnm ajd cmU aeU @@ -97085,11 +96600,11 @@ cjw clQ cJr lTS -jtU +cnm ajd cmU aeU -crn +cko aeu aeu cnS @@ -97599,10 +97114,10 @@ fGu uVf lXJ cJI -jtU +cnm ajd mvK -xbl +kdN cnl bco coB @@ -97858,9 +97373,9 @@ wBA cJr cnm gfk -vNp +cnm nnW -vNp +cnm inA cnP dlt @@ -98116,9 +97631,9 @@ cJI ehd ajd cnm -bMR +cnm cXg -xbl +kdN cnP nJx aCi @@ -98370,7 +97885,7 @@ cTk cJr cJr cJr -bMR +cnm ajd aer fGZ @@ -98626,9 +98141,9 @@ agS agS exu dsJ -fKl +bZy fPs -qeV +vLu xzJ eXO hrN @@ -98884,11 +98399,11 @@ dDF exu iDM oqS -bMR -vNp -nIb cnm -bMR +cnm +iFW +cnm +cnm bNm pJS clq @@ -99376,7 +98891,7 @@ nJr fwF bkn awD -vUW +bUM oYy cnm lfe @@ -100148,7 +99663,7 @@ lhm ylC awD leQ -itL +cMC lXP aav qvH @@ -105032,7 +104547,7 @@ blj bln bIV afz -vfL +jlF fxT wVg xoR @@ -105496,7 +105011,7 @@ cAi cEd cEd cAj -nZu +cEd ajy maN dio @@ -106083,7 +105598,7 @@ ubj pPO olP hRX -nAz +rFr gPD vsn gfF @@ -106091,7 +105606,7 @@ vLo igK wGY tPg -cTE +irP irP acM vhL @@ -106598,7 +106113,7 @@ knO gkA xVW gkA -gkA +nAz agJ kRW lXX @@ -106862,11 +106377,11 @@ vzz kDN kDN gTo -rQd -jcC +grE +grE gYm dVn -xOD +lNf guU bUU aaa @@ -107881,21 +107396,21 @@ cZp msN sLa aFM -htS +aDz aDz aDz aFM -htB +aDC aDC aDC aFM -dEN +aMY aMY aMY aFM acK bHB -crn +cko cko acm aaa @@ -108138,15 +107653,15 @@ pdD oiP kNM aIG -aDz +htS aDA aDz aFM -aDC +cPc aDD aDC aFM -aMY +mix aMY aMY aFM @@ -108912,11 +108427,11 @@ aJk aJT dmV bGb -fhM +acm brZ acm bGb -fhM +acm bUL acm bUL @@ -109168,12 +108683,12 @@ aIG bwv bGo aCw -bUM oqE +aDk bUX aCw -bUM -xIV +oqE +aDl cxR aCw cxT @@ -109350,15 +108865,15 @@ aaa aaa acm nNi -mix +cEN itv xfS chj -dkQ +jyJ dhx rJg mIl -rJg +ouF pqN cBf cdD @@ -109596,7 +109111,7 @@ sGE omP kdQ oQU -eEo +vco jUQ jUQ vco @@ -109606,7 +109121,7 @@ vco jUQ jUQ vco -jyJ +vco bCy vvy eWg @@ -109692,7 +109207,7 @@ qCC ugf sIu cLw -kBa +cJo amY cyt pim @@ -109853,7 +109368,7 @@ chO sMA xsb qdP -aWn +acK aaa aaa acm @@ -109949,7 +109464,7 @@ sOY oaz haW hLz -kBa +dEN amY aFJ ejp @@ -110457,7 +109972,7 @@ eQI xvK aIM nxx -heK +jcC ydc xfD tzt @@ -110710,7 +110225,7 @@ aFM aFM aIG baD -qoh +iBZ aMR aDk aDk @@ -111481,7 +110996,7 @@ bEV aIG nLx aFb -qoh +fhM aGA aMk brl @@ -111675,7 +111190,7 @@ ajC qqf hdC xYi -djL +sPb oER rdL tDD @@ -114313,7 +113828,7 @@ iCW gaY aCw hKw -gqP +rQd jFa skG iEY @@ -114573,7 +114088,7 @@ jBV hMY wvN xCB -xCB +hLd xYb bmT aFM @@ -116371,7 +115886,7 @@ axa nPP qqK hZt -dJn +pYo dVj eYs pYo @@ -116625,7 +116140,7 @@ lLz ibl gqL axW -cJo +ajS gsc fhV fhV @@ -116880,7 +116395,7 @@ axb oST iJq juE -cPc +xse wQw kgv qQD @@ -117306,7 +116821,7 @@ cLo bRJ bUQ fAo -hss +kLO kLO rXN try @@ -117568,7 +117083,7 @@ aXW aXW jkt afZ -agi +dJn dCH klP uJQ @@ -117915,7 +117430,7 @@ uWK xnL svb aUO -ayn +irO azm ayn axX @@ -118424,7 +117939,7 @@ ygH dVX aAM axW -iBZ +ajS sfl axU aLI @@ -118681,7 +118196,7 @@ jHl nWI ayz axW -iBZ +ajS mWA umD bFh @@ -122011,7 +121526,7 @@ uhY kTS ggP xHI -kEU +dSP lhK bUf bUf @@ -122231,7 +121746,7 @@ ygD lif moa bbc -bym +htB uRS bhQ kSb @@ -123040,7 +122555,7 @@ qEl rJx bTD kEU -kIl +lhK bUf bUf bUf @@ -123764,7 +123279,7 @@ bbi bbi uYG rwa -bcf +beH bbN qzt nLT @@ -124548,7 +124063,7 @@ avA acm bhW gIN -dSP +crw hDI bhW aaQ @@ -124790,9 +124305,9 @@ bbi bbi bbi bbi -bbu +aXl vIB -bbi +awi awi bbN baC @@ -125093,7 +124608,7 @@ bPe bPe uSM bRF -lIY +uSM bPe bPe bOc @@ -131151,7 +130666,7 @@ aeu aeU lJO aoz -bQN +fKl aeU aap aeu @@ -132689,8 +132204,8 @@ aeu aeu aeu act -nDJ -cCI +qeV +djL tEO abq aeu @@ -132946,8 +132461,8 @@ aeu aeu aeu act -fyQ -cCU +crn +dDZ cxg act aeu @@ -133205,7 +132720,7 @@ aeu act cGD cvt -wvx +kgU iwn abq act diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ec30de20c6625..3a71a469af7e3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -408,8 +408,8 @@ req_one_access_txt = "1;4" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -547,7 +547,6 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "aeq" = ( @@ -613,8 +612,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "afs" = ( @@ -800,6 +799,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/solars/port/aft) "ahb" = ( @@ -1068,8 +1070,8 @@ /obj/machinery/camera/directional/west{ c_tag = "Research Division Hallway - Robotics" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -1114,14 +1116,17 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) "alc" = ( /obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "ald" = ( @@ -1161,7 +1166,6 @@ req_access_txt = "13" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/starboard/fore) "alq" = ( @@ -1196,7 +1200,6 @@ req_access_txt = "10; 13" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "alx" = ( @@ -1344,10 +1347,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -1443,8 +1446,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) "anQ" = ( @@ -1602,19 +1605,19 @@ /obj/machinery/camera/directional/south{ c_tag = "Kitchen - Coldroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/airalarm/kitchen_cold_room{ +/obj/machinery/airalarm{ pixel_y = -22 }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) "aoY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -1695,10 +1698,10 @@ /turf/closed/wall, /area/maintenance/disposal) "apv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/circuit, @@ -1720,6 +1723,12 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/port) +"apF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "apH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -1780,10 +1789,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -2143,10 +2152,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -2155,10 +2164,10 @@ /turf/open/floor/iron, /area/maintenance/department/medical/central) "atw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -2236,7 +2245,8 @@ dir = 4 }, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) @@ -2269,6 +2279,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) "auJ" = ( @@ -2307,8 +2319,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2437,8 +2449,8 @@ /turf/closed/wall/r_wall, /area/security/nuke_storage) "axg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/bridge) "axC" = ( @@ -2448,10 +2460,10 @@ /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste to Filter" }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/iron, /area/engine/atmos) "axL" = ( @@ -2636,9 +2648,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/item/stack/ore/iron, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -2704,11 +2713,10 @@ /turf/open/floor/plating, /area/maintenance/fore) "aAf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -2716,6 +2724,7 @@ icon_state = "1-4" }, /obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/smooth_large, /area/security/brig) "aAi" = ( @@ -2853,10 +2862,10 @@ "aAQ" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -2985,8 +2994,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -3141,7 +3150,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -3519,7 +3528,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/engine, @@ -3529,7 +3538,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine, @@ -3538,7 +3547,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/meter, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -3629,10 +3638,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -3764,7 +3773,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, @@ -3922,7 +3931,7 @@ /area/engine/engineering) "aIc" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/engineering) "aIg" = ( @@ -4102,7 +4111,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron, @@ -4128,7 +4137,7 @@ /turf/open/floor/plating, /area/engine/engineering) "aJv" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/closed/wall/r_wall, @@ -4221,12 +4230,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "aKe" = ( @@ -4341,19 +4348,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, /area/engine/engineering) "aKG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "aKI" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/meter, @@ -4458,10 +4465,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -4582,7 +4589,7 @@ /area/engine/supermatter) "aMm" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "aMo" = ( @@ -4717,6 +4724,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "aNf" = ( @@ -4741,6 +4757,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/prison, /area/security/prison) "aNi" = ( @@ -4878,10 +4897,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -5156,10 +5175,10 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -5335,10 +5354,10 @@ /turf/open/floor/grass, /area/hydroponics/garden) "aPV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/prison, @@ -5385,7 +5404,7 @@ /area/engine/engineering) "aQe" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -5664,7 +5683,7 @@ /area/engine/engineering) "aRv" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -5755,7 +5774,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/hallway/secondary/entry) "aRX" = ( @@ -5849,7 +5867,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, /obj/structure/cable/yellow{ @@ -6414,10 +6432,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6766,10 +6784,10 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -7011,10 +7029,10 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner{ @@ -7176,6 +7194,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "baR" = ( @@ -7343,6 +7363,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "bci" = ( @@ -7647,8 +7669,8 @@ pixel_x = -27 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -7744,12 +7766,21 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "bfk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/vacant_room/commissary) "bfl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/vacant_room/commissary) "bfm" = ( @@ -7761,6 +7792,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/vacant_room/commissary) "bfn" = ( @@ -7771,6 +7808,12 @@ id_tag = "commissarydoor"; req_one_access_txt = "12;63;48;50" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/central) "bfo" = ( @@ -7781,6 +7824,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/central) "bfp" = ( @@ -7794,6 +7843,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/central) "bfq" = ( @@ -8080,6 +8135,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "bhd" = ( @@ -8185,10 +8243,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "bhJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -8339,6 +8397,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/secondary/entry) "biv" = ( @@ -8349,10 +8408,10 @@ icon_state = "4-8" }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -8392,7 +8451,8 @@ /obj/item/hand_tele, /obj/item/beacon, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -8517,11 +8577,11 @@ /turf/open/floor/iron, /area/hallway/primary/central) "bjn" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -8619,10 +8679,10 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -8805,9 +8865,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) @@ -8825,8 +8882,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard) "blf" = ( @@ -9011,14 +9068,13 @@ /turf/open/floor/iron, /area/bridge) "bmx" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, /area/hallway/secondary/entry) "bmy" = ( /obj/structure/cable/yellow{ @@ -9163,10 +9219,10 @@ /turf/open/floor/iron/dark, /area/aisat) "bnr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -9273,16 +9329,16 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/cmo) "bnU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "bob" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/dark, @@ -9298,10 +9354,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/landmark/start/scientist, @@ -9852,12 +9908,12 @@ /turf/open/floor/iron, /area/hallway/primary/port) "bsx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) "bsD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -9978,8 +10034,8 @@ }, /area/hallway/primary/starboard) "btB" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -10051,7 +10107,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "btP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /turf/open/floor/iron, @@ -10097,8 +10153,8 @@ pixel_x = 27 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -10145,9 +10201,6 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "bux" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Atmospherics External Airlock"; req_access_txt = "24" @@ -10219,8 +10272,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, @@ -10337,10 +10390,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -10376,10 +10429,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/security{ - name = "Security-Cargo Access"; - req_access_txt = "63" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -10390,6 +10439,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Security Hall Access" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "bvI" = ( @@ -10424,9 +10476,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/engine/break_room) "bws" = ( @@ -10503,10 +10552,10 @@ /turf/open/floor/carpet/green, /area/chapel/main) "bxk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -10712,12 +10761,13 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark/corner{ dir = 1 }, /area/engine/atmos) "bzg" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/effect/turf_decal/tile/yellow{ @@ -10905,10 +10955,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -11008,14 +11058,14 @@ /turf/open/floor/iron, /area/engine/atmos) "bAP" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bAQ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /obj/machinery/light/directional/east, @@ -11049,8 +11099,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = -20; pixel_y = -20 @@ -11115,10 +11165,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/grimy, @@ -11395,13 +11445,13 @@ /area/engine/atmos) "bCu" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bCv" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron, @@ -11410,35 +11460,35 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Air to Mix" }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bCy" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "bCz" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space, /area/space/nearstation) "bCA" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "bCB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -11502,10 +11552,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -11617,7 +11667,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bDW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron, @@ -11630,33 +11680,33 @@ /turf/open/floor/iron, /area/engine/atmos) "bDY" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bDZ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, /area/engine/atmos) "bEa" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "bEb" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bEd" = ( -/obj/machinery/air_sensor/atmos/mix_tank, +/obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/vacuum, /area/engine/atmos) "bEe" = ( @@ -11686,9 +11736,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/hallway/secondary/entry) "bEq" = ( @@ -11822,7 +11869,7 @@ }, /area/engine/atmos) "bFM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/structure/cable/yellow{ @@ -11831,19 +11878,19 @@ /turf/open/floor/iron, /area/engine/atmos) "bFQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, /turf/open/floor/iron, /area/engine/atmos) "bFR" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 6 }, /turf/open/floor/iron, /area/engine/atmos) "bFS" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 }, /turf/open/floor/iron, @@ -11856,42 +11903,41 @@ /turf/open/floor/iron, /area/engine/atmos) "bFU" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bFV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Unfiltered & Air to Mix" +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "bFX" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "bFY" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/space, /area/space/nearstation) "bFZ" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "bGa" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -12036,8 +12082,8 @@ /turf/closed/wall, /area/maintenance/central) "bHf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -12103,7 +12149,7 @@ }, /area/engine/atmos) "bHu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12111,45 +12157,45 @@ /area/engine/atmos) "bHw" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/plating, /area/engine/atmos) "bHx" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "bHy" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "bHz" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 }, /turf/open/floor/plating, /area/engine/atmos) "bHA" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "bHB" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/plating, @@ -12219,10 +12265,10 @@ /obj/machinery/camera/directional/south{ c_tag = "Command Hallway - Port" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -12247,11 +12293,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/science/shuttledock) "bIk" = ( @@ -12320,6 +12370,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "bIN" = ( @@ -12336,11 +12388,13 @@ }, /area/engine/atmos) "bIO" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8 +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard) +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "bIP" = ( /obj/structure/window/reinforced{ dir = 4 @@ -12352,42 +12406,42 @@ /turf/open/space, /area/space/nearstation) "bIR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "bIS" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bIT" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bIU" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bIV" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bIW" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bIX" = ( @@ -12404,35 +12458,35 @@ dir = 8; name = "N2O to Pure" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/red{ dir = 4 }, /turf/open/floor/iron/cafeteria, /area/engine/atmos) "bIZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "bJa" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "bJb" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/space, /area/space/nearstation) "bJc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 8 }, /turf/open/floor/engine/n2o, @@ -12541,14 +12595,14 @@ /turf/open/floor/iron, /area/teleporter) "bJK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "bJM" = ( @@ -12647,10 +12701,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -12659,11 +12713,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engine/atmos) "bKx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "bKy" = ( @@ -12693,14 +12747,14 @@ /turf/open/floor/iron, /area/engine/atmos) "bKE" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bKF" = ( -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/window/reinforced{ dir = 4 }, @@ -12710,11 +12764,11 @@ /turf/open/floor/iron/white/corner, /area/engine/atmos) "bKG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "bKH" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/engine/atmos) "bKJ" = ( @@ -12825,10 +12879,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -12871,8 +12925,8 @@ /turf/open/floor/plating, /area/maintenance/central) "bLI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -12909,7 +12963,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bMb" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -12920,18 +12974,18 @@ }, /area/engine/atmos) "bMc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bMd" = ( /obj/structure/reagent_dispensers/watertank, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/iron, @@ -12950,29 +13004,29 @@ /turf/open/floor/iron, /area/engine/atmos) "bMg" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) "bMh" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "bMi" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/iron, /area/engine/atmos) "bMl" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "bMm" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 8 }, /turf/open/floor/engine/n2o, @@ -12990,8 +13044,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bMC" = ( @@ -13010,6 +13063,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/library) "bMK" = ( @@ -13022,9 +13077,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/dark, /area/tcommsat/server) "bMR" = ( @@ -13208,7 +13263,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bNP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -13222,7 +13277,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -13246,7 +13301,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bNV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/door/window/northleft{ dir = 8; name = "Inner Pipe Access"; @@ -13282,10 +13337,10 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "bOf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -13310,6 +13365,8 @@ /obj/machinery/door/airlock/grunge{ name = "Quiet Room" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/library) "bOm" = ( @@ -13431,10 +13488,10 @@ /turf/open/floor/iron/dark, /area/storage/tcom) "bPi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -13469,7 +13526,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bPp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -13483,7 +13540,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -13508,10 +13565,10 @@ }, /area/engine/atmos) "bPt" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bPu" = ( @@ -13527,7 +13584,7 @@ }, /area/engine/atmos) "bPx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -13552,19 +13609,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/engine/gravity_generator) "bPK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -13700,14 +13757,14 @@ /turf/open/floor/iron, /area/engine/atmos) "bQV" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 8 }, -/obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bQX" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, +/obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/engine/atmos) "bQZ" = ( @@ -13736,6 +13793,9 @@ /area/library) "bRi" = ( /obj/structure/chair/office, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/wood, /area/library) "bRn" = ( @@ -13969,7 +14029,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/white/corner{ @@ -13994,15 +14054,15 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bSi" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/item/wrench, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "bSk" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -14016,10 +14076,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -14190,7 +14250,7 @@ /area/maintenance/starboard) "bTf" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/plating, /area/maintenance/starboard) "bTg" = ( @@ -14399,10 +14459,10 @@ /turf/open/floor/iron, /area/hydroponics) "bUk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -14476,7 +14536,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "bUA" = ( -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -14489,7 +14549,7 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/atmos) @@ -14497,7 +14557,7 @@ /obj/item/radio/intercom{ pixel_y = 28 }, -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -14512,7 +14572,7 @@ /area/engine/atmos) "bUE" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ dir = 4 }, /turf/open/floor/iron, @@ -14524,11 +14584,11 @@ /turf/open/floor/iron, /area/engine/atmos) "bUG" = ( -/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bUI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 8 }, /turf/open/floor/engine/co2, @@ -14551,10 +14611,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -14579,10 +14639,10 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron{ @@ -14712,7 +14772,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bVH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -14724,7 +14784,7 @@ }, /area/engine/atmos) "bVI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark/corner{ @@ -14732,7 +14792,7 @@ }, /area/engine/atmos) "bVJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/machinery/meter, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14740,7 +14800,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bVK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron, @@ -14752,7 +14812,7 @@ /turf/open/floor/iron, /area/engine/atmos) "bVN" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, /area/engine/atmos) "bVP" = ( @@ -14773,15 +14833,12 @@ /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) "bVW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/central) +/area/hallway/secondary/exit/departure_lounge) "bWb" = ( /obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ @@ -14790,10 +14847,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -14801,7 +14858,7 @@ "bWn" = ( /obj/structure/table, /obj/item/flashlight/lamp, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark/textured, @@ -14835,7 +14892,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/plating, @@ -14851,7 +14908,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/plating, @@ -14863,8 +14920,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron, @@ -14876,7 +14933,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron, @@ -14885,7 +14942,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 1 }, /turf/open/floor/iron, @@ -14894,26 +14951,26 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bXk" = ( /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bXm" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bXn" = ( -/obj/machinery/atmospherics/pipe/manifold/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) @@ -14925,13 +14982,13 @@ /turf/open/floor/iron, /area/engine/atmos) "bXp" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bXr" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 8 }, /turf/open/floor/engine/co2, @@ -14972,10 +15029,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "bXS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -15043,20 +15100,20 @@ /turf/open/floor/iron, /area/security/checkpoint/medical) "bYw" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /turf/open/floor/iron, /area/engine/atmos) "bYx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/iron, /area/engine/atmos) "bYy" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/plating, /area/engine/atmos) "bYz" = ( @@ -15066,13 +15123,13 @@ /turf/open/floor/iron, /area/engine/atmos) "bYA" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "bYB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/light{ dir = 4 }, @@ -15080,10 +15137,10 @@ /area/engine/atmos) "bYZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/security{ @@ -15165,11 +15222,11 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "bZv" = ( @@ -15216,32 +15273,32 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "bZH" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, /turf/open/floor/iron, /area/engine/atmos) "bZI" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bZJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) "bZK" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /turf/open/floor/iron, /area/engine/atmos) "bZL" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /obj/machinery/meter, @@ -15252,7 +15309,7 @@ dir = 4 }, /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 @@ -15286,8 +15343,8 @@ }, /obj/machinery/holopad, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -15339,7 +15396,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/dark, @@ -15355,7 +15412,7 @@ name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -15379,7 +15436,7 @@ dir = 1; name = "O2 to Pure" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -15389,7 +15446,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -15404,8 +15461,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -15430,8 +15487,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "cck" = ( @@ -15552,24 +15609,26 @@ /turf/open/floor/iron, /area/quartermaster/miningoffice) "ccP" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "ccQ" = ( /turf/open/floor/iron/dark, /area/engine/atmos) "ccR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "ccS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -15578,13 +15637,13 @@ /turf/open/floor/iron, /area/quartermaster/storage) "ccT" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/iron/dark, /area/engine/atmos) "ccU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -15638,17 +15697,12 @@ /area/janitor) "ceg" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/plating, -/area/engine/atmos) -"ceh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating, /area/engine/atmos) "cei" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) "cej" = ( @@ -15674,10 +15728,10 @@ /turf/open/floor/carpet/grimy, /area/security/detectives_office) "cfk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron, /area/engine/atmos) "cft" = ( @@ -15686,26 +15740,23 @@ /area/maintenance/disposal/incinerator) "cfu" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/space, /area/space/nearstation) "cfw" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/space, /area/space/nearstation) "cfx" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 }, -/turf/open/space, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/engine/atmos) "cfy" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/space, /area/space/nearstation) "cfz" = ( @@ -15770,7 +15821,7 @@ "cgA" = ( /obj/machinery/meter, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /turf/closed/wall/r_wall, /area/engine/atmos) "cgB" = ( @@ -15778,7 +15829,7 @@ name = "Mixed Air Tank In" }, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /turf/closed/wall/r_wall, /area/engine/atmos) "cgC" = ( @@ -15786,7 +15837,7 @@ name = "Mixed Air Tank Out" }, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/smart/simple, /turf/closed/wall/r_wall, /area/engine/atmos) "cgD" = ( @@ -15956,8 +16007,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -16018,49 +16069,49 @@ /turf/open/floor/iron/white/side, /area/medical/medbay/lobby) "chN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 1 }, /turf/open/floor/engine/n2, /area/engine/atmos) "chO" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "chP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 1 }, /turf/open/floor/engine/n2, /area/engine/atmos) "chQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 1 }, /turf/open/floor/engine/o2, /area/engine/atmos) "chR" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "chS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ dir = 1 }, /turf/open/floor/engine/o2, /area/engine/atmos) "chT" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 1 }, /turf/open/floor/engine/air, /area/engine/atmos) "chU" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) "chV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 1 }, /turf/open/floor/engine/air, @@ -16102,7 +16153,7 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -16111,10 +16162,10 @@ /turf/open/floor/iron/cafeteria, /area/engine/atmos) "ciw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -16218,11 +16269,11 @@ "ciY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cjb" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) @@ -16286,7 +16337,7 @@ /turf/open/space, /area/space/nearstation) "cjV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16399,12 +16450,12 @@ /obj/structure/sign/warning/fire{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "ckF" = ( @@ -16414,14 +16465,14 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/airlock_sensor/incinerator_atmos{ pixel_x = 8; pixel_y = 24 }, /obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "ckG" = ( @@ -16463,9 +16514,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "ckR" = ( @@ -16476,10 +16524,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -16578,8 +16626,6 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "clY" = ( @@ -16596,7 +16642,7 @@ "cmc" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/space, /area/space/nearstation) "cmd" = ( @@ -16624,7 +16670,7 @@ /area/crew_quarters/heads/cmo) "cmB" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /turf/open/space, @@ -16681,7 +16727,7 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 1 }, /turf/open/floor/engine/vacuum, @@ -16844,7 +16890,7 @@ "cpM" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/space, @@ -17001,8 +17047,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 6 }, @@ -17160,10 +17206,10 @@ /turf/open/floor/iron/dark, /area/storage/tech) "crZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -17181,14 +17227,14 @@ /turf/open/floor/carpet/grimy, /area/security/detectives_office) "csF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -17196,10 +17242,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -17250,6 +17296,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"cta" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/engine/supermatter) "ctb" = ( /obj/structure/window/reinforced{ dir = 4 @@ -17302,8 +17352,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hor) "ctg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -17601,8 +17651,8 @@ /obj/structure/sign/departments/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -17619,10 +17669,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -17635,12 +17685,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/server) -"cvY" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/science/server) "cwb" = ( /obj/structure/chair{ dir = 4 @@ -17685,6 +17729,9 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/prison, /area/security/prison) "cwH" = ( @@ -17716,10 +17763,8 @@ /turf/open/floor/iron/white, /area/science/research) "cwY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 1; - external_pressure_bound = 120; - name = "server vent" +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 }, /turf/open/floor/iron/dark, /area/science/server) @@ -17773,8 +17818,8 @@ dir = 8; sortType = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -17804,10 +17849,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -17908,7 +17953,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "cyM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/glass, /turf/open/floor/iron/dark, @@ -17918,8 +17963,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) @@ -17950,10 +17995,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/black/filled/warning, @@ -18026,18 +18071,18 @@ /turf/open/floor/plating, /area/science/test_area) "cAU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "cBe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -18109,10 +18154,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -18344,10 +18389,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -18429,10 +18474,10 @@ /turf/open/space, /area/solar/port/aft) "cEE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18666,10 +18711,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -18730,10 +18775,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -18851,8 +18896,8 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "cKI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -18863,10 +18908,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -18875,8 +18920,8 @@ /turf/closed/wall, /area/chapel/office) "cLd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light_switch{ @@ -18891,10 +18936,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -18934,10 +18979,10 @@ /area/maintenance/aft) "cLv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -18946,10 +18991,10 @@ /turf/open/floor/iron/dark, /area/medical/surgery) "cLy" = ( -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/computer/atmos_control/plasma_tank{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/window/reinforced{ dir = 4 }, @@ -18957,10 +19002,10 @@ /turf/open/floor/iron, /area/engine/atmos) "cLB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/black/opposingcorners{ @@ -18973,7 +19018,7 @@ /area/crew_quarters/heads/hor) "cLN" = ( /obj/machinery/portable_thermomachine, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/dark/smooth_large, @@ -19165,6 +19210,11 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"cOl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet/restrooms) "cOm" = ( /turf/open/floor/carpet/green, /area/chapel/main) @@ -19238,7 +19288,7 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -19314,10 +19364,10 @@ }, /area/chapel/main) "cPs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/circuit/green{ @@ -19343,10 +19393,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -19360,8 +19410,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/fore) "cPA" = ( @@ -19544,10 +19594,10 @@ /turf/open/floor/iron, /area/storage/primary) "cQv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -19569,10 +19619,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -19613,10 +19663,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -19637,7 +19687,7 @@ /area/ai_monitored/security/armory) "cQQ" = ( /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/engine/engineering) "cQR" = ( @@ -19675,10 +19725,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -19714,11 +19764,11 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/solars/port/fore) "cRl" = ( @@ -19968,8 +20018,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "cTw" = ( @@ -19984,10 +20034,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -20066,10 +20116,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -20089,10 +20139,10 @@ /turf/open/space/basic, /area/space) "cVk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/red/half{ @@ -20124,13 +20174,13 @@ /turf/open/space/basic, /area/space) "cVy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) "cVz" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 }, /turf/open/space, @@ -20167,8 +20217,8 @@ /turf/open/floor/iron, /area/quartermaster/office) "cWh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -20180,12 +20230,15 @@ /obj/item/radio/intercom{ pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "cWx" = ( @@ -20215,7 +20268,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -20260,8 +20313,9 @@ /area/crew_quarters/heads/hos) "cXv" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "cXA" = ( @@ -20283,8 +20337,8 @@ pixel_x = 26; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -20365,8 +20419,8 @@ /area/chapel/main) "cZO" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -20383,8 +20437,8 @@ pixel_x = -32 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -20402,8 +20456,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "bridge-left" @@ -20414,8 +20468,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "daW" = ( @@ -20423,7 +20477,7 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, @@ -20435,7 +20489,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "daZ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/machinery/power/rad_collector/anchored, @@ -20462,7 +20516,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /turf/open/floor/engine, @@ -20471,10 +20525,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -20532,10 +20586,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -20565,10 +20619,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -20587,23 +20641,23 @@ /turf/open/floor/iron, /area/engine/engineering) "ddT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "ddU" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "ddV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "ddZ" = ( /turf/open/floor/iron/dark, /area/engine/engineering) "dea" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste, +/obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/plating/airless, /area/engine/engineering) "dec" = ( @@ -20616,11 +20670,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -20632,8 +20686,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/secondary) @@ -20671,7 +20725,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "des" = ( @@ -20682,7 +20736,7 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/engine, @@ -20694,7 +20748,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /turf/open/floor/engine, @@ -20706,7 +20760,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/engineering) "dew" = ( @@ -20762,7 +20816,8 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "deG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "deH" = ( @@ -20773,7 +20828,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, @@ -20800,14 +20855,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "deO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/engineering) "deP" = ( @@ -20817,7 +20872,7 @@ /turf/open/floor/iron/dark/textured, /area/security/brig) "deS" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/machinery/power/rad_collector/anchored, @@ -20843,7 +20898,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/engineering) "deY" = ( @@ -20857,7 +20912,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "dfb" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/machinery/meter, @@ -20871,7 +20926,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/engine, @@ -20906,7 +20961,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/power/apc/auto_name/directional/east{ areastring = "/area/engine/supermatter" }, @@ -20916,13 +20971,13 @@ /turf/open/floor/engine, /area/engine/engineering) "dfj" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "dfk" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-2" @@ -20933,7 +20988,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "dfm" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/power/rad_collector/anchored, @@ -20987,7 +21042,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/engine, @@ -20997,7 +21052,7 @@ dir = 4 }, /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /turf/open/floor/engine, /area/engine/engineering) @@ -21005,8 +21060,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -21019,7 +21074,7 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/engine, /area/engine/engineering) "dfC" = ( @@ -21044,7 +21099,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/engine, @@ -21102,7 +21157,7 @@ /turf/open/space, /area/space/nearstation) "dgi" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/maintenance/starboard) "dgj" = ( @@ -21129,14 +21184,14 @@ /turf/open/space, /area/space/nearstation) "dgo" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard) "dgp" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/plating, @@ -21164,7 +21219,7 @@ /area/space/nearstation) "dgw" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space, /area/space/nearstation) "dgz" = ( @@ -21181,18 +21236,18 @@ /turf/open/space, /area/space/nearstation) "dgD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/crew_quarters/locker) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/security/brig) "dgJ" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space, @@ -21206,10 +21261,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "dgV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -21222,10 +21277,10 @@ /area/maintenance/aft) "dha" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space, /area/space/nearstation) "dhb" = ( @@ -21244,26 +21299,26 @@ /area/maintenance/solars/port/fore) "dhc" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/space, /area/space/nearstation) "dhe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 10 }, /turf/open/floor/iron, /area/engine/atmos) "dhg" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 5 }, /turf/open/floor/iron, /area/engine/atmos) "dhh" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Mix to Engine" @@ -21271,34 +21326,34 @@ /turf/open/floor/iron, /area/engine/atmos) "dhi" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/door/window/northleft{ dir = 8; name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "dhj" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/atmos) "dhk" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) "dhl" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /turf/open/space, @@ -21311,10 +21366,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dhx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -21581,7 +21636,6 @@ /obj/machinery/door/airlock/arrivals_external{ name = "Arrivals Airlock" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/hallway/secondary/entry) "djH" = ( @@ -21611,10 +21665,10 @@ name = "Autopsy Room A"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -21685,7 +21739,7 @@ /turf/open/floor/plating, /area/security/warden) "dkV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -21706,16 +21760,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/tcommsat/computer) "dlc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "dle" = ( /obj/effect/landmark/start/virologist, @@ -21725,24 +21781,24 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "dln" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/sink{ dir = 4; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "dlD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -21799,8 +21855,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -21835,8 +21891,8 @@ pixel_y = -24; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge) "dnd" = ( @@ -21869,10 +21925,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -21961,7 +22017,7 @@ /turf/open/floor/iron, /area/medical/break_room) "dph" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -21970,6 +22026,9 @@ /obj/machinery/light_switch{ pixel_y = -20 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "dpi" = ( @@ -21983,25 +22042,20 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, /turf/open/floor/iron/white, /area/science/research) "dpI" = ( -/obj/machinery/advanced_airlock_controller/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dpS" = ( @@ -22014,8 +22068,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/break_room) @@ -22036,10 +22090,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -22087,10 +22141,10 @@ id_tag = "Cabin7"; name = "Cabin 1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -22104,24 +22158,21 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, /area/security/prison) "drI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/prison, -/area/security/prison) +/turf/open/floor/iron/dark, +/area/engine/engineering) "drJ" = ( /obj/machinery/light_switch{ pixel_x = 27 @@ -22209,9 +22260,11 @@ /turf/open/floor/iron, /area/science/mixing) "dsY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) @@ -22233,10 +22286,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -22258,7 +22311,7 @@ /obj/machinery/camera/directional/south{ c_tag = "Atmospherics - Starboard Aft" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "dtE" = ( @@ -22273,8 +22326,8 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "dtO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage_shared) "dtT" = ( @@ -22290,16 +22343,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/security/main) "dug" = ( @@ -22354,10 +22405,10 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "duS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/checker, @@ -22396,10 +22447,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) @@ -22420,20 +22471,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dvU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "dwd" = ( @@ -22477,10 +22524,10 @@ id_tag = "Cabin6"; name = "Cabin 2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -22506,10 +22553,10 @@ /area/maintenance/starboard/secondary) "dwS" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -22521,8 +22568,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "dxq" = ( @@ -22547,10 +22594,10 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -22561,10 +22608,10 @@ "dxE" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -22580,7 +22627,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -22600,8 +22647,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "dzq" = ( @@ -22611,10 +22658,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -22626,10 +22673,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white/corner, @@ -22646,10 +22693,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral{ @@ -22673,16 +22720,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "dBx" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "dBy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -22694,14 +22741,14 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, /area/engine/engineering) "dBA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -22716,7 +22763,7 @@ "dBC" = ( /obj/machinery/meter, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -22828,10 +22875,10 @@ /area/bridge) "dCL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -22877,7 +22924,7 @@ /turf/open/floor/wood, /area/library) "dDm" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -22943,10 +22990,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -22986,10 +23033,10 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -23001,8 +23048,8 @@ /obj/structure/disposalpipe/segment, /obj/item/flashlight, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "dFS" = ( @@ -23010,10 +23057,10 @@ name = "Holodeck Door" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -23039,19 +23086,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dGj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/textured, @@ -23063,8 +23110,6 @@ /area/maintenance/aft) "dGW" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/plating, /area/hallway/secondary/entry) "dHk" = ( @@ -23102,10 +23147,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -23152,8 +23197,8 @@ /obj/structure/sign/departments/minsky/medical/chemistry/chemical2{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -23167,8 +23212,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "sci-maint-passthrough" }, @@ -23178,10 +23223,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/science/explab) @@ -23201,8 +23246,8 @@ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -23224,26 +23269,27 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/aisat) "dLN" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/machinery/camera/directional/west{ c_tag = "Research Division Hallway - Mech Bay" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -23260,10 +23306,10 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "dLV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -23287,7 +23333,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -23303,6 +23349,12 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/prison, /area/security/prison) "dNf" = ( @@ -23318,8 +23370,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/main) "dNs" = ( @@ -23355,10 +23407,10 @@ /turf/open/floor/prison, /area/security/prison) "dNw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -23398,10 +23450,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -23447,22 +23499,16 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/engine/break_room) "dPe" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -23515,8 +23561,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -23553,13 +23599,13 @@ dir = 4 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_half{ @@ -23571,8 +23617,8 @@ /turf/closed/wall, /area/medical/morgue) "dRM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -23605,8 +23651,8 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/library) @@ -23626,7 +23672,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -23637,7 +23683,7 @@ dir = 1 }, /obj/structure/chair/stool/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -23663,10 +23709,10 @@ /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) "dTN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -23682,8 +23728,8 @@ pixel_x = -3; pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/library) @@ -23729,8 +23775,8 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "dUA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -23740,7 +23786,7 @@ /area/maintenance/port) "dUR" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -23821,10 +23867,8 @@ /obj/effect/turf_decal/tile/red/half{ dir = 4 }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark/smooth_half, /area/security/execution/education) "dWb" = ( @@ -23837,8 +23881,8 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "dWj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -23851,19 +23895,19 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "dWG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -23878,8 +23922,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/aisat) "dYi" = ( @@ -23911,10 +23955,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/office) "dYM" = ( @@ -23936,10 +23980,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -23950,8 +23994,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -23959,8 +24003,8 @@ /area/science/research) "dZH" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -23978,10 +24022,10 @@ pixel_y = 28 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -24050,10 +24094,10 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "eaM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -24078,8 +24122,8 @@ icon_state = "1-2" }, /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "ebR" = ( @@ -24123,10 +24167,10 @@ icon_state = "1-8" }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -24144,10 +24188,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -24215,8 +24259,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -24254,28 +24298,30 @@ c_tag = "Arrivals - Aft Arm - Far" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "eeX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/mechbay) "efc" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/circuit/telecomms, /area/maintenance/department/science/xenobiology) "efi" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -24306,8 +24352,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "efu" = ( @@ -24329,10 +24375,10 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -24346,7 +24392,7 @@ /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -24363,10 +24409,10 @@ /turf/open/floor/iron/grid/steel, /area/science/shuttledock) "egA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -24386,10 +24432,10 @@ pixel_y = -28 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -24401,10 +24447,10 @@ /turf/open/floor/iron/dark/textured, /area/ai_monitored/security/armory) "ehx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/main) "ehJ" = ( @@ -24428,10 +24474,10 @@ req_access_txt = "22;27" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -24473,10 +24519,10 @@ /obj/machinery/camera/directional/south{ c_tag = "Starboard Primary Hallway - Engineering" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -24486,7 +24532,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -24504,10 +24550,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -24530,7 +24576,7 @@ /obj/structure/sign/warning/fire{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -24542,10 +24588,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -24561,8 +24607,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -24578,10 +24624,10 @@ /turf/open/floor/iron, /area/maintenance/aft) "eng" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -24604,8 +24650,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "eoA" = ( @@ -24615,8 +24661,8 @@ /area/security/nuke_storage) "eoI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -24659,7 +24705,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -24673,8 +24719,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) "epE" = ( @@ -24684,8 +24730,8 @@ /turf/open/floor/cult, /area/chapel/main) "epG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -24721,13 +24767,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -24757,10 +24804,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -24801,8 +24848,8 @@ dir = 8; pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -24813,10 +24860,10 @@ }, /area/security/brig) "erM" = ( -/obj/machinery/computer/atmos_control/tank/mix_tank{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/engine/atmos) @@ -24849,8 +24896,8 @@ /area/medical/surgery) "esg" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -24871,10 +24918,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/brown, @@ -24910,10 +24957,10 @@ /area/engine/break_room) "esR" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood/corner{ @@ -24968,8 +25015,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/main) @@ -24993,10 +25040,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/grunge{ @@ -25046,10 +25093,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -25079,19 +25126,19 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/security/courtroom) "exx" = ( -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/window/reinforced{ dir = 4 }, @@ -25130,17 +25177,17 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "eyr" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/circuit/telecomms, /area/maintenance/department/science/xenobiology) "eyx" = ( /obj/effect/turf_decal/pool{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -25165,8 +25212,8 @@ /turf/open/floor/engine, /area/maintenance/department/science/xenobiology) "eyZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -25180,8 +25227,8 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "ezt" = ( @@ -25207,8 +25254,7 @@ dir = 8 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "ezU" = ( @@ -25278,10 +25324,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -25305,10 +25351,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -25358,10 +25404,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/central) @@ -25385,7 +25431,7 @@ /turf/open/floor/iron, /area/medical/storage) "eDT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/dark_blue/corner{ @@ -25404,10 +25450,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -25462,8 +25508,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/secondary) @@ -25474,7 +25520,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -25535,13 +25581,13 @@ /area/security/checkpoint/medical) "eGy" = ( /obj/machinery/firealarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -25553,10 +25599,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -25604,8 +25650,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = 24; pixel_y = -24 @@ -25678,10 +25724,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -25690,10 +25736,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/chair/stool/directional/west, @@ -25728,8 +25774,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) "eKj" = ( @@ -25743,10 +25789,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -25790,10 +25836,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "eLO" = ( @@ -25809,17 +25855,17 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "eMf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, /area/quartermaster/sorting) "eMm" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -25851,12 +25897,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "eNY" = ( @@ -25873,10 +25915,10 @@ /area/gateway) "eNZ" = ( /obj/structure/window/reinforced, -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -25898,15 +25940,13 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "ePp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/maintenance/aft) "ePz" = ( @@ -25940,10 +25980,10 @@ /turf/open/floor/iron, /area/security/main) "eQa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -25958,8 +25998,8 @@ /obj/machinery/camera/directional/west{ c_tag = "Bridge - Starboard Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -25987,10 +26027,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -26020,10 +26060,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "eRK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -26032,10 +26072,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -26044,8 +26084,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = -20 }, @@ -26065,8 +26105,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -26074,10 +26114,10 @@ /turf/open/floor/iron, /area/engine/break_room) "eTg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -26089,10 +26129,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/grille/broken, @@ -26106,7 +26146,7 @@ /area/maintenance/starboard/fore) "eUc" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/space/basic, @@ -26126,7 +26166,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26160,10 +26200,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -26196,8 +26236,8 @@ req_one_access_txt = "12;25;46" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "eVw" = ( @@ -26228,7 +26268,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -26261,10 +26301,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -26277,15 +26317,15 @@ /turf/open/floor/iron, /area/maintenance/aft) "eXa" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, -/obj/machinery/meter/atmos/atmos_waste_loop, +/obj/machinery/meter/monitored/waste_loop, /obj/machinery/atmospherics/components/binary/pump/layer2{ dir = 1; name = "Distro to Waste" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/iron, /area/engine/atmos) "eXp" = ( @@ -26301,10 +26341,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -26313,8 +26353,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26328,8 +26368,8 @@ /obj/item/toy/cards/deck{ pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "eYd" = ( @@ -26349,8 +26389,8 @@ /turf/open/floor/wood, /area/library) "eYg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -26368,8 +26408,8 @@ /turf/open/floor/carpet/red, /area/medical/exam_room) "eYm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -26406,8 +26446,8 @@ }, /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics/garden) "eZd" = ( @@ -26434,8 +26474,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "eZj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, @@ -26458,10 +26498,10 @@ /area/science/storage) "eZK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -26570,8 +26610,8 @@ /area/security/brig) "fcY" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light_switch{ pixel_x = -21; pixel_y = -22 @@ -26603,8 +26643,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -26627,6 +26667,7 @@ /obj/effect/turf_decal/tile/dark_red/half{ dir = 4 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/smooth_half, /area/security/prison) "feb" = ( @@ -26638,10 +26679,10 @@ /turf/open/floor/iron, /area/maintenance/department/medical/central) "ffd" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ dir = 4 }, /turf/open/floor/iron/dark/corner{ @@ -26694,10 +26735,10 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -26706,8 +26747,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -26720,10 +26761,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 }, @@ -26735,8 +26776,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -26782,7 +26823,7 @@ /turf/open/floor/iron/dark, /area/medical/medbay/central) "fhJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -26794,7 +26835,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -26827,10 +26868,10 @@ /area/medical/break_room) "fiB" = ( /obj/structure/chair/fancy/comfy, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -26874,10 +26915,20 @@ "fiS" = ( /obj/structure/disposalpipe/segment, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/science/lab) +"fjg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "fjD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26909,10 +26960,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -26923,13 +26974,13 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "fkl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/shutters{ id = "explo_prep"; name = "Test Range Shutters" @@ -26976,8 +27027,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -26994,8 +27045,8 @@ /area/medical/exam_room) "fmw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -27038,10 +27089,10 @@ /obj/machinery/camera/directional/south{ c_tag = "Research Division - Break Room" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/cafeteria{ @@ -27056,17 +27107,17 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "fmT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/science/shuttledock) "fmU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -27076,8 +27127,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -27088,13 +27139,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard) "fnD" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark/smooth_large, @@ -27120,10 +27171,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "foy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -27147,8 +27198,8 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "foK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "fpi" = ( @@ -27182,10 +27233,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/catwalk_floor/iron, @@ -27209,8 +27260,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; req_access_txt = "3"; @@ -27241,10 +27292,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/port) "fqY" = ( @@ -27275,13 +27328,14 @@ }, /area/hallway/secondary/exit/departure_lounge) "fra" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Airlock" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, /area/hallway/secondary/entry) "frm" = ( /obj/structure/cable/yellow{ @@ -27290,10 +27344,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -27356,8 +27410,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "fsm" = ( @@ -27374,8 +27428,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -27387,6 +27441,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/medical/surgery) +"fte" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/starboard) "fti" = ( /obj/effect/turf_decal/numbers{ dir = 1 @@ -27400,10 +27464,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -27412,8 +27476,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -27467,7 +27531,7 @@ /turf/open/floor/plating, /area/maintenance/department/medical/central) "fuq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -27494,6 +27558,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"fvc" = ( +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/prison, +/area/security/prison) "fvA" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -27510,10 +27584,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27527,10 +27597,10 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -27607,7 +27677,7 @@ id = "executionfireblast" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark/smooth_large, /area/security/execution/education) @@ -27628,8 +27698,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -27651,7 +27721,7 @@ /area/crew_quarters/heads/hop) "fxC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/dark/smooth_large, @@ -27665,8 +27735,8 @@ pixel_x = -31; pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -27693,8 +27763,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -27718,10 +27788,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -27748,10 +27818,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -27790,10 +27860,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -27819,10 +27889,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -27839,10 +27909,10 @@ /area/ai_monitored/turret_protected/aisat/foyer) "fAk" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -27867,10 +27937,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -27951,10 +28021,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/brown{ @@ -27973,7 +28043,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "fCE" = ( @@ -27986,15 +28056,15 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark/smooth_large, /area/security/checkpoint/science/research) "fCS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -28003,7 +28073,7 @@ "fDA" = ( /obj/structure/cable/yellow, /obj/machinery/power/emitter/welded, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "fDF" = ( @@ -28019,8 +28089,8 @@ }, /obj/structure/table/wood/poker, /obj/item/clothing/head/fedora, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/bar) "fDP" = ( @@ -28037,10 +28107,7 @@ pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -28069,10 +28136,10 @@ name = "Chemistry Lab"; req_one_access_txt = "33;69" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -28092,8 +28159,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -28109,10 +28176,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -28125,10 +28192,10 @@ icon_state = "4-8" }, /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -28153,10 +28220,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -28174,10 +28241,10 @@ codes_txt = "patrol;next_patrol=11.1-Command-Starboard"; location = "11-Command-Port" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -28186,10 +28253,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -28307,10 +28374,10 @@ /turf/open/floor/iron/dark, /area/chapel/main) "fIr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -28393,10 +28460,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -28419,19 +28486,16 @@ /area/chapel/office) "fLK" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) "fMd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction{ @@ -28466,10 +28530,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28540,8 +28604,8 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/start/geneticist, @@ -28584,18 +28648,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fOq" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/stripes/white/corner{ @@ -28607,20 +28672,24 @@ /turf/open/floor/engine, /area/engine/engineering) "fOr" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/arrivals_external{ - name = "Arrivals Airlock" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "fOw" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -28636,10 +28705,10 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fOV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -28693,20 +28762,20 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "fPo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -28721,8 +28790,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "fQd" = ( @@ -28734,8 +28803,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "fQF" = ( @@ -28744,17 +28813,17 @@ dir = 1; name = "O2 to Airmix" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) "fQO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -28772,10 +28841,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -28785,24 +28854,26 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/manifold, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "fRq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/hallway/primary/central) "fRz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -28812,10 +28883,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -28826,25 +28897,22 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/mechbay) "fRO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) "fRZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -28853,10 +28921,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "fSa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/loading_area{ @@ -28880,8 +28948,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -28891,8 +28959,8 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -28905,15 +28973,16 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) "fSO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/aft) "fSR" = ( @@ -28929,10 +28998,10 @@ name = "Morgue"; req_one_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -28954,10 +29023,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -28975,8 +29044,8 @@ /obj/machinery/newscaster{ pixel_y = -29 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) @@ -28989,8 +29058,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -29021,10 +29090,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/junction/flip{ @@ -29037,8 +29106,8 @@ icon_state = "1-2" }, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -29091,8 +29160,8 @@ /turf/open/floor/carpet/red, /area/medical/exam_room) "fVp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark{ dir = 8 }, @@ -29164,10 +29233,10 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "fXm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -29186,10 +29255,10 @@ }, /area/security/checkpoint/customs) "fYo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -29229,8 +29298,8 @@ pixel_x = 25; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -29264,10 +29333,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -29294,8 +29363,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -29311,13 +29380,10 @@ "gap" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/rnd/server, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8; - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 }, -/turf/open/floor/circuit/telecomms/server, +/turf/open/floor/circuit, /area/science/server) "gar" = ( /obj/machinery/firealarm{ @@ -29340,8 +29406,8 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "gaD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -29376,10 +29442,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -29402,8 +29468,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "gbn" = ( @@ -29415,10 +29481,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -29442,19 +29508,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "gch" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -29467,8 +29533,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "gcZ" = ( @@ -29495,10 +29561,10 @@ /area/quartermaster/office) "gdi" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -29517,10 +29583,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -29560,10 +29626,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -29579,8 +29645,8 @@ /turf/open/space, /area/solar/starboard/aft) "geE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -29600,7 +29666,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/circuit/telecomms, @@ -29613,7 +29679,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -29623,10 +29689,10 @@ /area/science/nanite) "ggZ" = ( /obj/structure/window/reinforced, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ +/obj/machinery/computer/atmos_control/oxygen_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -29701,14 +29767,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "giH" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "gjc" = ( @@ -29716,10 +29782,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -29732,8 +29798,8 @@ /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) "gjx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -29755,10 +29821,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_half, @@ -29785,10 +29851,10 @@ /area/security/main) "gka" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -29805,10 +29871,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -29827,7 +29893,7 @@ dir = 1; name = "Nitrogen Outlet" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -29841,10 +29907,10 @@ /area/security/main) "glr" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -29868,8 +29934,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) "glP" = ( @@ -29900,8 +29966,8 @@ /obj/item/radio/intercom{ pixel_x = -29 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -29910,10 +29976,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "gmr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -29972,6 +30038,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/command) +"gou" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "goB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30027,8 +30100,8 @@ /obj/machinery/camera/directional/west{ c_tag = "Captain's Office - Emergency Escape" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central) "goW" = ( @@ -30041,7 +30114,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/circuit/telecomms, @@ -30050,10 +30123,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -30066,8 +30139,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "gpY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, @@ -30090,15 +30163,16 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "gqT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -30128,10 +30202,10 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -30140,10 +30214,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -30195,14 +30269,14 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/lab) "gtN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -30224,7 +30298,7 @@ req_access_txt = "10" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/maintenance/starboard) "gus" = ( @@ -30252,8 +30326,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -30274,17 +30348,13 @@ icon_state = "4-8" }, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/solars/port/aft) "gvf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/door/airlock/atmos/glass{ @@ -30292,10 +30362,10 @@ req_access_txt = "24" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ @@ -30311,8 +30381,8 @@ /area/medical/chemistry) "gwC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -30457,10 +30527,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -30469,10 +30539,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -30484,10 +30554,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -30504,9 +30574,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, /turf/open/floor/iron, /area/maintenance/aft) "gBY" = ( @@ -30516,10 +30583,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -30533,10 +30600,10 @@ icon_state = "map-left-MS"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -30612,10 +30679,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -30627,7 +30694,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/light_switch{ pixel_x = -23; @@ -30646,20 +30713,20 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "gFf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/grimy, /area/chapel/office) "gFh" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -30678,22 +30745,22 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "gFK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "gFN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/vacant_room/office) "gFT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -30713,8 +30780,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -30743,20 +30810,20 @@ /obj/machinery/ai_slipper{ uses = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "gGD" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "gGF" = ( @@ -30772,8 +30839,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "gHe" = ( @@ -30796,13 +30863,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) "gHS" = ( /obj/structure/chair/fancy/bench/pew/right, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/chapel{ @@ -30811,10 +30878,10 @@ /area/chapel/main) "gIk" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -30927,7 +30994,6 @@ req_access_txt = "2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/dark, /area/security/brig) "gLj" = ( @@ -30937,8 +31003,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/execution/education) "gLs" = ( @@ -30971,8 +31037,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "gMe" = ( @@ -30983,7 +31048,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -31020,10 +31085,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "gNz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -31044,8 +31109,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "gNW" = ( @@ -31082,10 +31147,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -31094,10 +31159,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -31109,7 +31174,7 @@ /area/science/explab) "gOz" = ( /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -31119,8 +31184,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/secondary) "gPt" = ( @@ -31158,10 +31223,10 @@ /turf/open/floor/iron/dark, /area/chapel/main) "gPS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/chapel{ @@ -31175,10 +31240,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -31195,10 +31260,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -31244,8 +31309,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -31255,7 +31320,7 @@ icon_state = "1-4" }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/siding/white{ dir = 8 @@ -31282,10 +31347,10 @@ /turf/open/floor/plating, /area/maintenance/department/science/central) "gRz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -31342,7 +31407,7 @@ /area/crew_quarters/heads/hop) "gTq" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -31365,10 +31430,10 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -31421,10 +31486,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -31435,7 +31500,7 @@ dir = 4; pixel_x = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/science/storage) "gUB" = ( @@ -31449,8 +31514,8 @@ codes_txt = "patrol;next_patrol=14.9-CrewQuarters-Central"; location = "14.8-Dorms-Lockers" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -31458,10 +31523,10 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "gUG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/radio/intercom{ freerange = 1; name = "Common Channel"; @@ -31486,9 +31551,9 @@ req_access_txt = "24" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "gUX" = ( @@ -31512,8 +31577,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -31525,10 +31590,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;22;25;37;38;46" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -31554,10 +31619,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -31574,7 +31639,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -31586,10 +31651,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -31599,10 +31664,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -31649,10 +31711,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -31664,7 +31726,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -31676,8 +31738,10 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/aft/secondary) "gYM" = ( @@ -31732,8 +31796,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -31760,8 +31824,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard) "hbA" = ( @@ -31827,10 +31891,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -31868,17 +31932,17 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/white, /area/science/lab) "hdH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -31899,10 +31963,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -31914,10 +31978,10 @@ /turf/open/floor/iron/dark, /area/security/nuke_storage) "hdZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -31926,10 +31990,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "heJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -31975,15 +32039,18 @@ /obj/machinery/camera/directional/east{ c_tag = "Engineering Supermatter Port" }, -/obj/machinery/airalarm/engine{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, -/area/engine/supermatter) +/area/engine/engineering) "hfQ" = ( /obj/structure/sign/departments/minsky/research/robotics{ pixel_x = 32 @@ -32020,10 +32087,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/storage/satellite) "hgy" = ( @@ -32041,8 +32108,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "SCI-Entrance" }, @@ -32060,7 +32127,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/service, /turf/open/floor/iron/dark, /area/storage/tech) "hig" = ( @@ -32117,10 +32185,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -32153,8 +32221,11 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -32174,10 +32245,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -32219,10 +32290,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -32246,7 +32317,7 @@ pixel_x = 6; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/siding/dark/corner, @@ -32287,10 +32358,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -32398,10 +32469,10 @@ /turf/open/floor/iron, /area/medical/medbay/aft) "hmU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral, @@ -32411,8 +32482,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -32440,8 +32511,8 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/checkpoint/supply) "hnv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -32451,10 +32522,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "hnQ" = ( @@ -32492,10 +32561,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, @@ -32567,7 +32636,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/medical/storage) "hpv" = ( @@ -32589,7 +32658,7 @@ /area/lawoffice) "hql" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, @@ -32602,9 +32671,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/storage) "hqx" = ( @@ -32613,15 +32679,24 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"hqG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/security/brig) "hqK" = ( /obj/structure/grille/broken, /turf/open/floor/iron, /area/maintenance/starboard/fore) "hra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/prison, /area/security/prison) @@ -32638,8 +32713,8 @@ /turf/open/floor/plating, /area/security/prison) "hrk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32658,7 +32733,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -32675,10 +32750,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "hsd" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -32727,10 +32802,7 @@ /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "hsZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32740,8 +32812,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -32755,8 +32827,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -32777,7 +32849,7 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "huT" = ( @@ -32795,10 +32867,10 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -32808,7 +32880,7 @@ /area/maintenance/disposal/incinerator) "hvP" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -32826,10 +32898,10 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/siding/wood/corner{ @@ -32854,10 +32926,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -32885,7 +32957,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/freezer, @@ -32916,10 +32988,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -32932,7 +33004,7 @@ /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -32951,12 +33023,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "hyz" = ( @@ -32967,10 +33033,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33004,10 +33070,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, @@ -33020,10 +33086,10 @@ /area/hydroponics) "hzm" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33035,10 +33101,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "hzz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33052,10 +33118,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -33107,8 +33173,8 @@ /turf/open/floor/plating, /area/medical/surgery) "hBr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "hBw" = ( @@ -33121,8 +33187,8 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) @@ -33152,7 +33218,7 @@ dir = 8; name = "CO2 to Pure" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/window/reinforced{ dir = 4 }, @@ -33171,10 +33237,10 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -33189,10 +33255,10 @@ /turf/open/floor/engine, /area/science/explab) "hDi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark/smooth_large, @@ -33241,12 +33307,6 @@ pixel_x = 32 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/plating, /area/maintenance/aft/secondary) "hEt" = ( @@ -33272,10 +33332,10 @@ /turf/open/floor/iron/dark, /area/science/explab) "hEL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -33288,8 +33348,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -33331,8 +33391,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half{ dir = 1 }, @@ -33376,10 +33436,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -33399,10 +33459,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -33417,7 +33477,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -33426,8 +33486,8 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "hGs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -33580,8 +33640,8 @@ /turf/open/floor/iron, /area/medical/storage) "hJh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -33622,10 +33682,10 @@ /turf/open/floor/iron, /area/medical/surgery) "hJL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -33659,8 +33719,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -33675,19 +33735,18 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/solars/starboard/aft) "hKk" = ( /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -33702,11 +33761,11 @@ dir = 5 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/white/line, @@ -33724,8 +33783,8 @@ dir = 4 }, /obj/machinery/rnd/production/techfab/department/cargo, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "hKy" = ( @@ -33774,10 +33833,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "hLZ" = ( @@ -33801,10 +33860,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/oil, @@ -33817,17 +33876,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "hMh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -33837,7 +33896,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/iron, /area/medical/patients_rooms) "hMy" = ( @@ -33848,11 +33907,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "hMB" = ( @@ -33922,16 +33982,16 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/port) "hOn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -33943,8 +34003,8 @@ /turf/open/floor/iron, /area/science/mixing) "hOD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -33959,10 +34019,10 @@ /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) "hPp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/green, @@ -33985,6 +34045,7 @@ }, /obj/structure/cable/yellow, /obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -34004,13 +34065,13 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/construction/storage_wing) "hPW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -34068,10 +34129,10 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -34135,10 +34196,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -34155,10 +34216,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/checker, @@ -34167,8 +34228,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner{ dir = 1 }, @@ -34184,8 +34245,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -34214,10 +34275,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -34235,8 +34296,8 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "hTW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -34249,10 +34310,10 @@ /turf/open/floor/iron/dark/textured, /area/security/main) "hTY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -34265,8 +34326,8 @@ dir = 8 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -34285,8 +34346,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/detectives_office) @@ -34342,25 +34403,26 @@ /turf/open/floor/iron/dark/smooth_half, /area/hallway/secondary/exit/departure_lounge) "hUx" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "hUB" = ( -/obj/machinery/airalarm/mixingchamber{ +/obj/machinery/airalarm{ pixel_y = -22 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/science/mixing) "hVo" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -6; @@ -34377,17 +34439,17 @@ dir = 8 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "hVX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -34411,7 +34473,8 @@ }, /obj/machinery/portable_atmospherics/canister, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/bot{ dir = 1 @@ -34448,8 +34511,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -34460,8 +34523,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "hYn" = ( @@ -34489,10 +34552,10 @@ /obj/machinery/door/window{ name = "MiniSat Walkway Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -34527,10 +34590,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -34580,10 +34643,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -34592,8 +34655,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -34608,8 +34671,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "ibw" = ( @@ -34633,10 +34696,10 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -34651,10 +34714,10 @@ /obj/item/radio/intercom{ pixel_y = 21 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/white/line, @@ -34695,10 +34758,10 @@ name = "science Shuttle Dock"; req_one_access_txt = "49" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -34715,15 +34778,15 @@ /obj/item/radio/intercom{ pixel_y = 21 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/port) "icl" = ( @@ -34757,16 +34820,16 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "idd" = ( /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -34776,10 +34839,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/loading_area{ @@ -34823,10 +34886,10 @@ codes_txt = "patrol;next_patrol=7.5-Starboard-Aft-Corner"; location = "7-Command-Starboard" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -34895,10 +34958,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -34961,10 +35024,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -34989,8 +35052,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron{ dir = 1 }, @@ -35018,10 +35081,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -35061,8 +35124,8 @@ /turf/open/floor/iron, /area/medical/medbay/aft) "iji" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark/smooth_corner, /area/security/brig) @@ -35071,10 +35134,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral{ @@ -35099,10 +35162,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -35118,11 +35181,23 @@ /obj/item/gun/energy/laser, /turf/open/floor/iron/showroomfloor, /area/security/warden) +"ika" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "iko" = ( /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -35131,10 +35206,10 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "ikA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -35159,10 +35234,10 @@ /area/maintenance/department/science/xenobiology) "ili" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -35181,8 +35256,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/primary) "ilG" = ( @@ -35210,8 +35285,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -35237,10 +35312,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -35262,8 +35337,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/aisat) "inI" = ( @@ -35280,8 +35355,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -35295,10 +35370,10 @@ }, /area/engine/engineering) "ioi" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -35316,10 +35391,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "iov" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -35339,7 +35414,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -35362,10 +35437,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/white, @@ -35390,8 +35465,8 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "ipe" = ( @@ -35429,10 +35504,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -35450,7 +35525,7 @@ /area/security/main) "iqD" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /turf/open/space/basic, @@ -35471,10 +35546,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -35531,7 +35606,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -35566,7 +35641,10 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "irA" = ( -/turf/open/floor/circuit/green/telecomms/mainframe, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/circuit/green, /area/science/server) "irE" = ( /obj/structure/table/wood/poker, @@ -35617,10 +35695,10 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "isj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "isS" = ( @@ -35643,9 +35721,6 @@ icon_state = "0-4" }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "itu" = ( @@ -35670,7 +35745,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -35679,10 +35754,10 @@ /turf/open/floor/iron/dark/textured, /area/security/brig) "iuw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -35697,10 +35772,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -35741,15 +35816,15 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/checkpoint/science/research) "iwf" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "iwl" = ( @@ -35779,11 +35854,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, /turf/open/floor/catwalk_floor, /area/engine/atmos) @@ -35794,10 +35866,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;25;46" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -35819,6 +35891,16 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/dorms) +"ixA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/port/fore) "iya" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -35826,10 +35908,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -35859,8 +35941,8 @@ /obj/machinery/door/airlock{ name = "Starboard Emergency Storage" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "iyU" = ( @@ -35886,7 +35968,7 @@ }, /area/engine/engineering) "izO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -35901,17 +35983,17 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "iAp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/hallway/primary/central) +/turf/open/floor/iron/dark, +/area/engine/engineering) "iAv" = ( /obj/machinery/portable_thermomachine, /obj/structure/sign/warning/vacuum/external{ @@ -35929,8 +36011,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) "iAS" = ( @@ -35938,10 +36020,10 @@ /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "iAW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red/half{ @@ -35957,10 +36039,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -36058,7 +36140,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -36117,10 +36199,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -36153,10 +36235,10 @@ icon_state = "2-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -36171,8 +36253,8 @@ id = "Engineering"; name = "Engineering Security Doors" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "iEo" = ( @@ -36230,15 +36312,15 @@ /turf/open/floor/iron/white, /area/medical/surgery) "iFu" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating, -/area/science/shuttledock) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/aisat) "iFW" = ( /obj/structure/closet/bombcloset, /obj/machinery/power/apc{ @@ -36265,10 +36347,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -36316,10 +36398,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -36339,7 +36421,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "iHJ" = ( @@ -36349,8 +36431,8 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;27;37" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "iHK" = ( @@ -36366,10 +36448,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -36378,7 +36460,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36416,14 +36498,14 @@ /area/science/lab) "iJv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron, -/area/hallway/primary/port) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "iJw" = ( /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36471,8 +36553,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/storage/tech) @@ -36492,8 +36574,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/book/manual/wiki/sopsupply, /turf/open/floor/iron, /area/quartermaster/storage) @@ -36508,15 +36590,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "iKg" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/light_switch{ @@ -36567,8 +36647,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) @@ -36583,10 +36663,10 @@ /turf/open/floor/iron/dark, /area/science/nanite) "iLU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -36618,8 +36698,8 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "iMO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 }, @@ -36631,10 +36711,10 @@ icon_state = "map-left-MS"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/siding/wood{ @@ -36649,7 +36729,7 @@ name = "Atmos RC"; pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36661,28 +36741,22 @@ /turf/open/floor/iron, /area/engine/atmos) "iNO" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "iOf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "iOF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -36712,7 +36786,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron, /area/maintenance/aft) "iPF" = ( @@ -36727,7 +36800,7 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "iPP" = ( @@ -36744,14 +36817,14 @@ /turf/open/floor/iron, /area/maintenance/disposal) "iQb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -36761,19 +36834,19 @@ codes_txt = "patrol;next_patrol=16-Fore"; location = "15-Court" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/courtroom) "iQn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -36785,10 +36858,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -36815,8 +36888,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -36825,10 +36898,10 @@ id_tag = "Cabin4"; name = "Cabin 5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -36837,10 +36910,10 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -36869,8 +36942,8 @@ /turf/open/space/basic, /area/space/nearstation) "iRC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, @@ -36878,8 +36951,8 @@ /area/medical/medbay/aft) "iRP" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs, /area/science/xenobiology) "iSb" = ( @@ -36898,10 +36971,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -36913,10 +36986,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -36946,10 +37019,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/freezer, @@ -36964,8 +37037,8 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -36978,15 +37051,16 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "iTt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/maintenance/aft/secondary) "iTz" = ( @@ -37038,10 +37112,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "iVn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -37053,14 +37127,17 @@ /turf/open/floor/iron, /area/maintenance/port) "iWy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/iron, -/area/quartermaster/miningoffice) +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "iWz" = ( /obj/machinery/light, /obj/machinery/computer/security/telescreen/minisat{ @@ -37073,10 +37150,10 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "iWD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -37088,7 +37165,7 @@ /turf/open/floor/iron, /area/maintenance/aft) "iWF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/security/checkpoint/medical) "iWT" = ( @@ -37109,7 +37186,7 @@ /turf/open/floor/engine, /area/science/xenobiology) "iWX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/lattice, @@ -37125,8 +37202,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -37162,8 +37239,8 @@ /area/maintenance/aft) "iYp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -37181,8 +37258,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "iZN" = ( @@ -37218,30 +37295,22 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/aft/secondary) "jab" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "jac" = ( @@ -37261,8 +37330,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "jay" = ( @@ -37301,8 +37372,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "jbV" = ( @@ -37338,10 +37409,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -37385,10 +37456,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -37407,10 +37478,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -37426,10 +37497,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -37462,10 +37533,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/black/opposingcorners{ @@ -37497,6 +37568,7 @@ pixel_y = 13 }, /obj/item/clothing/head/utility/chefhat, +/obj/machinery/airalarm/directional/east, /turf/open/floor/prison, /area/security/prison) "jgG" = ( @@ -37545,10 +37617,10 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "jhu" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/carpet/grimy, @@ -37557,10 +37629,10 @@ /obj/machinery/door/airlock/silver{ name = "Bathroom" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -37572,10 +37644,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -37595,8 +37667,8 @@ "jix" = ( /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/secondary) "jiS" = ( @@ -37622,8 +37694,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 }, @@ -37636,8 +37708,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -37683,10 +37755,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "jkQ" = ( @@ -37751,22 +37823,22 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "jok" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/prison, /area/security/prison) "joq" = ( @@ -37776,10 +37848,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -37811,8 +37883,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "jpI" = ( @@ -37829,8 +37901,8 @@ /turf/open/floor/iron/white, /area/science/research) "jpJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "jpN" = ( @@ -37945,8 +38017,8 @@ /turf/open/floor/iron, /area/science/research) "jsc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -37966,10 +38038,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "jsn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -38020,19 +38092,21 @@ /turf/open/floor/iron/white, /area/medical/surgery) "jtl" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/chair/office, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/wood, +/area/library) "jtq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -38066,16 +38140,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "jtP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -38111,10 +38185,10 @@ }, /area/security/main) "juP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -38149,10 +38223,10 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "jvC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -38205,7 +38279,7 @@ /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) "jxf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -38235,10 +38309,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/cafeteria{ @@ -38268,8 +38342,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "jyn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -38281,10 +38355,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -38311,9 +38385,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /turf/open/floor/carpet/grimy, @@ -38325,8 +38399,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -38343,7 +38417,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "jza" = ( @@ -38379,11 +38452,14 @@ /obj/effect/turf_decal/plaque{ icon_state = "L9" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "jAi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/tech/grid, /area/security/main) "jAj" = ( @@ -38402,7 +38478,7 @@ pixel_x = -8; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/science/explab) "jAk" = ( @@ -38412,10 +38488,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -38433,10 +38509,10 @@ /turf/open/floor/iron/dark, /area/science/storage) "jAH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/smooth_large, @@ -38459,8 +38535,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -38482,10 +38558,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -38523,10 +38599,10 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "jCj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -38568,17 +38644,17 @@ dir = 1; name = "gas Ports" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/dark/smooth_large, /area/security/execution/education) "jCR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "jDq" = ( @@ -38607,10 +38683,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -38659,8 +38735,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 10 }, @@ -38682,10 +38758,10 @@ /turf/open/floor/iron, /area/security/prison) "jFI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral, @@ -38708,10 +38784,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jHb" = ( @@ -38756,10 +38832,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;48;50;1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -38768,10 +38844,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -38853,8 +38929,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/fore) "jJV" = ( @@ -38875,11 +38951,11 @@ /turf/open/floor/iron/grid/steel, /area/science/shuttledock) "jKl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/grid/steel, @@ -38917,10 +38993,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -38955,10 +39031,10 @@ icon_state = "right"; name = "MiniSat Walkway Access" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -38968,7 +39044,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -39000,8 +39076,8 @@ }, /area/science/research) "jMN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -39130,9 +39206,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "jOD" = ( @@ -39163,10 +39239,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -39307,11 +39383,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -39325,10 +39401,10 @@ /turf/open/floor/iron, /area/ai_monitored/storage/eva) "jRz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39354,7 +39430,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -39405,7 +39481,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -39437,8 +39513,8 @@ /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/white/corner{ dir = 1 }, @@ -39454,10 +39530,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "jUc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -39472,7 +39548,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -39487,8 +39563,8 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "jUG" = ( @@ -39514,10 +39590,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -39528,7 +39604,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/locker) "jUL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -39537,24 +39613,29 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) "jVk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/prison, -/area/security/prison) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "jVK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -39575,10 +39656,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -39604,8 +39685,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "jXr" = ( @@ -39618,8 +39699,8 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "jXu" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -39641,7 +39722,7 @@ "jXI" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -39665,8 +39746,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "jYt" = ( @@ -39680,19 +39761,19 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "jZk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; name = "Research Division"; @@ -39725,8 +39806,8 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -39736,10 +39817,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -39773,10 +39854,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -39797,10 +39878,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -39812,10 +39893,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -39828,19 +39909,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard) "kbc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39873,7 +39954,7 @@ /area/security/courtroom) "kbD" = ( /obj/effect/landmark/start/botanist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -39886,10 +39967,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -39899,10 +39980,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "kcH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -39997,10 +40078,10 @@ dir = 1 }, /obj/effect/landmark/start/head_of_security, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet/red, @@ -40041,8 +40122,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -40069,8 +40150,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -40081,8 +40162,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) @@ -40125,10 +40206,10 @@ "kgo" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -40150,10 +40231,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -40173,10 +40254,10 @@ /turf/open/floor/plating, /area/maintenance/central) "khw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -40248,13 +40329,13 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -40276,11 +40357,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "kjw" = ( @@ -40306,10 +40385,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -40322,8 +40401,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge) "kkt" = ( @@ -40388,10 +40467,10 @@ /area/medical/break_room) "klX" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -40450,10 +40529,10 @@ /turf/open/floor/iron, /area/science/mixing) "kmH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -40491,8 +40570,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ broken = 1 }, @@ -40502,12 +40581,10 @@ icon_state = "1-2" }, /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "koh" = ( @@ -40534,10 +40611,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -40575,16 +40652,16 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/space, /area/space/nearstation) "kqc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -40607,8 +40684,8 @@ }, /area/security/main) "kqm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -40631,9 +40708,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "kqz" = ( @@ -40649,28 +40725,28 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, /area/maintenance/starboard/fore) "krk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, /area/medical/storage) "krD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -40721,7 +40797,8 @@ /area/construction/storage_wing) "ksI" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -40739,8 +40816,8 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "ksZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -40751,10 +40828,10 @@ dir = 8; sortType = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -40807,7 +40884,10 @@ /turf/open/floor/iron, /area/science/shuttledock) "kuC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "kuN" = ( @@ -40826,8 +40906,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "kvL" = ( @@ -40854,10 +40934,10 @@ pixel_y = 1 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -40887,7 +40967,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -40924,8 +41004,8 @@ /obj/machinery/firealarm{ pixel_y = 27 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2, +/obj/effect/turf_decal/delivery/white, /turf/open/floor/iron, /area/crew_quarters/locker) "kwL" = ( @@ -40991,10 +41071,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/oil, @@ -41017,20 +41097,20 @@ /area/storage/art) "kya" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/central) "kyp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -41066,7 +41146,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kzD" = ( @@ -41090,9 +41169,8 @@ /turf/open/floor/wood, /area/medical/exam_room) "kzE" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) @@ -41126,10 +41204,10 @@ name = "Dormitories APC"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -41161,10 +41239,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral{ @@ -41185,10 +41263,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -41221,10 +41299,10 @@ /turf/open/floor/iron/white/textured_large, /area/security/brig) "kBS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -41247,11 +41325,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -41259,10 +41337,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -41286,8 +41364,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "kCX" = ( @@ -41320,8 +41398,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/storage/tech) @@ -41356,10 +41434,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -41408,18 +41486,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "kES" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41446,10 +41524,10 @@ /area/ai_monitored/security/armory) "kFB" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -41458,7 +41536,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/blue, @@ -41474,10 +41552,10 @@ /area/crew_quarters/fitness/recreation) "kFS" = ( /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -41489,8 +41567,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -41504,7 +41582,7 @@ "kGm" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) "kGn" = ( @@ -41536,10 +41614,10 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -41550,7 +41628,10 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -41559,8 +41640,8 @@ /obj/machinery/camera/directional/east{ c_tag = "Central Primary Hallway - Fore - Starboard Corner" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -41611,8 +41692,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -41622,8 +41703,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kJq" = ( @@ -41641,19 +41723,19 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/aft) "kJt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -41684,19 +41766,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "kJN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -41709,35 +41791,26 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) "kKh" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -27 - }, /obj/machinery/light/small{ brightness = 3; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/plating, /area/security/brig) "kKj" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -41746,10 +41819,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -41764,10 +41837,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "kKG" = ( @@ -41786,8 +41859,6 @@ req_access_txt = "10; 13" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "kLu" = ( @@ -41809,10 +41880,10 @@ /area/bridge) "kLF" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/green, @@ -41838,12 +41909,6 @@ /area/teleporter) "kMl" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "kMr" = ( @@ -41860,8 +41925,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/nuke_storage) @@ -41876,8 +41941,8 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood/end, /turf/open/floor/wood, /area/lawoffice) @@ -41885,10 +41950,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -41919,10 +41984,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -41931,20 +41996,17 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "kNK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/iron/smooth_large, -/area/security/brig) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kNZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) @@ -41968,9 +42030,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "kOE" = ( @@ -41991,10 +42050,10 @@ /turf/open/floor/iron, /area/science/research) "kOK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/green, @@ -42009,8 +42068,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -42019,8 +42078,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 }, @@ -42038,10 +42096,10 @@ c_tag = "Arrivals - Middle Arm" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -42074,8 +42132,8 @@ pixel_x = 32 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "kRA" = ( @@ -42090,8 +42148,8 @@ /turf/open/floor/cult, /area/library) "kRQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -42104,12 +42162,12 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = 38; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "kSn" = ( @@ -42131,8 +42189,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42153,10 +42211,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42177,10 +42235,10 @@ }, /area/security/brig) "kTP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -42191,16 +42249,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/office) "kUm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -42227,10 +42285,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -42249,10 +42307,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -42261,10 +42319,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -42276,14 +42334,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/fore) "kWr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42294,8 +42352,8 @@ /obj/machinery/door/window{ name = "MiniSat Walkway Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -42316,10 +42374,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -42337,8 +42395,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -42356,10 +42414,10 @@ /turf/open/floor/iron/techmaint, /area/science/xenobiology) "kXR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -42399,10 +42457,10 @@ /turf/open/floor/prison, /area/security/prison) "kZi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -42456,10 +42514,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -42471,8 +42529,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -42504,7 +42562,7 @@ /turf/open/floor/carpet/red, /area/medical/exam_room) "lbU" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /turf/open/floor/iron, @@ -42535,7 +42593,7 @@ dir = 4 }, /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -42589,10 +42647,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -42605,7 +42663,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "lft" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 1 }, /turf/open/floor/iron/dark, @@ -42615,8 +42673,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42638,10 +42696,10 @@ pixel_y = -30 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -42660,18 +42718,12 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/storage/tools) "lfO" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "lfV" = ( @@ -42699,20 +42751,19 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/break_room) "lhn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/port) "lhv" = ( @@ -42725,27 +42776,27 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "lhx" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) "lhF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -42761,10 +42812,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/satellite) "lhN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -42786,12 +42837,6 @@ /area/crew_quarters/bar) "lik" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -42819,19 +42864,19 @@ /turf/open/floor/iron, /area/medical/chemistry) "liI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ljd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/white/textured_large, @@ -42849,10 +42894,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/storage/satellite) "ljB" = ( @@ -42865,10 +42910,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L14" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -42877,8 +42922,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "ljU" = ( @@ -42895,10 +42939,10 @@ /area/crew_quarters/heads/captain/private) "lkl" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) "llo" = ( @@ -42913,10 +42957,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -42937,7 +42981,8 @@ /area/security/main) "llR" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/machinery/camera/directional/west{ c_tag = "Atmospherics - Port-Aft" @@ -42965,8 +43010,8 @@ /area/science/research) "lmF" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -42974,16 +43019,16 @@ "lnD" = ( /obj/item/folder/blue, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/vacant_room/office) "lnF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43024,10 +43069,10 @@ icon_state = "2-8" }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red/half{ @@ -43063,10 +43108,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -43081,13 +43126,21 @@ /area/security/brig) "loY" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"lpc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "lpd" = ( /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, @@ -43169,10 +43222,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron{ @@ -43186,10 +43239,10 @@ /obj/machinery/camera/directional/north{ c_tag = "Research Division Hallway - Xenobiology Lab Access" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -43216,10 +43269,10 @@ /turf/open/floor/carpet/grimy, /area/security/detectives_office) "lsk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -43238,8 +43291,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -43248,10 +43301,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -43261,8 +43314,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "lsE" = ( @@ -43274,7 +43327,7 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/carpet/grimy, @@ -43297,16 +43350,19 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/prison, /area/security/prison) "ltF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -43315,10 +43371,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -43327,8 +43383,8 @@ /obj/structure/sign/warning/pods{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -43362,19 +43418,19 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "lue" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/stripes/corner, @@ -43385,8 +43441,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/port/fore) @@ -43397,8 +43453,8 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/wood, @@ -43437,21 +43493,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "lvN" = ( /obj/effect/turf_decal/plaque{ icon_state = "L1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -43507,19 +43565,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "lwy" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/engine/break_room) @@ -43534,7 +43589,7 @@ /area/science/shuttledock) "lwX" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -43549,10 +43604,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "lxk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -43566,12 +43621,9 @@ /turf/open/floor/plating, /area/maintenance/aft) "lxO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43603,25 +43655,25 @@ /area/crew_quarters/fitness/recreation) "lyF" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/entry) "lyW" = ( /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "lyX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /obj/structure/lattice, @@ -43664,10 +43716,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/chair/stool/directional/south, @@ -43677,10 +43729,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/light/floor, @@ -43708,10 +43760,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "lzX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -43738,7 +43790,7 @@ dir = 4; pixel_x = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, @@ -43787,17 +43839,19 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "lCi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "lCt" = ( /obj/effect/turf_decal/tile/blue{ @@ -43819,8 +43873,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/secondary) @@ -43829,8 +43883,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43882,8 +43936,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "lEk" = ( @@ -43928,10 +43982,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -43971,10 +44022,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -43983,7 +44034,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/white/line, @@ -44000,11 +44051,13 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/maintenance/solars/port/aft) "lGH" = ( @@ -44014,6 +44067,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "lGS" = ( @@ -44024,8 +44080,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "lHe" = ( @@ -44076,10 +44132,10 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/checkpoint/customs) "lHV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -44120,8 +44176,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/construction/storage_wing) @@ -44133,8 +44189,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "lIZ" = ( @@ -44142,10 +44198,6 @@ dir = 8 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, /turf/open/floor/plating, /area/hallway/secondary/entry) "lJh" = ( @@ -44155,19 +44207,19 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "lJE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -44223,8 +44275,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/main) @@ -44246,10 +44298,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -44259,10 +44311,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -44278,10 +44330,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -44290,10 +44342,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -44305,10 +44357,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -44351,8 +44403,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/ai_upload) "lLz" = ( @@ -44382,18 +44434,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lMj" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/checker, @@ -44403,8 +44454,8 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -44419,8 +44470,8 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "lMs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -44435,10 +44486,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/siding/purple/corner{ @@ -44468,10 +44519,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -44483,10 +44534,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -44495,10 +44546,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "lNE" = ( @@ -44508,10 +44559,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -44535,8 +44586,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "lNW" = ( @@ -44554,9 +44605,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "lOo" = ( @@ -44582,10 +44630,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -44597,10 +44642,10 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -44618,15 +44663,15 @@ /area/maintenance/aft/secondary) "lPx" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "lPy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44680,7 +44725,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44695,10 +44740,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -44721,15 +44766,15 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "lRx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -44750,8 +44795,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "lSd" = ( @@ -44767,8 +44812,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "lSj" = ( @@ -44808,8 +44853,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/fore) "lSC" = ( @@ -44826,7 +44871,7 @@ /turf/open/floor/wood, /area/library) "lSE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/xeno_spawn, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44835,9 +44880,9 @@ /area/maintenance/department/science/xenobiology) "lSI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 + dir = 1 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron, /area/engine/atmos) "lST" = ( /obj/structure/table/glass, @@ -44880,8 +44925,8 @@ /area/security/brig) "lTz" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -44890,12 +44935,6 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "lTC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/chair, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -44925,10 +44964,10 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/fitness/recreation) "lTT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44961,10 +45000,10 @@ /turf/open/floor/plating, /area/science/nanite) "lUy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -44995,10 +45034,10 @@ /turf/open/floor/wood, /area/library) "lVH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -45025,9 +45064,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -45048,10 +45086,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -45064,11 +45102,11 @@ /turf/open/floor/iron, /area/engine/atmos) "lXT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -45087,10 +45125,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -45113,8 +45151,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "lYZ" = ( @@ -45122,10 +45160,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "lZw" = ( @@ -45135,9 +45173,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = 8 @@ -45150,8 +45188,8 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) "lZQ" = ( @@ -45164,8 +45202,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -45188,10 +45226,10 @@ /turf/open/floor/iron/white, /area/medical/surgery) "maI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green, @@ -45206,17 +45244,17 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/satellite) "mba" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/iron/dark/corner{ dir = 1 }, /area/engine/atmos) "mbZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45242,9 +45280,9 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark, /area/tcommsat/server) @@ -45264,7 +45302,7 @@ /turf/open/floor/iron/showroomfloor, /area/security/warden) "mcV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -45341,10 +45379,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -45421,10 +45459,10 @@ pixel_x = 16; pixel_y = -16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/siding/dark_blue{ @@ -45440,10 +45478,10 @@ /area/science/robotics/mechbay) "mhj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/siding/wood{ @@ -45490,8 +45528,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "mjk" = ( @@ -45504,10 +45542,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -45516,8 +45554,8 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mjq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -45527,7 +45565,7 @@ "mjF" = ( /obj/effect/landmark/start/medical_doctor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -45551,10 +45589,10 @@ /turf/closed/wall, /area/science/shuttledock) "mky" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/sign/poster/official/work_for_a_future{ @@ -45590,8 +45628,8 @@ dir = 4 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mla" = ( @@ -45628,8 +45666,8 @@ /area/hydroponics/garden) "mlO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -45641,8 +45679,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -45669,7 +45707,8 @@ /area/medical/virology) "mno" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -45678,10 +45717,10 @@ /area/hallway/secondary/exit/departure_lounge) "mny" = ( /obj/structure/window/reinforced, -/obj/machinery/computer/atmos_control/tank/air_tank{ +/obj/machinery/computer/atmos_control/air_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -45701,10 +45740,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -45753,13 +45792,13 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) "mpy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -45774,7 +45813,7 @@ /turf/open/floor/iron, /area/maintenance/aft) "mpE" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/button/door/incinerator_vent_toxmix{ pixel_x = 5; pixel_y = -25 @@ -45805,10 +45844,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -45818,8 +45857,8 @@ dir = 8; pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -45833,10 +45872,10 @@ /obj/structure/sign/departments/minsky/supply/mining{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -45852,8 +45891,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -45865,12 +45904,6 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -45917,8 +45950,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/office) "mrX" = ( @@ -45936,10 +45969,10 @@ /area/ai_monitored/security/armory) "msa" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/aisat) @@ -45949,8 +45982,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; name = "Isolation Shutters" @@ -46008,8 +46041,8 @@ /obj/structure/sign/departments/minsky/supply/janitorial{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) @@ -46029,13 +46062,11 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "mtr" = ( @@ -46060,10 +46091,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -46082,8 +46113,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -46108,10 +46139,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -46139,12 +46170,6 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "muG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -46158,10 +46183,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -46174,10 +46199,10 @@ /turf/closed/wall, /area/hallway/secondary/service) "mvo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -46207,10 +46232,10 @@ /turf/open/floor/engine, /area/engine/supermatter) "mww" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -46248,10 +46273,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -46260,8 +46285,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/security/warden) "mxH" = ( @@ -46277,10 +46302,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/smooth_large, @@ -46289,8 +46314,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -46308,10 +46333,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half, @@ -46336,7 +46361,7 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/white, @@ -46386,12 +46411,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit/departure_lounge) "mzt" = ( @@ -46399,10 +46418,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -46414,8 +46433,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -46425,9 +46444,9 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "mAd" = ( @@ -46485,8 +46504,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "mAL" = ( @@ -46499,10 +46516,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -46537,10 +46554,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -46574,7 +46591,7 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "mBY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -46585,12 +46602,6 @@ pixel_x = 32 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "mCE" = ( @@ -46619,6 +46630,12 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/prison, /area/security/prison) "mDc" = ( @@ -46680,10 +46697,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -46733,10 +46750,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -46796,10 +46813,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -46817,14 +46834,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "mEV" = ( @@ -46855,10 +46864,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "mFh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/chapel, @@ -46867,10 +46876,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -46883,8 +46892,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "mFD" = ( @@ -46901,10 +46910,10 @@ dir = 1; name = "Gas to Thermo" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/stripes/white/line{ @@ -46937,10 +46946,10 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, @@ -46952,10 +46961,10 @@ /area/maintenance/department/science/xenobiology) "mGb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -47008,10 +47017,10 @@ icon_state = "4-8" }, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -47060,10 +47069,10 @@ /turf/open/floor/iron, /area/science/shuttledock) "mIh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -47097,10 +47106,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -47120,7 +47129,7 @@ /turf/open/floor/iron/dark/smooth_corner, /area/security/checkpoint/supply) "mKs" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/light/small{ dir = 8 }, @@ -47141,9 +47150,6 @@ "mLh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -47178,10 +47184,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -47195,19 +47201,19 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/satellite) "mLB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -47247,19 +47253,19 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, /area/aisat) "mMC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47272,8 +47278,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -47342,8 +47348,8 @@ /turf/open/floor/iron, /area/hallway/primary/central) "mOh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -47404,10 +47410,10 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -47433,7 +47439,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "mPP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -47448,10 +47454,10 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -47467,10 +47473,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -47526,11 +47532,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron, /area/crew_quarters/locker) "mRK" = ( /obj/machinery/door/airlock/maintenance{ @@ -47538,16 +47550,16 @@ req_access_txt = "32" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) "mSe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard) "mSu" = ( @@ -47557,10 +47569,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -47580,10 +47592,10 @@ dir = 8 }, /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -47609,12 +47621,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/storage) "mUk" = ( @@ -47622,15 +47628,15 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "mUr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -47643,10 +47649,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "mVa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 4 }, /turf/open/floor/iron/dark, @@ -47671,10 +47677,10 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -47688,7 +47694,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -47761,8 +47767,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -47790,10 +47796,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -47802,8 +47808,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -47814,8 +47820,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -47839,8 +47845,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47854,13 +47860,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "mXD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47874,12 +47880,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -47888,6 +47888,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/maintenance/department/medical/central) "mXS" = ( @@ -47902,15 +47908,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "mYe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -47946,10 +47952,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -47989,10 +47995,10 @@ icon_state = "4-8" }, /obj/item/storage/fancy/donut_box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -48004,10 +48010,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -48069,17 +48075,15 @@ /turf/open/floor/wood, /area/lawoffice) "naS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/prison, +/area/security/prison) "naU" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "commissaryshutter"; - name = "Vacant Commissary Shutter" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -48087,8 +48091,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutter"; + name = "Vacant Commissary Shutter" }, /turf/open/floor/iron, /area/vacant_room/commissary) @@ -48096,19 +48102,16 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "nbF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/maintenance/aft) "ncc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -48116,10 +48119,10 @@ /area/engine/atmos) "ncI" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -48173,11 +48176,11 @@ /area/hallway/secondary/entry) "ndB" = ( /obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/delivery, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2, +/obj/effect/turf_decal/delivery/white, /turf/open/floor/iron, /area/crew_quarters/locker) "ndG" = ( @@ -48207,13 +48210,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/advanced_airlock_controller/directional/north, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/engine/break_room) "ned" = ( @@ -48223,8 +48219,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -48234,14 +48230,19 @@ /turf/open/floor/iron/white, /area/science/mixing) "neO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "neU" = ( @@ -48277,8 +48278,8 @@ /turf/open/floor/iron, /area/hallway/secondary/command) "nfg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/main) "nfo" = ( @@ -48294,10 +48295,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -48312,7 +48313,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/red/half{ dir = 8 @@ -48323,7 +48324,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -48342,8 +48343,8 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48356,10 +48357,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -48377,8 +48378,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -48387,8 +48388,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/locker) @@ -48419,10 +48420,12 @@ pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "niO" = ( @@ -48442,8 +48445,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -48456,8 +48459,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -48539,10 +48542,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -48568,12 +48571,23 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"nmd" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/solar{ + id = "aftstarboard"; + name = "Aft-Starboard Solar Array" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers, +/turf/open/floor/iron/solarpanel/airless, +/area/solar/starboard/aft) "nml" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -48595,26 +48609,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) "nnn" = ( /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "nnt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/smooth_large, /area/security/brig) "nnH" = ( @@ -48671,8 +48683,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ name = "Toxins Lab"; req_access_txt = "8" @@ -48711,7 +48723,8 @@ /area/maintenance/aft) "npg" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/structure/displaycase/trophy, /obj/effect/turf_decal/siding/wood{ @@ -48845,20 +48858,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/grille/broken, /turf/open/floor/iron, /area/maintenance/fore) "nsj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/engine{ @@ -48866,10 +48879,10 @@ }, /area/holodeck/rec_center) "nsp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/red, @@ -48909,8 +48922,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -48956,13 +48967,13 @@ req_access_txt = "null"; req_one_access_txt = "25;26;35;28;22;37;46;38" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "nuZ" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -48974,14 +48985,26 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/gateway) +"nvn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/security/brig) "nvp" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -49022,8 +49045,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -49033,7 +49056,7 @@ /obj/structure/table/wood, /obj/item/gavelblock, /obj/item/gavelhammer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -49051,11 +49074,11 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;4;5;39;6" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/aft) @@ -49072,10 +49095,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -49109,8 +49132,8 @@ home_destination = "QM #1"; suffix = "#1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "nyg" = ( @@ -49127,15 +49150,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/port) "nyw" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -49151,10 +49174,10 @@ /turf/open/floor/iron, /area/medical/break_room) "nzh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 6 }, /obj/machinery/meter, @@ -49172,10 +49195,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -49186,7 +49209,8 @@ icon_state = "1-2" }, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/machinery/modular_computer/console/preset/command, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -49210,10 +49234,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/siding/wood{ @@ -49225,10 +49249,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -49249,7 +49273,7 @@ /turf/open/floor/prison, /area/security/prison) "nAN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -49320,10 +49344,10 @@ /turf/open/floor/iron/dark, /area/science/shuttledock) "nCe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -49339,8 +49363,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/teleporter) "nCG" = ( @@ -49373,10 +49397,10 @@ /turf/open/floor/iron, /area/medical/medbay/aft) "nCY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/black/filled/line{ @@ -49394,10 +49418,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -49414,10 +49438,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -49430,10 +49454,10 @@ icon_state = "1-8" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -49443,10 +49467,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -49469,10 +49493,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/checker, @@ -49485,10 +49509,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -49502,8 +49526,8 @@ name = "Captain's Bedroom"; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -49517,8 +49541,8 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) @@ -49599,10 +49623,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner, @@ -49618,10 +49642,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -49658,18 +49682,18 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/teleporter) "nIU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -49699,8 +49723,6 @@ name = "Auxiliary Escape Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft/secondary) "nJy" = ( @@ -49743,7 +49765,7 @@ pixel_x = 8; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, /turf/open/floor/engine, @@ -49771,8 +49793,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark/corner{ dir = 1 @@ -49814,10 +49836,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron/dark/smooth_large, @@ -49829,8 +49848,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, @@ -49852,10 +49871,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -49867,10 +49886,10 @@ /obj/structure/sign/departments/minsky/security/security{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -49881,8 +49900,8 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "nMk" = ( @@ -49910,12 +49929,12 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -49928,10 +49947,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;4;5;6;29" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -49942,9 +49961,6 @@ "nNP" = ( /obj/structure/chair/office, /obj/effect/landmark/start/depsec/supply, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/smooth_large, /area/security/checkpoint/supply) "nNU" = ( @@ -49972,10 +49988,10 @@ /turf/open/floor/iron/dark, /area/chapel/office) "nOq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -50000,8 +50016,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50021,10 +50037,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -50033,7 +50049,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -50047,8 +50063,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "nPx" = ( @@ -50074,10 +50090,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -50086,8 +50102,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) @@ -50095,10 +50111,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -50110,11 +50126,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, /area/crew_quarters/locker) "nPW" = ( /obj/machinery/photocopier{ @@ -50129,10 +50153,10 @@ /obj/item/radio/intercom{ pixel_y = 20 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -50156,10 +50180,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -50192,10 +50216,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -50212,7 +50236,8 @@ /area/crew_quarters/theatre) "nSk" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -50232,10 +50257,10 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "nSr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -50248,10 +50273,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -50264,21 +50289,19 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "nSX" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) @@ -50288,7 +50311,7 @@ }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -50297,8 +50320,8 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -50308,10 +50331,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -50324,10 +50347,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/grille, @@ -50343,13 +50366,13 @@ /obj/machinery/status_display/evac{ pixel_y = 30 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4, +/obj/effect/turf_decal/delivery/red, /turf/open/floor/iron, /area/crew_quarters/locker) "nUa" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50360,8 +50383,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -50371,10 +50394,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -50384,10 +50403,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -50419,8 +50438,8 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "nVx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -50434,10 +50453,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -50461,10 +50480,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -50504,8 +50523,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "nXq" = ( @@ -50527,8 +50546,8 @@ /area/hallway/primary/port) "nXr" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -50586,8 +50605,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50614,8 +50633,8 @@ name = "MULEbot Access"; req_one_access_txt = "31;48" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "nZn" = ( @@ -50633,10 +50652,10 @@ /turf/open/floor/iron, /area/medical/genetics/cloning) "nZC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -50692,8 +50711,7 @@ c_tag = "Engineering - Transit Tube Access" }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/break_room) "obf" = ( @@ -50701,8 +50719,8 @@ /turf/open/floor/iron/white, /area/science/research) "obn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half, /turf/open/floor/iron/dark/smooth_half{ dir = 1 @@ -50760,10 +50778,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -50773,10 +50791,10 @@ /area/maintenance/department/medical/central) "ocu" = ( /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance{ @@ -50838,10 +50856,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -50862,22 +50880,25 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "odI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, @@ -50896,8 +50917,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/research{ name = "Research Break Room"; req_one_access_txt = "7;29" @@ -50916,7 +50937,7 @@ pixel_x = -3; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -50924,7 +50945,7 @@ "oeP" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/iron/dark/smooth_large, @@ -50934,10 +50955,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -50964,10 +50985,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -50985,11 +51006,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "ofV" = ( @@ -51017,8 +51039,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "ogw" = ( @@ -51034,10 +51056,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -51057,8 +51079,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "ogP" = ( @@ -51087,10 +51109,10 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science/xenobiology) "ohn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -51107,22 +51129,34 @@ /turf/open/floor/iron, /area/storage/primary) "oid" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"oin" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "oip" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -51134,10 +51168,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -51149,8 +51183,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -51163,10 +51197,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -51241,19 +51275,19 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "okn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -51292,8 +51326,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/medical_doctor, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -51301,7 +51335,7 @@ /turf/open/floor/iron, /area/medical/break_room) "okX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -51330,7 +51364,7 @@ /area/bridge/showroom/corporate) "olU" = ( /obj/effect/landmark/start/clown, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -51342,7 +51376,7 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -51361,10 +51395,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -51380,8 +51414,8 @@ /area/construction/mining/aux_base) "onc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -51392,8 +51426,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron{ dir = 1 }, @@ -51407,10 +51441,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -51444,10 +51478,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -51456,10 +51490,10 @@ /obj/structure/sign/departments/minsky/security/security{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -51474,10 +51508,10 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Thermo to Gas" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/stripes/white/line{ @@ -51507,8 +51541,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51519,10 +51553,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "opw" = ( @@ -51532,7 +51566,7 @@ /obj/machinery/camera/directional/west{ c_tag = "Engineering Supermatter Starboard" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, /area/engine/engineering) "opy" = ( @@ -51551,8 +51585,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -51568,10 +51602,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -51580,10 +51614,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -51593,10 +51627,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -51655,8 +51689,8 @@ /obj/effect/turf_decal/pool/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -51670,10 +51704,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -51688,10 +51722,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -51715,8 +51749,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51763,7 +51797,7 @@ icon_state = "4-8" }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -51788,8 +51822,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "bridge-right" @@ -51800,8 +51834,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "otF" = ( @@ -51824,8 +51858,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -51835,7 +51869,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "otT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -51847,10 +51881,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -51866,11 +51900,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "oue" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/carpet/green, /area/library) @@ -51896,18 +51930,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "ous" = ( /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -51958,24 +51992,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) "owr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -51992,8 +52024,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/warning, /turf/open/floor/iron/white, /area/science/research) @@ -52023,8 +52055,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "oxM" = ( @@ -52100,10 +52132,10 @@ name = "Toxins Launch Room"; req_access_txt = "8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -52128,8 +52160,8 @@ /obj/machinery/camera/directional/west{ c_tag = "Central Primary Hallway - Fore - Port Corner" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -52157,7 +52189,7 @@ }, /area/engine/storage_shared) "ozb" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron, @@ -52194,8 +52226,8 @@ /obj/item/radio/intercom{ pixel_x = -29 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -52218,10 +52250,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -52265,10 +52297,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -52277,8 +52309,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "oBd" = ( @@ -52300,10 +52332,10 @@ icon_state = "1-4" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -52328,8 +52360,8 @@ dir = 4 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half{ dir = 1 }, @@ -52360,18 +52392,18 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, /area/aisat) "oCs" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -52412,7 +52444,7 @@ pixel_x = 22; pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -52427,7 +52459,7 @@ /area/science/explab) "oDB" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -52452,8 +52484,8 @@ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; location = "10-Aft-To-Central" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -52465,7 +52497,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "oDZ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -52480,8 +52512,8 @@ /area/chapel/main) "oEm" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/white{ dir = 8 }, @@ -52522,10 +52554,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -52551,10 +52583,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -52582,10 +52614,10 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "oFV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/landmark/start/medical_doctor, @@ -52606,7 +52638,8 @@ }, /obj/structure/table/wood, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /turf/open/floor/carpet/grimy, /area/chapel/office) @@ -52628,18 +52661,18 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "oHv" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/light/small{ @@ -52657,19 +52690,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "oHJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -52690,10 +52723,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -52738,10 +52771,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52808,10 +52841,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -52820,7 +52853,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "oJH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -52836,10 +52869,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/dorms) "oKd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52869,10 +52902,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -52930,11 +52963,14 @@ /turf/open/floor/iron, /area/science/robotics/lab) "oKU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/smooth_large, -/area/security/brig) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "oLr" = ( /obj/structure/window/reinforced{ dir = 4 @@ -52946,8 +52982,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "oLA" = ( @@ -53009,11 +53045,8 @@ /area/ai_monitored/turret_protected/ai) "oMR" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -53054,8 +53087,8 @@ /turf/open/floor/carpet/grimy, /area/security/detectives_office) "oNf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -53065,7 +53098,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -53105,7 +53138,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) "oPY" = ( @@ -53128,10 +53161,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -53147,8 +53180,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) @@ -53160,10 +53193,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -53172,13 +53205,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "oRB" = ( /obj/structure/cable/yellow{ @@ -53206,8 +53241,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) "oRL" = ( @@ -53282,10 +53317,10 @@ /obj/structure/disposalpipe/sorting/mail{ sortType = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "oSU" = ( @@ -53298,27 +53333,23 @@ /turf/open/floor/iron/white, /area/science/explab) "oTf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "oTr" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/arrivals_external{ - name = "Arrivals Airlock" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/hallway/secondary/entry) +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "oTw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/prison, @@ -53328,10 +53359,10 @@ dir = 8 }, /obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -53351,8 +53382,8 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -53366,8 +53397,8 @@ /turf/open/floor/iron/dark, /area/chapel/office) "oUJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "oUK" = ( @@ -53389,8 +53420,8 @@ name = "Research Maintenance"; req_access_txt = "47" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "oUR" = ( @@ -53412,10 +53443,10 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -53454,10 +53485,9 @@ /area/security/brig) "oVH" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "oVL" = ( @@ -53474,10 +53504,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -53537,10 +53567,10 @@ /turf/open/floor/iron, /area/hydroponics/garden) "oYz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red{ @@ -53598,10 +53628,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 29 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -53615,10 +53645,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -53684,7 +53714,7 @@ /area/hallway/secondary/exit/departure_lounge) "pch" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/trimline/black/filled/line{ @@ -53697,7 +53727,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -53722,7 +53752,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -53768,8 +53798,8 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) @@ -53837,25 +53867,33 @@ codes_txt = "patrol;next_patrol=13.2-Tcommstore"; location = "13.1-Engineering-Enter" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "phc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/hallway/primary/port) "phd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "phq" = ( @@ -53881,7 +53919,7 @@ "phB" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -53915,10 +53953,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -53932,7 +53970,6 @@ req_access_txt = "2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, @@ -53946,10 +53983,10 @@ /turf/open/floor/iron/dark, /area/science/server) "pkf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -53967,6 +54004,11 @@ }, /turf/open/floor/carpet/grimy, /area/chapel/office) +"pkn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet/green, +/area/library) "pks" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -53974,10 +54016,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -53996,7 +54038,7 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "pkX" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -54005,10 +54047,8 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science/xenobiology) "pli" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "plk" = ( @@ -54051,10 +54091,10 @@ dir = 1; name = "manual outlet valve" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -54073,22 +54113,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "pmt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -54131,8 +54171,8 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -54146,10 +54186,10 @@ name = "Command Desk"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -54186,7 +54226,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/kirbyplants/random, @@ -54204,16 +54244,16 @@ }, /obj/structure/table/wood/poker, /obj/item/storage/pill_bottle/dice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/wood, /area/crew_quarters/bar) "poA" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input{ dir = 1 }, /obj/machinery/sparker/toxmix{ @@ -54228,26 +54268,26 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "ppx" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/command) "ppy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/grille, @@ -54294,10 +54334,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -54314,14 +54354,14 @@ /turf/open/floor/wood, /area/lawoffice) "pqR" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "pqW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54385,8 +54425,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/mechbay) "psa" = ( @@ -54394,8 +54434,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -54407,7 +54447,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -54419,15 +54462,17 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "pst" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "psw" = ( /obj/structure/chair{ @@ -54456,10 +54501,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -54471,10 +54516,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -54499,8 +54544,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "ptk" = ( @@ -54563,15 +54608,13 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "puB" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/maintenance/aft) "puK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /obj/machinery/light{ dir = 4; @@ -54618,10 +54661,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -54652,8 +54695,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/security/detectives_office) "pww" = ( @@ -54663,10 +54706,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -54686,10 +54729,10 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "pxo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -54705,25 +54748,19 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "pyl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/gulag_item_reclaimer{ pixel_y = 24 }, /obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, @@ -54753,10 +54790,10 @@ /turf/open/floor/carpet, /area/crew_quarters/bar) "pyV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -54766,15 +54803,15 @@ /area/science/shuttledock) "pze" = ( /obj/structure/rack, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/loot_jobscale/armoury/disabler, /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) "pzn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54791,8 +54828,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -54819,8 +54856,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -54839,22 +54876,22 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/aft) "pAm" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Unfiltered & Air to Mix" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) "pAF" = ( @@ -54897,8 +54934,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) @@ -54924,9 +54961,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/effect/turf_decal/siding/white{ dir = 8 }, @@ -54937,10 +54971,10 @@ icon_state = "1-4" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -54955,10 +54989,10 @@ /area/ai_monitored/security/armory) "pDo" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -55015,10 +55049,10 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment, @@ -55029,8 +55063,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/storage/tcom) "pEJ" = ( @@ -55073,10 +55107,10 @@ /turf/open/floor/iron, /area/medical/chemistry) "pFn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 6 }, /turf/open/floor/iron, @@ -55104,8 +55138,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -55119,19 +55153,17 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/hallway/primary/port) "pGB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -55166,16 +55198,16 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "pHM" = ( /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -55185,10 +55217,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -55233,7 +55265,7 @@ /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/crew_quarters/theatre) "pIT" = ( @@ -55252,8 +55284,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard) "pJd" = ( @@ -55277,10 +55309,12 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "pJB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "pKq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -55312,10 +55346,10 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -55327,10 +55361,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -55360,8 +55394,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "pMu" = ( @@ -55378,10 +55412,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -55390,10 +55424,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -55404,8 +55438,15 @@ "pNj" = ( /obj/structure/rack, /obj/item/stock_parts/matter_bin, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"pNk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "pNs" = ( @@ -55413,10 +55454,10 @@ /turf/closed/wall, /area/maintenance/aft) "pNt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -55488,10 +55529,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -55523,10 +55564,10 @@ /area/bridge) "pOX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -55535,15 +55576,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "pPd" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/library) "pPq" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -55566,10 +55602,10 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "pPY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -55590,8 +55626,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "pQH" = ( @@ -55615,8 +55651,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "pRd" = ( @@ -55641,7 +55677,7 @@ /area/science/xenobiology) "pRP" = ( /obj/structure/chair/fancy/bench/pew/right, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/chapel, @@ -55707,10 +55743,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -55750,18 +55786,18 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/engineering) "pSV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -55773,7 +55809,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/aft/secondary) "pTP" = ( @@ -55781,10 +55816,6 @@ dir = 8 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -55792,20 +55823,18 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/medical/central) "pTW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) "pUh" = ( @@ -55822,10 +55851,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -55859,10 +55888,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/checker, @@ -55883,10 +55912,10 @@ /turf/open/floor/iron/dark, /area/medical/surgery) "pVv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -55923,15 +55952,15 @@ name = "Port Bow Solar Access"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "pVN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -55950,10 +55979,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark/smooth_large, @@ -55973,8 +56002,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/ai_upload) "pWx" = ( @@ -56011,8 +56040,8 @@ }, /area/security/checkpoint/engineering) "pXl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -56074,8 +56103,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -56105,10 +56134,10 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science/xenobiology) "pYw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -56129,7 +56158,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -56150,10 +56179,10 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -56181,9 +56210,8 @@ /turf/open/floor/plating, /area/security/prison) "pZF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/airalarm/directional/east, /turf/open/floor/prison, /area/security/prison) "pZO" = ( @@ -56194,6 +56222,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "pZT" = ( @@ -56254,12 +56285,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/hallway/secondary/entry) "qaG" = ( @@ -56269,10 +56294,10 @@ /turf/open/floor/engine/n2, /area/engine/atmos) "qbq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56329,10 +56354,10 @@ /turf/open/floor/plating, /area/maintenance/department/medical/central) "qcn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -56349,8 +56374,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -56359,20 +56384,14 @@ "qcu" = ( /obj/machinery/holopad, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "qcY" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "qda" = ( @@ -56415,8 +56434,8 @@ icon_state = "4-8" }, /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) @@ -56437,16 +56456,13 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/maintenance/solars/starboard/fore) "qeb" = ( /obj/effect/turf_decal/pool{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -56456,7 +56472,7 @@ "qel" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56485,10 +56501,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -56544,9 +56560,8 @@ /turf/open/floor/iron, /area/maintenance/department/science) "qfx" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/service, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/storage/tech) "qfF" = ( @@ -56557,10 +56572,10 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -56570,10 +56585,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -56598,8 +56613,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "qgx" = ( @@ -56617,7 +56632,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -56643,10 +56658,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -56666,10 +56681,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -56691,10 +56706,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -56717,10 +56732,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -56738,8 +56753,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/lab) "qjk" = ( @@ -56768,14 +56783,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "qkj" = ( @@ -56799,10 +56806,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -56829,12 +56836,12 @@ /obj/machinery/camera/directional/west{ c_tag = "Starboard Primary Hallway - Atmospherics" }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -56843,10 +56850,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, @@ -56871,14 +56878,14 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "qlu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 }, -/turf/open/floor/iron/smooth_large, -/area/security/brig) +/area/security/main) "qlB" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/cable/yellow{ @@ -56893,20 +56900,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "qlX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "qmc" = ( @@ -56930,8 +56937,8 @@ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) @@ -56942,10 +56949,10 @@ /obj/machinery/camera/directional/north{ c_tag = "Port Primary Hallway - Middle" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -56997,14 +57004,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "qom" = ( @@ -57025,20 +57032,19 @@ /turf/open/floor/iron, /area/storage/tools) "qoZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/machinery/door/airlock/command/glass{ name = "Server Access"; req_one_access_txt = "30;70" }, -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/server) "qpd" = ( @@ -57053,16 +57059,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/crew_quarters/dorms) "qpw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "qpE" = ( /obj/structure/table, @@ -57081,8 +57089,8 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "qqe" = ( @@ -57106,10 +57114,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/showroomfloor, @@ -57124,11 +57132,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/fore) "qrx" = ( @@ -57168,15 +57173,15 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "qtt" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -57188,10 +57193,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -57208,10 +57213,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -57223,10 +57228,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -57245,8 +57250,8 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/brig) "qua" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -57260,14 +57265,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/lab) "qum" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -57278,7 +57283,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -57328,8 +57333,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/smooth_large, @@ -57378,10 +57383,10 @@ sortType = 4 }, /obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -57405,10 +57410,10 @@ /obj/machinery/firealarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -57437,13 +57442,13 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/office) "qxE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -57461,10 +57466,10 @@ /obj/item/kirbyplants{ icon_state = "plant-03" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -57476,14 +57481,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/secondary) "qzm" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/floor/plating, @@ -57507,8 +57512,8 @@ "qzT" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "qzY" = ( @@ -57528,8 +57533,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron{ dir = 1 }, @@ -57562,10 +57567,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -57574,7 +57579,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "qAz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -57587,10 +57592,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -57624,8 +57629,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) @@ -57689,7 +57694,6 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/solars/starboard/aft) @@ -57700,8 +57704,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "qCp" = ( @@ -57736,7 +57740,7 @@ /obj/item/paper/fluff/jobs/medical{ pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -57755,10 +57759,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -57771,15 +57775,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "qDP" = ( @@ -57797,13 +57792,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "qEw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron, /area/engine/atmos) "qEx" = ( /obj/effect/turf_decal/siding/wood{ @@ -57820,10 +57812,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -57880,10 +57872,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -57947,7 +57939,7 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "qGT" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "qHf" = ( @@ -57981,10 +57973,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -58006,8 +57998,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "qIi" = ( @@ -58017,10 +58009,10 @@ /obj/machinery/camera/directional/north{ c_tag = "Research Division Hallway - Central" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -58029,8 +58021,8 @@ /turf/open/floor/iron/white, /area/science/research) "qIv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -58056,10 +58048,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -58068,9 +58060,9 @@ /turf/open/floor/iron/dark, /area/medical/patients_rooms) "qJb" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/meter, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_y = -24 }, /obj/structure/cable/yellow{ @@ -58086,13 +58078,18 @@ /turf/open/floor/iron/white, /area/medical/surgery) "qJQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "qKa" = ( /obj/effect/turf_decal/siding/white/corner, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "qKb" = ( @@ -58102,10 +58099,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -58114,7 +58111,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -58138,7 +58135,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -58147,7 +58144,7 @@ /turf/open/floor/engine, /area/engine/engineering) "qLa" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/meter, /turf/open/floor/plating, /area/maintenance/starboard) @@ -58235,10 +58232,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -58269,8 +58266,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "qNF" = ( @@ -58315,10 +58312,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L7" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -58330,10 +58327,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -58377,10 +58374,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/cafeteria{ @@ -58446,10 +58443,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "qQL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -58510,17 +58507,14 @@ /turf/open/floor/iron, /area/maintenance/fore) "qSB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/maintenance/aft) "qSF" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -58528,8 +58522,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -58555,10 +58549,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -58570,8 +58564,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "qTf" = ( @@ -58585,13 +58579,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -58602,8 +58596,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58617,10 +58611,10 @@ dir = 4; sortType = 29 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral{ @@ -58657,7 +58651,7 @@ "qUm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/item/restraints/legcuffs/beartrap, @@ -58667,15 +58661,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics) "qUA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -58690,10 +58684,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/stripes/white/line{ @@ -58712,8 +58706,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "qVh" = ( @@ -58730,8 +58724,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -58813,8 +58807,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -58846,12 +58840,13 @@ /obj/machinery/firealarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, /area/engine/engineering) "qYn" = ( @@ -58867,10 +58862,10 @@ /turf/open/floor/iron/dark/textured, /area/ai_monitored/security/armory) "qYC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark{ dir = 8 }, @@ -58893,10 +58888,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -58912,10 +58907,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -58943,8 +58938,8 @@ /obj/machinery/camera/directional/east{ c_tag = "Arrivals - Aft Arm" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -58957,10 +58952,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -58970,10 +58965,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -58986,10 +58981,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red/anticorner{ @@ -59004,10 +58999,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -59018,8 +59013,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -59030,7 +59025,7 @@ /turf/closed/wall, /area/medical/break_room) "qZL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -59052,10 +59047,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -59069,8 +59064,8 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "qZY" = ( @@ -59080,8 +59075,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -59118,10 +59113,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -59165,8 +59160,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -59204,6 +59199,16 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"rco" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "rcv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59214,10 +59219,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -59239,8 +59244,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rcW" = ( @@ -59250,10 +59255,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron, /area/hydroponics) @@ -59267,10 +59272,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -59282,8 +59287,8 @@ /obj/machinery/camera/directional/west{ c_tag = "Dormitories - Aft" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -59307,10 +59312,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59344,10 +59349,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -59360,7 +59365,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/power/apc/auto_name/directional/south, @@ -59415,9 +59420,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/secondary) @@ -59506,10 +59511,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -59535,7 +59540,7 @@ dir = 1; name = "Air to Pure" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -59553,10 +59558,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -59637,8 +59642,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/secondary) "rot" = ( @@ -59646,10 +59651,10 @@ name = "Secure Tech Storage"; req_access_txt = "19;23" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59666,7 +59671,7 @@ req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rpu" = ( @@ -59683,7 +59688,8 @@ /area/security/brig) "rpG" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -59705,10 +59711,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -59727,7 +59733,10 @@ /obj/structure/reflector/box/anchored{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "rrm" = ( @@ -59742,7 +59751,7 @@ /turf/open/floor/iron, /area/medical/surgery) "rrx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -59760,12 +59769,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "rrO" = ( @@ -59839,13 +59842,11 @@ /turf/open/floor/iron/dark, /area/security/brig) "rrW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "rsn" = ( @@ -59857,13 +59858,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/prison, /area/security/prison) "rsF" = ( @@ -59873,10 +59870,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -59891,10 +59888,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -59906,8 +59903,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "rto" = ( @@ -59923,8 +59920,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -59957,19 +59954,19 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) "ruL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -59999,10 +59996,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -60045,7 +60042,10 @@ "rvR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/rnd/server, -/turf/open/floor/circuit/telecomms/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/floor/circuit, /area/science/server) "rvY" = ( /obj/machinery/firealarm{ @@ -60073,11 +60073,11 @@ /area/solar/starboard/aft) "rwn" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -60105,10 +60105,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -60147,8 +60147,8 @@ icon_state = "1-2" }, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -60247,10 +60247,10 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/execution/education) "rBi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -60265,7 +60265,7 @@ /turf/open/floor/iron/dark, /area/science/server) "rBE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60294,13 +60294,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) "rCU" = ( @@ -60308,13 +60305,10 @@ /obj/machinery/camera/directional/south{ c_tag = "MiniSat Exterior - Space Access" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/aisat) "rDe" = ( @@ -60329,8 +60323,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -60360,7 +60354,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating, @@ -60378,15 +60372,15 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "rDY" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/closed/wall, /area/maintenance/disposal/incinerator) "rEg" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -60414,10 +60408,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -60452,10 +60446,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -60472,8 +60466,8 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -60492,10 +60486,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -60505,7 +60499,7 @@ /turf/open/floor/plating, /area/crew_quarters/toilet/auxiliary) "rFh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -60612,12 +60606,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "rHz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -60637,6 +60631,9 @@ }, /obj/machinery/light/small, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/brig) "rId" = ( @@ -60675,10 +60672,10 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "rIV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -60727,10 +60724,10 @@ /area/hallway/primary/central) "rJs" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60747,10 +60744,10 @@ }, /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "rKA" = ( @@ -60775,10 +60772,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -60791,10 +60788,10 @@ icon_state = "1-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -60834,10 +60831,10 @@ /turf/open/floor/iron, /area/maintenance/solars/port/fore) "rMC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -60846,10 +60843,10 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/brig) "rMU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half{ @@ -60873,8 +60870,8 @@ /turf/open/floor/iron, /area/maintenance/port) "rNv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -60891,10 +60888,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "rOa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -60931,10 +60928,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -60949,10 +60946,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -60961,6 +60958,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "rPC" = ( @@ -61012,18 +61012,18 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "rPW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -61054,10 +61054,10 @@ /turf/open/floor/iron/dark, /area/security/main) "rQw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -61114,10 +61114,10 @@ }, /area/security/checkpoint/engineering) "rRr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -61138,8 +61138,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -61151,8 +61151,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner{ dir = 4 }, @@ -61165,10 +61165,10 @@ /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "rRN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/stripes/line, @@ -61179,10 +61179,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/purple{ @@ -61196,7 +61196,9 @@ /area/maintenance/aft) "rSp" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "rSy" = ( /obj/structure/chair, @@ -61211,8 +61213,8 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;22;25;37;38;46" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "rSC" = ( @@ -61223,8 +61225,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "rSE" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -61248,10 +61250,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -61296,7 +61298,8 @@ /obj/machinery/door/airlock{ name = "Unisex Showers" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) "rUa" = ( @@ -61306,10 +61309,10 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -61318,10 +61321,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -61349,10 +61352,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -61371,10 +61374,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -61388,10 +61391,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, @@ -61408,10 +61407,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -61438,16 +61437,16 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "rWc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -61456,17 +61455,17 @@ /turf/open/floor/iron, /area/hallway/primary/port) "rWf" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /turf/open/floor/iron/dark/smooth_half, /area/security/execution/education) "rWA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -61490,10 +61489,10 @@ /obj/structure/chair/fancy/comfy{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/royalblue, @@ -61507,7 +61506,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/curtain, @@ -61518,23 +61517,13 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/starboard) "rWS" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -61551,7 +61540,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "rXW" = ( /obj/machinery/door/airlock/maintenance{ @@ -61561,10 +61552,6 @@ /turf/open/floor/plating, /area/maintenance/aft) "rYg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -61574,10 +61561,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L6" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -61606,7 +61593,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "rYM" = ( @@ -61622,8 +61609,8 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/central) "rZd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -61649,8 +61636,8 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "1;4;38;12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) "rZU" = ( @@ -61678,16 +61665,19 @@ /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "sah" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -61698,10 +61688,10 @@ /turf/open/floor/iron, /area/engine/storage_shared) "saq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/landmark/start/medical_doctor, @@ -61714,8 +61704,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -61731,10 +61721,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -61747,8 +61737,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "sbP" = ( @@ -61785,7 +61775,7 @@ opened = 1 }, /obj/item/wrench, -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron/dark/smooth_large, /area/security/execution/education) "sbY" = ( @@ -61822,10 +61812,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -61868,10 +61858,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -61880,8 +61870,8 @@ /turf/open/floor/iron, /area/hydroponics) "sdR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/dark_blue/corner{ @@ -61952,10 +61942,10 @@ /turf/open/floor/iron/dark, /area/science/shuttledock) "seA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -61967,10 +61957,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -62002,8 +61992,8 @@ "sfq" = ( /obj/machinery/holopad, /obj/effect/landmark/start/cyborg, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "sfE" = ( @@ -62014,8 +62004,8 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "sfY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -62037,18 +62027,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/hydroponics/garden) "sgA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/royalblue, @@ -62080,8 +62070,8 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -62103,10 +62093,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -62123,8 +62113,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "sig" = ( @@ -62141,10 +62131,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -62168,8 +62158,8 @@ /obj/effect/turf_decal/plaque{ icon_state = "L8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -62187,8 +62177,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -62207,10 +62197,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -62283,15 +62273,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) -"slv" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/exit/departure_lounge) "slA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62299,10 +62280,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -62315,7 +62296,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -62324,8 +62305,8 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "smt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/primary) "smE" = ( @@ -62342,8 +62323,8 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "smP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -62478,21 +62459,21 @@ /area/crew_quarters/heads/chief) "sps" = ( /obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, /area/hallway/primary/starboard) "spG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -62523,10 +62504,10 @@ /obj/item/radio/intercom{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood/big, @@ -62550,10 +62531,10 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -62585,13 +62566,13 @@ icon_state = "4-8" }, /obj/structure/transit_tube/crossing/horizontal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space, /area/space/nearstation) "srf" = ( @@ -62609,8 +62590,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "srT" = ( @@ -62653,10 +62634,10 @@ dir = 8; sortType = 12 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -62699,8 +62680,8 @@ /turf/open/floor/engine, /area/science/mixing/chamber) "ssz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -62713,8 +62694,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -62732,15 +62715,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -62766,28 +62749,24 @@ /area/medical/virology) "stH" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "stJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/prison, -/area/security/prison) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "stW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "stY" = ( @@ -62800,8 +62779,8 @@ /obj/structure/disposalpipe/sorting/mail{ sortType = 30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/fore) "sux" = ( @@ -62819,17 +62798,24 @@ /turf/open/floor/iron/dark/corner, /area/engine/storage_shared) "suL" = ( -/obj/structure/chair/stool{ - pixel_y = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/locker) "suQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62861,21 +62847,21 @@ /turf/open/floor/iron, /area/security/courtroom) "svQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 - }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/obj/machinery/airalarm/server{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/server) "svU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "svW" = ( @@ -62906,22 +62892,13 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "sxb" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 27 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/security/brig) @@ -62930,6 +62907,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) "sxv" = ( @@ -62937,11 +62916,11 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/aft) @@ -62995,7 +62974,7 @@ /area/science/shuttledock) "syj" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron, @@ -63067,10 +63046,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -63093,8 +63072,8 @@ /turf/open/floor/iron, /area/crew_quarters/bar) "szO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63151,10 +63130,10 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction/flip, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -63180,8 +63159,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -63224,20 +63203,21 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "sCw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, /area/engine/engineering) "sDp" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/radio/intercom{ pixel_x = -28; pixel_y = -4 @@ -63261,8 +63241,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard) "sEf" = ( @@ -63307,8 +63287,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) "sFE" = ( @@ -63359,10 +63339,10 @@ codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers"; location = "14.5-Recreation" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -63374,10 +63354,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -63388,18 +63368,20 @@ pixel_y = -3 }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/vacant_room/office) "sHl" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "sHt" = ( /obj/machinery/light/small, @@ -63424,18 +63406,18 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth_large, /area/security/prison) "sIi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -63454,8 +63436,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -63475,8 +63457,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "sJb" = ( @@ -63492,8 +63474,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/ai_monitored/storage/eva) "sJd" = ( @@ -63511,8 +63493,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "SCI-Entrance" }, @@ -63526,6 +63508,8 @@ codes_txt = "patrol;next_patrol=13.3-Engineering-Enter-corner"; location = "13.2-Tcommstore" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "sJM" = ( @@ -63580,10 +63564,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark/smooth_large, @@ -63596,10 +63580,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "sKS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -63611,10 +63595,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/light_switch{ @@ -63626,16 +63610,18 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "sLD" = ( /obj/structure/sink{ @@ -63645,16 +63631,16 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hydroponics) "sLY" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -63705,10 +63691,10 @@ pixel_y = 32 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/closet, @@ -63716,7 +63702,7 @@ /turf/open/floor/plating, /area/maintenance/port) "sNl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -63732,18 +63718,18 @@ pixel_y = -24; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/dark, /area/bridge) "sNv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -63769,8 +63755,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) @@ -63781,10 +63767,10 @@ /obj/structure/chair/fancy/comfy{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/royalblue, @@ -63793,8 +63779,8 @@ /obj/effect/turf_decal/pool{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -63826,10 +63812,10 @@ /turf/open/floor/iron, /area/storage/primary) "sQi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/item/kirbyplants/random, @@ -63866,10 +63852,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -63881,8 +63867,8 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;48;50;1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "sRo" = ( @@ -63913,12 +63899,12 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "sRD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/dark_blue{ @@ -63930,12 +63916,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "sSn" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" @@ -63945,8 +63931,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "sSp" = ( @@ -63963,7 +63949,7 @@ /turf/open/floor/carpet/grimy, /area/tcommsat/computer) "sSr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -63993,10 +63979,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -64008,7 +63994,8 @@ /area/security/main) "sSS" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/machinery/power/apc{ areastring = "/area/crew_quarters/kitchen"; @@ -64026,10 +64013,10 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "sST" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -64051,8 +64038,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -64078,10 +64065,10 @@ /area/ai_monitored/turret_protected/ai) "sUv" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -64112,10 +64099,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -64128,10 +64115,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/dormitories/flip{ @@ -64139,6 +64126,16 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"sVh" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/prison, +/area/security/prison) "sVu" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -64178,8 +64175,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "sVU" = ( @@ -64205,6 +64202,18 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark/smooth_half, /area/security/checkpoint/medical) +"sWw" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "sWU" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -64228,16 +64237,16 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/crew_quarters/dorms) "sYg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -64260,8 +64269,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -64281,8 +64290,8 @@ /turf/open/floor/iron/dark/smooth_corner, /area/security/main) "sYS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, @@ -64309,8 +64318,8 @@ pixel_x = -24 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/anticorner{ dir = 8 }, @@ -64349,19 +64358,19 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "taC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, /area/bridge) "taH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -64388,8 +64397,8 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) "tbt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -64407,10 +64416,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -64430,12 +64439,6 @@ pixel_x = -32 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "tdh" = ( @@ -64466,7 +64469,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -64484,13 +64487,26 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) +"teP" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start/security_officer, +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/security/main) "tfc" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "tfu" = ( @@ -64503,10 +64519,10 @@ /obj/machinery/camera/directional/south{ c_tag = "Central Primary Hallway - Aft-Port Corner" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -64519,10 +64535,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -64534,10 +64550,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating, @@ -64552,6 +64568,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "tfQ" = ( @@ -64564,10 +64583,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;50" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -64618,10 +64637,10 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "tgi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -64650,8 +64669,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -64684,14 +64703,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "thO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + dir = 1 }, /turf/open/floor/iron, /area/vacant_room/commissary) @@ -64717,10 +64736,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -64776,10 +64795,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -64795,9 +64814,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "tjA" = ( @@ -64816,10 +64832,10 @@ /turf/open/floor/iron, /area/medical/genetics) "tjD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/window/brigdoor/security/cell/westleft{ @@ -64854,10 +64870,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -64870,8 +64886,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tkg" = ( @@ -64882,10 +64898,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -64908,10 +64924,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -64948,29 +64964,29 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/science/nanite) "tlg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/prison, /area/security/prison) "tlj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white/corner, @@ -65008,10 +65024,10 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "tmK" = ( @@ -65046,10 +65062,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -65082,15 +65098,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/storage) "tnk" = ( @@ -65161,7 +65168,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/effect/turf_decal/tile/yellow{ @@ -65221,13 +65228,12 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "toY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -65238,8 +65244,8 @@ /turf/open/floor/iron, /area/science/robotics/mechbay) "tpl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "tpo" = ( @@ -65262,8 +65268,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "tpz" = ( @@ -65303,15 +65309,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "tqB" = ( @@ -65344,8 +65346,7 @@ dir = 4 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "tqQ" = ( @@ -65369,7 +65370,7 @@ /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "trq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -65417,9 +65418,19 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/security/prison) +"trQ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/prison, +/area/security/prison) "trY" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 1 + dir = 1; + hide = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 10 @@ -65448,8 +65459,8 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -65497,8 +65508,8 @@ /turf/open/floor/holofloor/plating, /area/holodeck/prison) "ttR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -65572,12 +65583,15 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "tvA" = ( @@ -65585,12 +65599,6 @@ pixel_y = 8 }, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -65600,8 +65608,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "twm" = ( @@ -65630,8 +65638,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "twB" = ( @@ -65652,13 +65660,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "twM" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/iron/tech/grid, -/area/security/main) +/turf/open/floor/iron, +/area/hallway/primary/starboard) "twN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65666,10 +65676,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "7;47;29;12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -65684,10 +65694,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;5;39;37;25;28" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -65697,10 +65707,10 @@ id_tag = "Cabin2"; name = "Cabin 4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -65722,10 +65732,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/space, @@ -65761,10 +65771,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/yellow/corner{ @@ -65773,15 +65783,12 @@ /turf/open/floor/iron, /area/engine/break_room) "tyL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/smooth_large, /area/security/brig) "tyV" = ( @@ -65809,8 +65816,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -65832,10 +65839,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -65869,10 +65876,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -65900,13 +65907,15 @@ /turf/open/floor/iron, /area/hydroponics) "tBl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "tBm" = ( /obj/effect/turf_decal/stripes/line{ @@ -65922,17 +65931,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "tBM" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /turf/open/floor/iron, /area/medical/patients_rooms) "tCy" = ( @@ -66040,8 +66049,8 @@ dir = 4; pixel_x = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, @@ -66109,10 +66118,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -66147,10 +66156,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -66173,7 +66182,8 @@ pixel_y = 30 }, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /turf/open/floor/iron/dark/smooth_corner, /area/security/checkpoint/engineering) @@ -66184,10 +66194,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral{ @@ -66224,8 +66234,8 @@ req_one_access_txt = "12;35;47;49" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "tHv" = ( @@ -66256,18 +66266,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "tIh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance{ @@ -66279,15 +66289,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "tIU" = ( @@ -66297,10 +66305,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ @@ -66323,16 +66331,16 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "tJj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/carpet/green, /area/library) @@ -66360,10 +66368,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/sign/warning/biohazard{ @@ -66391,10 +66399,10 @@ /turf/open/floor/engine, /area/engine/supermatter) "tLn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/smooth_large, @@ -66406,15 +66414,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "tLX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -66484,10 +66491,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner, @@ -66517,8 +66524,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ @@ -66541,8 +66548,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -66552,8 +66559,8 @@ /turf/open/floor/catwalk_floor/iron, /area/science/storage) "tND" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -66582,10 +66589,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -66641,8 +66645,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/security/main) "tOZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) "tPc" = ( @@ -66660,11 +66664,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -66679,7 +66683,7 @@ /obj/machinery/camera/directional/east{ c_tag = "Incinerator" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 10 }, /turf/open/floor/iron/dark/smooth_large, @@ -66700,8 +66704,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -66711,10 +66715,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -66727,7 +66731,7 @@ /turf/open/floor/iron/techmaint, /area/science/shuttledock) "tQy" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron, /area/medical/patients_rooms) "tQB" = ( @@ -66749,8 +66753,8 @@ /area/library) "tQT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -66765,10 +66769,10 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/delivery, @@ -66781,10 +66785,10 @@ /turf/open/floor/iron, /area/medical/break_room) "tRU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -66793,16 +66797,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/aft) "tSk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/chapel{ @@ -66816,10 +66820,10 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "tSN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66828,10 +66832,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "tTe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -66840,7 +66844,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -66852,10 +66856,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L11" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -66901,10 +66905,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -66938,10 +66942,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/siding/wood{ @@ -66959,8 +66963,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard/fore) "tUP" = ( @@ -67001,8 +67005,8 @@ pixel_x = -32 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "tVW" = ( @@ -67042,10 +67046,10 @@ id_tag = "Cabin3"; name = "Cabin 6" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -67064,10 +67068,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -67079,10 +67083,6 @@ /obj/machinery/camera/directional/west{ c_tag = "Telecomms - Server Room - Aft-Port" }, -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -28 - }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) "tXE" = ( @@ -67096,10 +67096,10 @@ /area/crew_quarters/heads/cmo) "tYe" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -67112,10 +67112,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -67124,10 +67124,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -67199,10 +67199,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -67218,10 +67218,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -67234,10 +67234,10 @@ c_tag = "Cargo Bay - Aft" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -67253,8 +67253,8 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "ubB" = ( @@ -67285,8 +67285,8 @@ /turf/open/floor/iron/techmaint, /area/security/main) "ubQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67297,21 +67297,15 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, /area/aisat) "ucb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/chair, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -67324,7 +67318,7 @@ /area/security/brig) "uck" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -67336,7 +67330,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, @@ -67357,8 +67351,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/dark{ dir = 8 }, @@ -67405,10 +67399,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -67423,10 +67417,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -67443,7 +67437,7 @@ /obj/structure/chair/fancy/comfy{ color = "#666666" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -67466,10 +67460,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/brown{ @@ -67487,10 +67481,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "ued" = ( @@ -67525,10 +67516,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -67551,14 +67542,14 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "ufu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) @@ -67607,10 +67598,10 @@ /turf/open/floor/plating, /area/maintenance/department/medical/central) "ugv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -67635,8 +67626,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/starboard) "ugC" = ( @@ -67695,8 +67686,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/engineering) @@ -67731,8 +67722,8 @@ /turf/open/floor/iron, /area/science/shuttledock) "uhQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/library) "uhX" = ( @@ -67771,7 +67762,7 @@ /area/medical/genetics/cloning) "uiA" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "uiI" = ( @@ -67781,8 +67772,8 @@ /obj/item/radio/intercom{ pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/bridge) @@ -67790,10 +67781,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "ujc" = ( @@ -67810,10 +67801,10 @@ /turf/open/floor/iron, /area/engine/engineering) "ujn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -67831,10 +67822,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -67881,19 +67872,19 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/space, /area/space/nearstation) "ukx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -67934,8 +67925,8 @@ }, /obj/machinery/door/window/southleft, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "ulA" = ( @@ -67945,8 +67936,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/black/filled/warning{ dir = 1 @@ -68003,22 +67994,16 @@ /turf/open/floor/iron, /area/medical/chemistry) "umx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/smooth_large, -/area/security/brig) +/turf/open/floor/iron, +/area/hallway/primary/port) "umz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/chapel, @@ -68059,8 +68044,8 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/office) "unI" = ( @@ -68073,10 +68058,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "uoc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -68093,7 +68078,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -68145,8 +68130,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) "uqI" = ( @@ -68161,11 +68146,17 @@ /area/medical/surgery) "uqY" = ( /obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/smooth_large, /area/security/brig) "ura" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/white{ dir = 8 }, @@ -68175,7 +68166,7 @@ /obj/machinery/power/emitter/welded{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -68248,10 +68239,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "utg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -68288,7 +68279,7 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "utL" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) @@ -68296,20 +68287,20 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/aisat) "utP" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -68336,10 +68327,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -68360,10 +68351,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -68461,10 +68452,10 @@ }, /area/hallway/secondary/exit/departure_lounge) "uwh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -68482,10 +68473,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -68501,19 +68492,19 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) "uxj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68533,8 +68524,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) "uxs" = ( @@ -68568,8 +68559,8 @@ /obj/machinery/camera/directional/east{ c_tag = "Fore Primary Hallway Aft" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -68595,10 +68586,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "uyb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark/smooth_large, @@ -68614,9 +68605,10 @@ /area/science/robotics/lab) "uyh" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/aft/secondary) "uym" = ( @@ -68624,8 +68616,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction/flip, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, @@ -68664,10 +68656,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -68682,10 +68674,10 @@ /turf/open/floor/plating, /area/security/execution/education) "uAI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -68711,10 +68703,10 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -68726,10 +68718,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -68796,17 +68788,17 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/port/fore) "uCp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -68821,10 +68813,10 @@ /turf/open/floor/iron, /area/maintenance/aft) "uCq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -68834,8 +68826,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68903,10 +68895,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -68968,8 +68960,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -69009,6 +69001,13 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, /area/medical/surgery) +"uHs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/security/brig) "uHy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -69029,8 +69028,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half, /turf/open/floor/iron/dark/smooth_half{ dir = 1 @@ -69064,8 +69063,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) @@ -69077,12 +69076,6 @@ /obj/machinery/camera/directional/west{ c_tag = "Aft Port Solar Maintenance" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -69095,8 +69088,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "uJg" = ( @@ -69105,7 +69098,7 @@ /area/maintenance/starboard/secondary) "uJB" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /turf/open/floor/circuit/telecomms, @@ -69119,8 +69112,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69129,22 +69122,16 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor/iron, /area/maintenance/solars/port/aft) "uJU" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -69158,10 +69145,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -69175,8 +69162,8 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -69188,10 +69175,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/freezer, @@ -69260,11 +69247,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "uLK" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "uMc" = ( @@ -69334,12 +69321,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "uNw" = ( @@ -69355,8 +69336,8 @@ /area/crew_quarters/kitchen) "uNB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -69380,32 +69361,29 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "uOd" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/chair/stool{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) "uOe" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -69420,8 +69398,6 @@ /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -69434,10 +69410,7 @@ /obj/machinery/holopad{ pixel_y = -16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/hallway/primary/port) "uOH" = ( @@ -69455,8 +69428,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/red/half{ @@ -69524,19 +69497,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/secondary/entry) "uQG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -69571,8 +69544,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "uRl" = ( @@ -69580,18 +69553,18 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) "uRp" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -69632,15 +69605,15 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/main) "uSe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -69656,10 +69629,10 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -69668,8 +69641,8 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -69691,8 +69664,8 @@ icon_state = "1-2" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "uTW" = ( @@ -69760,10 +69733,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -69906,10 +69879,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -69927,10 +69900,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -69942,10 +69915,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -69968,8 +69941,8 @@ name = "Starboard Bow Solar Access"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "uZs" = ( @@ -69986,8 +69959,10 @@ pixel_y = -25 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "vaz" = ( @@ -69998,8 +69973,8 @@ /turf/open/floor/iron, /area/storage/primary) "vaC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -70030,19 +70005,19 @@ id_tag = "Cabin5"; name = "Cabin 3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/dorms) "vbp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -70106,10 +70081,10 @@ /obj/machinery/camera/directional/north{ c_tag = "Club - Fore" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -70125,10 +70100,10 @@ dir = 4 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -70144,10 +70119,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -70162,8 +70137,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "sci-maint-passthrough" }, @@ -70194,7 +70169,6 @@ /turf/open/floor/engine, /area/maintenance/department/science/xenobiology) "vdV" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Plasma to Pure" @@ -70207,6 +70181,7 @@ pixel_y = 1 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron, /area/engine/atmos) "vdW" = ( @@ -70216,11 +70191,18 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "vei" = ( @@ -70242,8 +70224,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, @@ -70296,8 +70278,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "veY" = ( @@ -70315,8 +70297,8 @@ req_access_txt = "12" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "vfy" = ( @@ -70329,10 +70311,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -70352,8 +70334,8 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron{ dir = 1 }, @@ -70362,10 +70344,12 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/reagent_dispensers/water_cooler, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/atmospherics/components/unary/portables_connector, +/obj/effect/mapping_helpers/atmos_auto_connect, /turf/open/floor/iron/dark, /area/science/server) "vgd" = ( @@ -70378,10 +70362,10 @@ /turf/open/floor/engine/cult, /area/library) "vgn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/red/half{ @@ -70415,21 +70399,30 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/brig) "vhl" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, -/area/vacant_room/commissary) +/area/hallway/secondary/entry) "vhn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/yellow{ dir = 4 }, @@ -70439,10 +70432,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L3" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -70457,10 +70450,10 @@ /turf/open/floor/wood, /area/lawoffice) "vhT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -70474,7 +70467,7 @@ req_one_access_txt = "12;47" }, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -70501,8 +70494,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -70515,20 +70508,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/maintenance/starboard/fore) "vja" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/department/medical/central) @@ -70536,10 +70529,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -70556,8 +70549,8 @@ dir = 8; pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -70577,10 +70570,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, @@ -70590,12 +70580,7 @@ icon_state = "1-4" }, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/solars/starboard/fore) "vko" = ( @@ -70619,8 +70604,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/teleporter) @@ -70631,7 +70616,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -70641,12 +70626,6 @@ pixel_y = 8 }, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -70663,10 +70642,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -70716,10 +70695,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -70761,10 +70740,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -70792,10 +70771,10 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -70832,10 +70811,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -70860,7 +70839,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -70873,8 +70852,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) @@ -70889,19 +70868,19 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, /area/hallway/secondary/command) "vpJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -70945,10 +70924,10 @@ /obj/structure/sign/departments/minsky/engineering/engineering{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -70964,10 +70943,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/red/anticorner{ @@ -70988,10 +70967,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -71008,8 +70987,8 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/aft) "vrI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -71036,7 +71015,7 @@ /area/hallway/primary/port) "vsg" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/space, @@ -71113,10 +71092,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -71126,9 +71105,9 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/secondary) @@ -71195,10 +71174,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/space, @@ -71217,18 +71196,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "vwr" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood/big, @@ -71241,10 +71220,10 @@ name = "Research Maintenance"; req_one_access_txt = "7;47;29" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -71258,10 +71237,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -71298,10 +71277,10 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/landmark/start/paramedic, @@ -71322,10 +71301,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -71350,8 +71329,8 @@ /obj/item/radio/intercom{ pixel_x = -30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -71365,17 +71344,21 @@ /turf/open/floor/iron, /area/engine/storage_shared) "vxG" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, -/turf/open/floor/iron, -/area/crew_quarters/locker) +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/security/main) "vxJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -71448,16 +71431,16 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard) "vAF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -71480,8 +71463,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -71498,7 +71481,7 @@ /obj/machinery/camera/directional/east{ c_tag = "Bridge - Port Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/blue{ @@ -71563,7 +71546,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -71601,19 +71584,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vDA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -71631,10 +71614,10 @@ /turf/open/floor/iron/dark, /area/science/misc_lab/range) "vDB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white/textured_large, @@ -71656,11 +71639,11 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron/dark, /area/engine/break_room) @@ -71700,10 +71683,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -71715,12 +71698,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/fore) "vFk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "vFz" = ( @@ -71827,8 +71810,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -71850,10 +71833,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/storage) "vHP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -71887,10 +71870,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -71901,8 +71884,8 @@ /area/security/main) "vIU" = ( /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -71926,10 +71909,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -71954,10 +71937,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -71996,10 +71979,10 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -72017,8 +72000,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = -28 }, @@ -72028,15 +72010,15 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/corner, /area/hallway/primary/starboard) "vKP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -72050,8 +72032,10 @@ }, /area/security/brig) "vKV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "vKY" = ( /obj/structure/cable/yellow{ @@ -72067,10 +72051,10 @@ listening = 0; name = "Station Intercom (Court)" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -72085,8 +72069,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "vLu" = ( @@ -72102,8 +72086,8 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/gateway) "vLv" = ( @@ -72158,8 +72142,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) "vMh" = ( @@ -72191,10 +72175,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/event_spawn, @@ -72210,10 +72194,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -72232,10 +72216,10 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron, @@ -72250,9 +72234,12 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "vNk" = ( @@ -72260,8 +72247,8 @@ dir = 1; name = "MiniSat Walkway Access" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -72271,10 +72258,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -72299,6 +72286,9 @@ }, /obj/item/clothing/mask/gas/sechailer, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark/smooth_large, /area/security/main) "vNW" = ( @@ -72381,10 +72371,10 @@ /area/medical/genetics/cloning) "vPl" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -72435,15 +72425,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "vQJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -72473,10 +72460,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -72521,10 +72508,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -72540,10 +72527,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -72552,10 +72539,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white/corner, @@ -72588,10 +72575,10 @@ /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -72620,8 +72607,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, @@ -72678,8 +72665,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, @@ -72688,10 +72675,10 @@ "vWl" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -72743,15 +72730,15 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/fore) "vXE" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -72771,10 +72758,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, @@ -72784,8 +72771,8 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vYt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -72813,10 +72800,10 @@ /obj/structure/disposalpipe/junction{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -72850,10 +72837,10 @@ /turf/open/floor/carpet, /area/crew_quarters/theatre) "waq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -72906,10 +72893,10 @@ /turf/open/floor/grass, /area/medical/patients_rooms) "wbp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -72918,7 +72905,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "wbq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/science/shuttledock) "wbN" = ( @@ -72929,10 +72916,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -72953,13 +72940,8 @@ icon_state = "1-4" }, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/solars/port/fore) "wde" = ( @@ -72999,10 +72981,10 @@ /turf/open/floor/iron/white/smooth_corner, /area/security/brig) "wdQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -73011,10 +72993,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -73074,10 +73056,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -73123,15 +73105,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/plating, /area/hallway/secondary/entry) "wgn" = ( @@ -73147,7 +73120,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -73160,8 +73133,8 @@ /turf/open/floor/iron, /area/maintenance/aft) "wgH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/siding/dark_blue/corner{ @@ -73177,16 +73150,16 @@ /turf/open/floor/iron, /area/maintenance/port) "whi" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "whk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -73250,10 +73223,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -73308,10 +73281,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -73358,8 +73331,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "wlL" = ( @@ -73379,10 +73352,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -73399,10 +73372,10 @@ name = "Xenobiology Lab"; req_access_txt = "55" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -73422,10 +73395,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -73476,10 +73449,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -73491,10 +73464,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -73504,10 +73477,10 @@ pixel_y = -29 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -73528,19 +73501,19 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) "wop" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -73550,10 +73523,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -73571,10 +73544,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/grimy, @@ -73583,10 +73556,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) "wqa" = ( @@ -73619,8 +73592,8 @@ name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/research) "wqg" = ( @@ -73636,7 +73609,7 @@ dir = 1; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -73649,8 +73622,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wqY" = ( @@ -73667,10 +73638,10 @@ /area/construction/storage_wing) "wrk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -73679,8 +73650,8 @@ /turf/open/floor/iron, /area/maintenance/aft) "wrv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -73697,10 +73668,10 @@ /turf/open/floor/iron, /area/storage/tools) "wsB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -73712,12 +73683,9 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "wsD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -73728,6 +73696,9 @@ /obj/effect/turf_decal/tile/red/half{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/smooth_large, /area/security/brig) "wsV" = ( @@ -73754,13 +73725,13 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) "wtF" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/space/basic, @@ -73785,8 +73756,8 @@ uses = 10 }, /mob/living/simple_animal/bot/secbot/pingsky, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "wuf" = ( @@ -73802,14 +73773,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/port/fore) "wuI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -73822,10 +73793,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -73847,18 +73818,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "wuV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/checker, @@ -73882,10 +73853,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "20;12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -73910,8 +73881,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -73925,7 +73896,8 @@ /area/crew_quarters/dorms) "wwD" = ( /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/machinery/light{ dir = 8 @@ -73934,8 +73906,8 @@ /area/chapel/main) "wwG" = ( /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "wxd" = ( @@ -73953,17 +73925,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron, /area/teleporter) "wxi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/button/door{ @@ -73980,7 +73952,7 @@ /area/science/shuttledock) "wxD" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /turf/open/space, @@ -74012,7 +73984,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/button/door{ @@ -74030,13 +74002,15 @@ /turf/open/floor/iron/dark, /area/maintenance/department/science/xenobiology) "wyE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/starboard) "wyH" = ( @@ -74063,14 +74037,15 @@ name = "Evidence Closet 2" }, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/brig) "wzA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -74117,10 +74092,10 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "wzX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -74133,10 +74108,10 @@ /turf/open/floor/engine, /area/engine/engineering) "wAq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -74174,9 +74149,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/plating, @@ -74267,7 +74242,8 @@ }, /obj/structure/table/wood, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /turf/open/floor/carpet/blue, /area/bridge/showroom/corporate) @@ -74285,8 +74261,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/storage/tcom) "wDj" = ( @@ -74314,7 +74290,7 @@ /area/crew_quarters/locker) "wDx" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/circuit, /area/science/robotics/mechbay) @@ -74332,8 +74308,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood/end{ dir = 1 }, @@ -74346,17 +74322,25 @@ /obj/machinery/firealarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/port) +"wEa" = ( +/obj/machinery/airalarm/directional/west{ + pixel_x = -23; + air_conditioning = 0 + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark/telecomms, +/area/tcommsat/server) "wEb" = ( /obj/structure/table, /obj/item/book/manual/wiki/infections{ @@ -74437,10 +74421,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "wFZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "wGi" = ( @@ -74468,11 +74452,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -74490,13 +74474,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "wHN" = ( @@ -74514,7 +74496,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -74526,20 +74508,23 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "wIj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) "wIz" = ( @@ -74555,13 +74540,13 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -74590,10 +74575,10 @@ /turf/open/floor/carpet/grimy, /area/security/detectives_office) "wJr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/destination/chapel/flip{ @@ -74603,10 +74588,10 @@ /area/medical/medbay/aft) "wJR" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -74627,8 +74612,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "wKc" = ( @@ -74679,7 +74664,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -74689,10 +74674,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "wLf" = ( @@ -74728,10 +74713,10 @@ /turf/open/floor/iron, /area/science/shuttledock) "wLx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -74762,16 +74747,16 @@ /obj/effect/turf_decal/plaque{ icon_state = "L5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "wLZ" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, +/obj/machinery/air_sensor/toxins_burn_chamber, /turf/open/floor/engine, /area/science/mixing/chamber) "wMy" = ( @@ -74802,13 +74787,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -74817,8 +74802,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/break_room) "wNi" = ( @@ -74849,8 +74834,8 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wNG" = ( @@ -74872,10 +74857,17 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/storage/art) +"wNR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "wOa" = ( /obj/structure/chair{ dir = 8 @@ -74883,8 +74875,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "wOp" = ( @@ -74897,10 +74889,10 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -74910,10 +74902,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -74931,10 +74923,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -74950,18 +74942,18 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) "wPm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -74974,10 +74966,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -74992,8 +74984,8 @@ /obj/machinery/newscaster{ pixel_y = -29 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -75018,13 +75010,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wPK" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -75057,8 +75049,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/lab) "wRU" = ( @@ -75075,10 +75067,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -75096,17 +75088,17 @@ /turf/open/floor/iron/white, /area/science/research) "wSv" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, /turf/open/floor/iron/dark/smooth_half, /area/security/execution/education) "wSB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -75132,7 +75124,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -75159,8 +75151,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4, +/obj/effect/turf_decal/delivery/red, /turf/open/floor/iron, /area/crew_quarters/locker) "wUi" = ( @@ -75194,10 +75186,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -75232,10 +75224,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -75280,10 +75272,10 @@ /turf/open/floor/prison, /area/security/prison) "wVJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -75321,10 +75313,10 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "wVZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -75340,10 +75332,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -75456,14 +75448,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wYW" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 6 }, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark, /area/science/server) "wZd" = ( @@ -75486,7 +75479,7 @@ /area/medical/surgery) "wZB" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "wZQ" = ( @@ -75497,10 +75490,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -75553,11 +75546,17 @@ /turf/open/floor/grass, /area/medical/patients_rooms) "xaB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/hallway/primary/port) "xaQ" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, @@ -75590,10 +75589,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -75607,13 +75606,13 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "xbH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -75645,12 +75644,15 @@ }, /obj/structure/cable/yellow, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "xdC" = ( @@ -75681,10 +75683,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -75721,8 +75723,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) "xeI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -75749,10 +75751,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -75762,10 +75764,10 @@ /obj/machinery/door/window/westleft{ name = "Infirmary" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/anticorner{ @@ -75786,10 +75788,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -75818,8 +75820,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/medbay/central) "xgq" = ( @@ -75860,13 +75862,10 @@ /turf/open/floor/iron/showroomfloor, /area/security/warden) "xgR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xhg" = ( @@ -75888,10 +75887,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) @@ -75899,15 +75898,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/library) "xhI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -75944,10 +75943,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -75959,10 +75958,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/grille/broken, @@ -75977,10 +75976,10 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -76005,8 +76004,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port) "xiL" = ( @@ -76016,18 +76015,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "xiR" = ( /obj/effect/turf_decal/plaque{ icon_state = "L10" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -76045,10 +76044,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -76076,7 +76075,7 @@ /turf/open/floor/prison, /area/security/prison) "xjq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/lattice, /turf/open/space, /area/space/nearstation) @@ -76092,10 +76091,10 @@ id = "quarantineshutters"; name = "Isolation Shutters" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -76111,18 +76110,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hydroponics/garden) "xjO" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76171,18 +76170,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "xkM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -76227,15 +76226,13 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) "xlR" = ( @@ -76245,17 +76242,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xlX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -76300,10 +76297,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -76347,8 +76344,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) "xob" = ( @@ -76358,8 +76355,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -76411,10 +76408,10 @@ icon_state = "4-8" }, /obj/structure/transit_tube/crossing/horizontal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/space, @@ -76424,8 +76421,8 @@ icon_state = "1-2" }, /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xpB" = ( @@ -76460,10 +76457,10 @@ icon_state = "map-right-MS"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -76489,10 +76486,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -76504,10 +76501,10 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/circuit, @@ -76525,18 +76522,15 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "xra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/shuttledock) "xrg" = ( @@ -76547,8 +76541,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "xrj" = ( @@ -76559,10 +76555,10 @@ icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -76571,8 +76567,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -76597,8 +76593,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -76618,8 +76614,8 @@ /turf/open/floor/iron, /area/maintenance/port) "xsB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) @@ -76636,8 +76632,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -76647,10 +76643,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -76677,7 +76673,7 @@ "xtd" = ( /obj/machinery/power/terminal, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -76692,13 +76688,15 @@ /turf/open/floor/iron/smooth_large, /area/security/brig) "xts" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/catwalk_floor/iron_dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, /area/tcommsat/server) "xty" = ( /obj/item/cigbutt, @@ -76706,9 +76704,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard) "xtU" = ( @@ -76719,8 +76717,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) "xtX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "xuf" = ( @@ -76736,23 +76734,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) "xul" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) "xuo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -76793,10 +76791,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -76808,10 +76806,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/red/half{ @@ -76824,10 +76822,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark, @@ -76846,8 +76844,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -76860,9 +76858,11 @@ /turf/open/floor/iron, /area/engine/engineering) "xwd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/security/brig) "xwi" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -76947,10 +76947,10 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "xxZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/railing, @@ -76967,10 +76967,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -76997,16 +76997,19 @@ /obj/item/radio/intercom{ pixel_y = 21 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "xzg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light{ @@ -77037,8 +77040,8 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "xzx" = ( @@ -77053,16 +77056,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xzJ" = ( @@ -77116,10 +77109,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -77135,10 +77128,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -77147,8 +77140,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "xAI" = ( @@ -77158,10 +77151,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -77174,8 +77167,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/fore) "xBc" = ( @@ -77200,7 +77193,7 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "xBv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/plating, @@ -77209,15 +77202,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "xBY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/red, @@ -77258,10 +77251,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -77298,10 +77291,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -77341,17 +77334,17 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) "xFt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -77380,10 +77373,10 @@ pixel_y = -3 }, /obj/item/hand_labeler, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -77401,10 +77394,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "xGa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -77439,10 +77432,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;27;37;5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77478,10 +77471,10 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) "xHy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77496,10 +77489,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -77514,8 +77507,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "xHM" = ( @@ -77523,10 +77516,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -77538,10 +77531,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -77554,8 +77547,8 @@ /obj/structure/sign/poster/official/random{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -77565,10 +77558,10 @@ /obj/effect/turf_decal/plaque{ icon_state = "L2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -77595,16 +77588,6 @@ /area/crew_quarters/heads/hor) "xJc" = ( /obj/machinery/light/small, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/quartermaster/storage) "xJk" = ( @@ -77635,7 +77618,8 @@ "xJu" = ( /obj/machinery/rnd/destructive_analyzer, /obj/machinery/airalarm/directional/west{ - pixel_x = -23 + pixel_x = -23; + air_conditioning = 0 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -77658,10 +77642,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -77711,8 +77695,8 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) "xLx" = ( @@ -77801,10 +77785,10 @@ /turf/open/floor/iron, /area/medical/virology) "xLI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -77825,10 +77809,10 @@ }, /area/security/checkpoint/supply) "xLS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/storage/tech) @@ -77854,13 +77838,19 @@ icon_state = "snake"; name = "Hugel" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/prison, /area/security/prison) "xMM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -77890,10 +77880,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -77902,7 +77892,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -77917,10 +77907,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -77934,12 +77924,12 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4{ + dir = 4 + }, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -77951,7 +77941,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -77963,10 +77953,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -77978,8 +77968,8 @@ /obj/structure/disposalpipe/segment, /obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "xPp" = ( @@ -77993,10 +77983,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/black/opposingcorners{ @@ -78054,8 +78044,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "xPP" = ( @@ -78080,16 +78070,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) "xQk" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/iron, /area/quartermaster/miningoffice) "xQn" = ( @@ -78193,7 +78180,7 @@ id = "incineratorturbine" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/button/door/incinerator_vent_atmos_aux{ pixel_x = 24; pixel_y = 8 @@ -78259,10 +78246,10 @@ dir = 8; sortType = 28 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -78298,8 +78285,8 @@ home_destination = "QM #3"; suffix = "#3" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/storage) "xTu" = ( @@ -78317,10 +78304,10 @@ /obj/machinery/camera/directional/south{ c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -78410,10 +78397,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) "xWn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/trimline/black/filled/warning{ @@ -78431,10 +78418,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -78470,10 +78457,10 @@ icon_state = "4-8" }, /obj/structure/transit_tube/horizontal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/space, @@ -78485,10 +78472,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -78504,19 +78491,19 @@ dir = 6 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/quartermaster/storage) "xXG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -78527,8 +78514,8 @@ req_access_txt = "19; 61" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/engine/gravity_generator) "xYy" = ( @@ -78538,8 +78525,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -78569,10 +78556,10 @@ dir = 8; pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/red/anticorner{ @@ -78591,10 +78578,10 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) @@ -78685,10 +78672,10 @@ pixel_y = -25 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -78774,8 +78761,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) "ybU" = ( @@ -78793,10 +78780,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/red/half{ @@ -78808,10 +78795,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -78854,14 +78841,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/aft) @@ -78907,10 +78894,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -78941,10 +78928,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -78959,17 +78946,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, /area/crew_quarters/theatre) "yfb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -78997,7 +78984,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -79059,10 +79046,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -79104,10 +79091,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -79121,10 +79108,10 @@ /area/maintenance/fore) "ygW" = ( /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -79137,8 +79124,8 @@ name = "Hydroponics Maintenance"; req_access_txt = "35" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "yhi" = ( @@ -79182,8 +79169,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/aft) "yhO" = ( @@ -79199,7 +79184,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -79234,10 +79219,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -79275,8 +79260,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -79313,10 +79298,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -79329,10 +79314,10 @@ dir = 4 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -79361,10 +79346,10 @@ dir = 9 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/carpet/grimy, @@ -79373,7 +79358,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -79397,7 +79382,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "ykz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "ykB" = ( @@ -79412,10 +79400,10 @@ }, /area/security/brig) "ykR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -79458,10 +79446,10 @@ "ylh" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -79494,10 +79482,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/research/glass{ @@ -79512,8 +79500,8 @@ /area/science/robotics/lab) "ymf" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, @@ -89422,9 +89410,9 @@ aaa aVs aVw oMR -fra +bOd dGW -bmx +dYu oRL aaa aaa @@ -89678,7 +89666,7 @@ aaa aaa aYC bKT -lyF +oVH aVs aVs aVs @@ -89935,7 +89923,7 @@ aaa aaa aVs aVw -lyF +oVH aVs aaa aaf @@ -90169,7 +90157,7 @@ aDb aDb tNJ cXv -fOr +aRW lfO djC aaa @@ -90181,8 +90169,8 @@ aaa aaa aRW pTW -oTr -jtl +djC +rSC fDS aRA aaa @@ -90192,7 +90180,7 @@ aaa aaa aRA icH -oVH +owr aVs aaf aaf @@ -90440,7 +90428,7 @@ aVs aRA aVs aVu -lyF +oVH aVs aaa aaa @@ -90448,7 +90436,7 @@ aaa aaa aaa aVs -rSC +aVu eeQ aRA aaa @@ -90681,7 +90669,7 @@ cWK jqc mun cYL -qSB +gWB mNy aWT baa @@ -90697,7 +90685,7 @@ aVs ebg btO ufZ -lyF +oVH aVs aaa aaa @@ -90939,7 +90927,7 @@ jqc mun cYL gWB -xaB +aXb aWU baa aVs @@ -90953,8 +90941,8 @@ aaa aVs bsm aVu -phc -oVH +stJ +owr aVs aaa aaa @@ -91210,7 +91198,7 @@ aaa aVs baa aVu -xwd +aXb nhZ aRA aaa @@ -91468,7 +91456,7 @@ aVs ezY btQ bvI -lyF +vhl aVs aaa aaa @@ -91476,8 +91464,8 @@ cVx aaa aaa aVs -aVu -lyF +rSC +bIO aRA aaa aaf @@ -91968,7 +91956,7 @@ auQ aDb jRt cXv -fOr +aRW lfO djC aaa @@ -91980,8 +91968,8 @@ aaa aaa aRW pTW -oTr -jtl +djC +rSC uZB aRA aVs @@ -92496,14 +92484,14 @@ aaa aVs btR ufZ -jZU +ika biu vnp +vnp waP -owr -mZX vnp vnp +mZX ufZ gCB alK @@ -92760,7 +92748,7 @@ nSS xlJ mtn fUp -lvM +fOr qZe qyx alK @@ -92999,8 +92987,8 @@ aXc aYH bad mZX -waP vnp +waP vnp biu vnp @@ -93008,7 +92996,7 @@ vnp bha loY vnp -ufZ +bmx bvK vnZ alK @@ -93262,7 +93250,7 @@ xob hMy edS cQH -cbZ +fra kCU veK cbZ @@ -95805,7 +95793,7 @@ aaa aaf ayj azk -iWy +aAC ccN ayi aaf @@ -96347,7 +96335,7 @@ dmF uuI dmF wDQ -kbj +bql bsw baE bvW @@ -97101,7 +97089,7 @@ aMv aMv aMv aNF -fXm +kzE aMv aMv aMv @@ -97117,8 +97105,8 @@ xOH hWa bki bmf -fRZ -bql +xaB +kbj tMI fFz bvW @@ -97341,7 +97329,7 @@ anY ahp dhu qnS -fmN +ixA dnk dnk eIK @@ -97358,7 +97346,7 @@ aMv aKS aMv aNG -fXm +kzE aQj aMv aKS @@ -97615,7 +97603,7 @@ aMv aKT aMv aQl -fXm +kzE aQk aMv aSS @@ -97873,7 +97861,7 @@ aSS aMv wKE dsY -kzE +aQl aMv aSS aMv @@ -98460,7 +98448,7 @@ bTs bTs bTs bTs -geN +puB uyA geN sbY @@ -98718,8 +98706,8 @@ tjJ bTs gQE djk -ftn -jtT +iWy +qSB sbY tjJ oGp @@ -99173,8 +99161,8 @@ gBw wKF rQj bmh -fRZ -bql +xaB +kbj tMI buh bwc @@ -99183,14 +99171,14 @@ uGB tJj uhQ oue -bwc -bwc -bwc -bwc +pkn +pkn +pkn +pkn bMJ bOk -bzE -bRi +pPd +jtl bSz jTg bue @@ -99945,7 +99933,7 @@ bat bat bmj icg -kbj +bql bsG bue bue @@ -100202,7 +100190,7 @@ oSs ary bdw lhn -tnN +bql xkT bue wXJ @@ -100458,8 +100446,8 @@ qKb bbY bkt pNG -hJL -bql +phc +tnN tMI bue ofn @@ -100708,11 +100696,11 @@ vQI pCp dne eYA -bbY pJd -iJv -fqp bbY +bbY +fqp +umx esB qBC nyv @@ -100965,9 +100953,9 @@ aJN iqS qpJ gqT -lPx lmF lPx +lPx vZn ybQ xFu @@ -101996,7 +101984,7 @@ baG baG baG baG -bVW +baG baG klp baG @@ -102215,11 +102203,11 @@ ttO ttO nHn phD +naS +trQ +rsy phD phD -rsy -stJ -drI eVE eVE ltz @@ -102253,7 +102241,7 @@ bqA ryZ bqA bqA -iAp +bqA bqA gar qOI @@ -102475,11 +102463,11 @@ srs srs srs jok -jVk -pZF -gUX +srs +srs gUX gUX +fvc hoq srs qEy @@ -102510,7 +102498,7 @@ bqA rrB pqy cXT -vhl +cXT dtM bkz bkz @@ -102736,7 +102724,7 @@ aqj srs sjA sjA -sjA +sVh xMk sxu sxu @@ -102748,7 +102736,7 @@ aax uuZ kOh kcV -lxh +jVk aDC lxh aJN @@ -103005,7 +102993,7 @@ xig shr aax kcV -lxh +oKU aDC lxh aJN @@ -103519,7 +103507,7 @@ cXj thM sbU etl -aII +sWw aHx aaa aaa @@ -103767,7 +103755,7 @@ ias cxT qLS dAL -dAL +pZF dAL dAL mAd @@ -104046,8 +104034,8 @@ aJS aaa aUv wlL -iVn -aYX +oin +vzh usO bcg bdE @@ -104111,7 +104099,7 @@ hUg cvt eWO tRY -naS +pli wwG pli ooS @@ -104893,7 +104881,7 @@ bAi bAi rke cLm -cMf +gou kMl cPv cPb @@ -105151,9 +105139,9 @@ peq ruP cLm cQo -pPd +kMl clT -slv +iNO kzn aaa aaa @@ -106589,7 +106577,7 @@ atT sSA jAi xgq -twM +xgq ssX rOy qmB @@ -106693,7 +106681,7 @@ peq ruP cLm cQp -pPd +kMl clT iNO kzn @@ -106844,7 +106832,7 @@ fVp ucy nJY hTW -hTW +vxG jjz due tNq @@ -106949,7 +106937,7 @@ pCn xgB eBQ cLm -cMf +bVW kMl cPv cPb @@ -107209,7 +107197,7 @@ tqG fNG mCA clT -slv +iNO kzn aaa aaa @@ -110958,7 +110946,7 @@ xUp gXw pEK frI -frI +teP frI itu pGU @@ -111207,7 +111195,7 @@ iRB piK kKh rVA -kNK +jkx moM hoI bTb @@ -111215,7 +111203,7 @@ ezU qZr qTf hPH -kqh +qlu jgG kqh itu @@ -111722,7 +111710,7 @@ aaa aaa bTb lTC -jkx +xwd moM xac xWQ @@ -111981,9 +111969,9 @@ ajm ucb tyL hsZ -umx -umx lxO +nvn +dgD aAf ajm amF @@ -112235,12 +112223,12 @@ lMJ gKE sxb fvX -qlu -oKU jkx jkx jkx nnt +uHs +jkx wsD ajm aje @@ -112496,7 +112484,7 @@ xtg cYA xUL jkx -jkx +hqG jkx cBe ajm @@ -113267,7 +113255,7 @@ uKH iMM ajm emp -ybb +fjg ahx laG ajm @@ -113291,7 +113279,7 @@ axC axC ndB nPS -vxG +sSg sSg vfA aSg @@ -113547,8 +113535,8 @@ aHK rIr axC kwK -nPS -neO +suL +aOv aOu xaQ aOv @@ -113795,7 +113783,7 @@ aje axC pZw sID -deG +cOl rTX deG hnz @@ -113806,7 +113794,7 @@ axC nTT mRy hUx -suL +aOw aQW wDn aTA @@ -113863,7 +113851,7 @@ thn hGH fYI cvX -cvY +irA irA thn nuA @@ -114061,8 +114049,8 @@ aHL aJd axC wUd -mRy -dgD +neO +aOu aOw aQX aOu @@ -114319,7 +114307,7 @@ axC axC xqI aNc -nfW +aOu dCv aQY wDn @@ -118709,8 +118697,8 @@ bpe bry bry kCn -bry -bry +rco +twM hiW opv rWP @@ -118967,10 +118955,10 @@ vKl qua iOF mNa -qua -wyE +fte wyE rYg +rYg nUK uOl mqv @@ -119266,7 +119254,7 @@ mjJ tVz tVz mjJ -iFu +lik mjJ sEf aaa @@ -119789,7 +119777,7 @@ aaa aaa aaa lMJ -vrw +nmd vrw vrw vrw @@ -120469,7 +120457,7 @@ wND aKb jpJ foK -foK +pNk jpJ foK fka @@ -120726,7 +120714,7 @@ dnh fRO dnS qig -uWN +oTr hIX dnh koE @@ -121300,8 +121288,8 @@ bXj bYx btP gkS -ccP -ceh +cfx +bYy cfw cgA chP @@ -121558,8 +121546,8 @@ bIS bZH cbg ccP -bYy -cfx +bza +aaf bAR bAR bAR @@ -122326,10 +122314,10 @@ bDW bFQ bXm bYz -bZJ +bFU fQF -ccP -ceh +cfx +bYy cfw cgA chS @@ -122541,7 +122529,7 @@ djt daY daZ dbb -aMk +cta aNv dfk aWq @@ -122586,8 +122574,8 @@ bIS bZK cbk ccP -bYy -cfx +bza +aaf bAR bAR bAR @@ -123340,7 +123328,7 @@ eaC bCi bCv bEa -bFU +bCi bHy bZK bKE @@ -124583,7 +124571,7 @@ aaa aaa aaa dnh -dnS +iJv lXT aoi dqT @@ -124594,13 +124582,13 @@ axY qXY yhS cQQ +drI ykz ykz ykz ykz ykz -ykz -ykz +lpc mBY jDs kuo @@ -124841,7 +124829,7 @@ aaf aaf dni dnS -lXT +kNK dnS dqT aaa @@ -124851,12 +124839,12 @@ axY xyr epu fDA -kuC -kuC -kuC +wNR +iAp +iAp rqQ -kuC -kuC +iAp +iAp kuC urk osm @@ -125098,7 +125086,7 @@ aaf aaa dnh dnS -lXT +apF dnS dqT aaa @@ -125155,7 +125143,7 @@ bUJ bAR aaf aMr -bIO +apc bIP aTQ cgD @@ -131037,7 +131025,7 @@ anT aaa aMq bWC -puB +bWC aOV aMq bnp @@ -131808,7 +131796,7 @@ aNw aSD rIV xER -utM +iFu eSn xER vNk @@ -133624,7 +133612,7 @@ vOd dlc bJm bNX -bGd +wEa yih tWN bOc diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 93cf7a8dd39ac..beaf532832c34 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -43,10 +43,10 @@ /area/mine/science) "ar" = ( /obj/structure/chair/stool/directional/south, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -108,10 +108,10 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "aJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -139,10 +139,10 @@ /area/mine/production) "aV" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -154,7 +154,7 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/gateway) "aZ" = ( @@ -174,10 +174,10 @@ /area/lavaland/surface/outdoors) "bd" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -186,10 +186,10 @@ /turf/open/floor/iron, /area/mine/science) "bg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -222,10 +222,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -235,10 +235,10 @@ /obj/machinery/door/airlock/medical/glass{ name = "Chemistry Lab" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -255,7 +255,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bD" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -292,12 +292,12 @@ /turf/open/floor/iron/checker, /area/mine/production) "bN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/mining{ name = "Mining Station Storage"; req_one_access_txt = "54;18" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -309,10 +309,10 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/laborcamp) "bP" = ( @@ -324,10 +324,10 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -434,10 +434,10 @@ /turf/open/floor/iron, /area/mine/production) "cz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -466,7 +466,7 @@ /turf/open/floor/iron, /area/mine/science) "cI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, @@ -499,7 +499,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) "dl" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/circuit/telecomms, @@ -598,16 +598,16 @@ /obj/machinery/door/airlock/command{ name = "Research Director's Office" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/mine/science) "ef" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -616,7 +616,7 @@ /turf/open/floor/catwalk_floor, /area/mine/science) "eg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -661,8 +661,8 @@ "es" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -717,10 +717,10 @@ /obj/machinery/door/airlock/medical/glass{ name = "Chemistry Lab" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -747,19 +747,19 @@ /turf/open/floor/iron, /area/mine/eva) "eK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/mine/science) "eM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -781,8 +781,8 @@ /turf/open/floor/iron/dark, /area/mine/maintenance) "eO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "eS" = ( @@ -793,12 +793,12 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "eU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/production) "eV" = ( /obj/effect/spawner/lootdrop/whiteship_cere_ripley, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -816,10 +816,10 @@ /turf/open/floor/plating, /area/mine/production) "fb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -836,10 +836,10 @@ /turf/open/floor/carpet/purple, /area/mine/living_quarters) "fj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -887,8 +887,8 @@ name = "Cell 3" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "fH" = ( @@ -901,8 +901,8 @@ "fK" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "fL" = ( @@ -935,8 +935,8 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -983,10 +983,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -1064,8 +1064,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/mine/living_quarters) "gK" = ( @@ -1095,10 +1095,10 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "gS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -1131,7 +1131,7 @@ "he" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1139,8 +1139,8 @@ /turf/open/floor/iron/techmaint, /area/mine/gateway) "hf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/mine/living_quarters) "hk" = ( @@ -1191,10 +1191,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1208,10 +1208,10 @@ /turf/open/floor/iron, /area/mine/living_quarters) "hP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1416,7 +1416,7 @@ /area/mine/science) "jd" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -1425,12 +1425,12 @@ /turf/open/floor/iron, /area/mine/science) "je" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -1492,8 +1492,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/mine/production) @@ -1509,7 +1509,7 @@ /area/mine/laborcamp) "jO" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -1526,7 +1526,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -1546,10 +1546,10 @@ /area/mine/maintenance) "kf" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -1567,10 +1567,10 @@ /turf/open/floor/iron/checker, /area/mine/production) "kk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/mine/science) "kl" = ( @@ -1626,8 +1626,8 @@ /area/lavaland/surface/outdoors) "kG" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -1667,10 +1667,10 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/iron/dark/telecomms, +/turf/open/floor/iron/dark, /area/mine/living_quarters) "kV" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/iron/grid/steel, @@ -1729,7 +1729,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -1770,8 +1770,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/checker, /area/mine/production) @@ -1813,8 +1813,8 @@ /obj/machinery/door/airlock/research{ name = "Robotics Lab" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/mine/science) @@ -1829,10 +1829,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1887,7 +1887,7 @@ /area/lavaland/surface/outdoors) "mz" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -1911,7 +1911,7 @@ /turf/open/floor/iron, /area/mine/science) "mH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -1946,7 +1946,7 @@ /turf/open/floor/iron/techmaint, /area/mine/science) "mR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/item/kirbyplants/random, @@ -1976,7 +1976,7 @@ /area/mine/living_quarters) "nl" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/checker, /area/mine/production) @@ -1990,10 +1990,10 @@ /turf/open/floor/iron, /area/mine/laborcamp) "nt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -2004,7 +2004,7 @@ /area/mine/living_quarters) "nw" = ( /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -2042,10 +2042,10 @@ /area/mine/laborcamp) "nM" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -2057,10 +2057,10 @@ /turf/open/floor/iron/techmaint, /area/mine/production) "nN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/red, @@ -2069,17 +2069,17 @@ /turf/closed/indestructible/riveted/boss, /area/lavaland/surface/outdoors) "nQ" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/mine/production) "nU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -2104,14 +2104,14 @@ /turf/open/floor/iron/checker, /area/mine/production) "oc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/mine/laborcamp/security) "of" = ( /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/freezer, @@ -2181,8 +2181,8 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "pj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "pk" = ( @@ -2226,10 +2226,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -2281,10 +2281,10 @@ /area/mine/science) "pJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -2355,7 +2355,7 @@ /area/mine/science) "qd" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -2400,8 +2400,8 @@ /turf/open/floor/engine, /area/mine/science) "qI" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "qJ" = ( @@ -2429,10 +2429,10 @@ /turf/open/floor/iron/dark, /area/mine/gateway) "qR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -2491,8 +2491,8 @@ name = "Infirmary"; req_one_access_txt = "54;5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/mine/living_quarters) @@ -2519,13 +2519,13 @@ /turf/open/floor/iron, /area/mine/laborcamp/security) "rK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -2545,10 +2545,10 @@ /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "rN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron, @@ -2564,10 +2564,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -2598,10 +2598,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "sj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, @@ -2610,8 +2610,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance{ name = "Mining Station Communications"; req_one_access_txt = "54;61" @@ -2672,8 +2672,8 @@ name = "Cell 2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "sM" = ( @@ -2697,7 +2697,7 @@ /area/mine/science) "ta" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/mine/production) "tb" = ( @@ -2758,10 +2758,10 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "tP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/loading_area{ @@ -2788,7 +2788,7 @@ /turf/open/floor/carpet/royalblue, /area/mine/science) "tU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -2815,7 +2815,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ue" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -2895,10 +2895,10 @@ /turf/open/floor/iron/white, /area/mine/living_quarters) "uF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -2908,8 +2908,8 @@ /turf/open/floor/iron, /area/mine/production) "uH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/chair/stool/directional/west, /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) @@ -2928,10 +2928,10 @@ /turf/open/floor/iron, /area/mine/science) "uR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -2945,7 +2945,7 @@ /turf/open/floor/iron, /area/mine/science) "uW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/lattice/catwalk, @@ -2956,7 +2956,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "uZ" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/machinery/light/small{ @@ -2979,10 +2979,10 @@ /turf/open/floor/iron/dark, /area/mine/production) "vh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -3002,10 +3002,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "vv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/purple, @@ -3030,8 +3030,8 @@ /turf/open/floor/wood, /area/mine/living_quarters) "vH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/camera/directional/west{ @@ -3118,10 +3118,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "wg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -3159,10 +3159,10 @@ /turf/open/floor/iron/checker, /area/mine/production) "wq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -3183,11 +3183,11 @@ /turf/open/floor/plating, /area/mine/living_quarters) "wA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/eva) "wB" = ( @@ -3258,7 +3258,7 @@ /turf/closed/mineral/random/labormineral/volcanic, /area/lavaland/surface/outdoors) "xn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -3269,10 +3269,10 @@ /area/mine/production) "xp" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/extinguisher_cabinet{ @@ -3302,8 +3302,8 @@ /turf/open/floor/iron, /area/mine/living_quarters) "xw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3364,10 +3364,10 @@ /turf/open/floor/iron/techmaint, /area/mine/eva) "xX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -3420,10 +3420,10 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "yJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -3483,8 +3483,8 @@ /turf/open/floor/iron/white, /area/mine/laborcamp) "zv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/science) "zx" = ( @@ -3503,10 +3503,10 @@ /area/mine/eva) "zA" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -3527,10 +3527,10 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "zF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -3602,10 +3602,10 @@ /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "Au" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/chair/stool, @@ -3626,13 +3626,13 @@ /turf/open/floor/iron, /area/mine/living_quarters) "AE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -3672,18 +3672,18 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "AP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/science) "Ba" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -3692,7 +3692,7 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "Bg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/public/glass, @@ -3735,10 +3735,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Bv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/camera/directional/south{ @@ -3768,7 +3768,7 @@ /turf/open/floor/iron, /area/mine/laborcamp) "BA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -3784,7 +3784,7 @@ /turf/open/floor/iron/techmaint, /area/mine/science) "BH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, @@ -3826,16 +3826,16 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Cb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, /area/mine/laborcamp) "Cc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -3857,10 +3857,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Cg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/airalarm/directional/west{ @@ -3880,10 +3880,10 @@ /area/mine/eva) "Cj" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/railing, @@ -3943,7 +3943,7 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -4005,7 +4005,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Dh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light/small, @@ -4019,7 +4019,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/eva) "Dj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/mine/science) "Dk" = ( @@ -4048,10 +4048,10 @@ /turf/open/floor/iron, /area/mine/laborcamp) "DF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -4086,7 +4086,7 @@ /turf/open/floor/iron/dark, /area/mine/gateway) "DS" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/mine/living_quarters) @@ -4152,8 +4152,8 @@ /turf/open/floor/iron/checker, /area/mine/production) "EK" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -4168,10 +4168,10 @@ /turf/open/floor/wood, /area/mine/living_quarters) "ER" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/mine/laborcamp) "ET" = ( @@ -4306,8 +4306,8 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Fy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -4334,7 +4334,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/chair/office, /obj/machinery/camera/directional/east{ c_tag = "Communications Relay" @@ -4360,7 +4360,7 @@ /area/lavaland/surface/outdoors) "FL" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -4370,7 +4370,7 @@ /turf/open/floor/iron/grid/steel, /area/mine/living_quarters) "FQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -4411,7 +4411,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/machinery/light/small, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -4419,10 +4419,10 @@ /turf/open/floor/iron/dark, /area/mine/maintenance) "Gf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -4449,8 +4449,8 @@ /turf/open/floor/iron, /area/mine/gateway) "Gw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/mine/living_quarters) "Gy" = ( @@ -4478,10 +4478,10 @@ /turf/open/floor/carpet/red, /area/mine/living_quarters) "GH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -4518,8 +4518,8 @@ name = "Research Division Atrium" }, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -4547,8 +4547,8 @@ /turf/open/floor/iron, /area/mine/production) "Hd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/laborcamp) "Hj" = ( @@ -4609,10 +4609,10 @@ /turf/open/floor/iron/dark, /area/mine/production) "Hy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -4669,8 +4669,8 @@ /turf/open/floor/iron, /area/mine/gateway) "HR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -4686,8 +4686,8 @@ /turf/open/floor/iron, /area/mine/laborcamp) "HT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -4716,7 +4716,7 @@ /turf/open/floor/carpet/royalblue, /area/mine/science) "Iq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, @@ -4733,8 +4733,8 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Ix" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -4781,10 +4781,10 @@ /turf/open/floor/iron/dark, /area/mine/production) "IQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/freezer, @@ -4802,10 +4802,10 @@ /turf/open/floor/iron, /area/mine/science) "IV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -4815,22 +4815,22 @@ /turf/open/floor/iron, /area/mine/laborcamp/security) "IY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, /area/mine/laborcamp/security) "Jf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -4860,8 +4860,8 @@ /turf/open/floor/iron, /area/mine/science) "Jm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light{ dir = 8; light_color = "#e8eaff" @@ -4872,10 +4872,10 @@ /turf/open/floor/iron, /area/mine/science) "Jo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -4899,7 +4899,7 @@ /turf/open/floor/carpet/royalblue, /area/mine/science) "Ju" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, /turf/open/floor/circuit/telecomms, @@ -4916,7 +4916,7 @@ "Jx" = ( /obj/structure/cable, /obj/machinery/bluespace_beacon, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -4939,10 +4939,10 @@ /area/mine/production) "Jz" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -4956,10 +4956,10 @@ req_access_txt = "2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -4973,7 +4973,7 @@ /turf/open/floor/iron/dark, /area/mine/laborcamp) "JJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -5015,14 +5015,14 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Ke" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/production) "Kf" = ( @@ -5154,16 +5154,16 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/mine/science) "Lc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -5179,8 +5179,8 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Lk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -5228,7 +5228,7 @@ /turf/open/floor/engine, /area/mine/science) "LJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -5244,10 +5244,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -5263,8 +5263,8 @@ /turf/open/floor/iron/techmaint, /area/mine/eva) "LW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/science) "LX" = ( @@ -5298,14 +5298,14 @@ /turf/open/floor/iron, /area/mine/laborcamp/security) "Mc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/mine/production) "Mi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -5336,19 +5336,19 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "MC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, /area/mine/living_quarters) "MJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -5370,15 +5370,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/mine/living_quarters) "MX" = ( /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/mine/science) "MY" = ( @@ -5401,15 +5401,15 @@ /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "Nf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/mine/living_quarters) "Ng" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, @@ -5420,7 +5420,7 @@ /turf/open/floor/iron/dark, /area/mine/gateway) "No" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light/small, @@ -5431,10 +5431,10 @@ name = "Subspace Listening Lab" }, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -5452,10 +5452,10 @@ /area/mine/production) "NE" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -5544,10 +5544,10 @@ /turf/open/floor/iron/dark, /area/mine/science) "Oo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/item/stack/cable_coil/cut/yellow, @@ -5562,10 +5562,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -5574,7 +5574,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron/techmaint, @@ -5596,8 +5596,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -5647,10 +5647,10 @@ /area/mine/production) "OP" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -5721,8 +5721,8 @@ /turf/open/floor/carpet/black, /area/mine/science) "Pk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/mine/science) "Pm" = ( @@ -5731,14 +5731,14 @@ /turf/open/floor/iron, /area/mine/laborcamp) "Po" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -5817,10 +5817,10 @@ /turf/open/floor/iron/dark, /area/mine/laborcamp) "Qe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/mine/living_quarters) "Qg" = ( @@ -5885,10 +5885,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -5937,8 +5937,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, @@ -5962,10 +5962,10 @@ /turf/open/floor/iron, /area/mine/production) "Rp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron, @@ -6004,8 +6004,8 @@ /turf/open/floor/iron, /area/mine/science) "RF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/mine/living_quarters) @@ -6055,7 +6055,7 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "Sc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/laborcamp) "Sf" = ( @@ -6110,20 +6110,20 @@ /turf/closed/mineral/random/volcanic, /area/lavaland/surface/outdoors/unexplored/danger) "Sx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/mine/science) "Sy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6139,7 +6139,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -6237,17 +6237,17 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "TA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/grid/steel, /area/mine/laborcamp) "TD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -6280,8 +6280,8 @@ name = "Cell 1" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "TT" = ( @@ -6301,7 +6301,7 @@ /area/mine/science) "TX" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -6347,10 +6347,10 @@ /area/lavaland/surface/outdoors/unexplored) "UE" = ( /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet/royalblue, @@ -6363,7 +6363,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/techmaint, @@ -6379,13 +6379,13 @@ /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) "UK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -6410,7 +6410,7 @@ /turf/open/floor/iron/checker, /area/mine/production) "UU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/mine/living_quarters) @@ -6464,10 +6464,10 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -6530,10 +6530,10 @@ name = "Research Division Atrium" }, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6558,7 +6558,7 @@ /turf/open/floor/iron/techmaint, /area/mine/laborcamp) "VO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light/small, @@ -6611,10 +6611,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -6638,10 +6638,10 @@ pixel_y = -8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6656,10 +6656,10 @@ /turf/open/floor/iron/dark, /area/mine/eva) "Wp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -6674,7 +6674,7 @@ req_access_txt = "2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -6683,7 +6683,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -6696,10 +6696,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Wv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -6715,10 +6715,10 @@ /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) "WB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -6756,7 +6756,7 @@ /turf/open/floor/iron, /area/mine/science) "WX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/mine/laborcamp) "Xa" = ( @@ -6789,7 +6789,7 @@ /area/mine/laborcamp) "Xi" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/plating, /area/mine/maintenance) "Xj" = ( @@ -6800,10 +6800,10 @@ name = "Research Division Atrium" }, /obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6814,7 +6814,7 @@ "Xs" = ( /obj/structure/spider/stickyweb, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -6890,13 +6890,13 @@ /turf/open/floor/plating, /area/mine/production) "XQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -6909,7 +6909,7 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/production) "XT" = ( @@ -6968,8 +6968,8 @@ /turf/open/floor/iron/dark, /area/mine/eva) "Yo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -6991,13 +6991,13 @@ /turf/open/floor/carpet/black, /area/mine/science) "Yz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/mine/living_quarters) @@ -7064,15 +7064,15 @@ /turf/open/floor/iron/grid/steel, /area/mine/living_quarters) "YU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/mine/science) "YV" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/structure/fans/tiny, /obj/machinery/door/airlock/wood/glass{ name = "Sauna" @@ -7087,9 +7087,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -7098,8 +7098,8 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Zg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index db42377a8c16f..6fa74334b6d64 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -23,10 +23,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "aax" = ( @@ -42,9 +42,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, @@ -183,10 +180,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair{ @@ -213,10 +210,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_half_edge/purple{ @@ -259,14 +256,9 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "acy" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Filter" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, /turf/open/floor/iron/tech, /area/engine/atmos) "acA" = ( @@ -279,10 +271,10 @@ /obj/effect/turf_decal/tile/green/half{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -291,15 +283,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/atmospherics_engine) "acJ" = ( @@ -337,7 +329,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -444,7 +436,7 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light, @@ -474,10 +466,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -492,6 +484,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "agV" = ( @@ -532,8 +530,8 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "aid" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/quartermaster/storage) @@ -601,10 +599,10 @@ /turf/open/floor/plating, /area/engine/engineering) "aiX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -649,10 +647,10 @@ }, /area/science/research) "ajn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark/smooth_large, @@ -705,9 +703,6 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hos) "akQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -779,10 +774,10 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "amC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -801,8 +796,8 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -815,7 +810,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/blue{ dir = 1 }, @@ -831,8 +826,8 @@ /turf/open/floor/carpet/blue, /area/bridge/meeting_room) "ane" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/table, /obj/machinery/reagentgrinder{ pixel_x = -1; @@ -855,7 +850,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -870,10 +865,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -932,8 +927,8 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -968,7 +963,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "aps" = ( /obj/machinery/camera/directional/north{ @@ -977,21 +972,18 @@ /turf/open/floor/engine, /area/science/xenobiology) "apC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/caution{ dir = 8; pixel_x = 3 }, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "apD" = ( @@ -1003,10 +995,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -1063,8 +1055,8 @@ dir = 8; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -1082,16 +1074,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "ard" = ( @@ -1102,10 +1092,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -1135,8 +1125,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/tech, /area/engine/engine_room) "arN" = ( @@ -1165,8 +1155,12 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "ash" = ( @@ -1243,10 +1237,10 @@ req_access_txt = "35" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, @@ -1256,8 +1250,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -1426,14 +1420,20 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "auK" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/robotics/mechbay) "auN" = ( @@ -1450,20 +1450,20 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "ava" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -1497,10 +1497,10 @@ /turf/open/floor/engine, /area/science/xenobiology) "avj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/poddoor/preopen{ @@ -1588,7 +1588,7 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hos) "axo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1601,12 +1601,6 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "axV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; req_access_txt = "2" @@ -1633,10 +1627,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/machinery/door/airlock/engineering{ name = "Engine Room"; req_access_txt = "10" @@ -1799,8 +1789,8 @@ dir = 8; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -1846,15 +1836,15 @@ /area/medical/medbay/central) "aBd" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "aBo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/surgery) "aBx" = ( @@ -1865,10 +1855,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -1883,10 +1873,10 @@ /area/quartermaster/warehouse) "aBC" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, @@ -1898,8 +1888,8 @@ req_access_txt = "38" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -1931,10 +1921,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -1982,7 +1972,7 @@ /turf/open/floor/iron/dark, /area/medical/chemistry) "aDq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/dark, @@ -2017,19 +2007,19 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "aEN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -2048,8 +2038,8 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "aEP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -2073,7 +2063,7 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "aFF" = ( -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 8 }, /obj/machinery/meter, @@ -2111,8 +2101,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "aGl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -2147,20 +2137,9 @@ /turf/open/floor/iron, /area/quartermaster/miningdock) "aHe" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, -/area/engine/atmos) +/area/hallway/secondary/entry) "aHn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2183,16 +2162,13 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "aHX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Bridge External Access"; req_one_access_txt = "10;13" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/bridge) "aIj" = ( @@ -2212,8 +2188,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -2254,7 +2230,7 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -2297,10 +2273,10 @@ /turf/open/space/basic, /area/space) "aJN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_edge/purple{ @@ -2327,10 +2303,10 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "aJZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -2348,7 +2324,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/yellow{ @@ -2364,10 +2340,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison/shielded) "aKr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/decal/cleanable/dirt/dust, @@ -2404,8 +2380,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "aKC" = ( @@ -2417,16 +2393,13 @@ name = "Teleport Access"; req_access_txt = "17" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/teleporter) "aKQ" = ( /obj/structure/closet/emcloset/anchored, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /turf/open/floor/plating, /area/engine/engine_room) "aLs" = ( @@ -2436,8 +2409,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -2453,8 +2426,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -2468,10 +2441,10 @@ /turf/open/floor/iron, /area/security/brig) "aLQ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, -/obj/machinery/computer/atmos_control/tank/air_tank{ +/obj/machinery/computer/atmos_control/air_tank{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -2502,10 +2475,10 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/box, @@ -2517,10 +2490,10 @@ }, /area/maintenance/central) "aMB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -2533,10 +2506,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "aMD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -2546,7 +2519,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, /turf/open/floor/iron, @@ -2555,7 +2528,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/surgery) "aNk" = ( @@ -2610,13 +2583,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -2638,16 +2611,13 @@ dir = 1; name = "CO2 to Pure" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "aOK" = ( @@ -2668,10 +2638,10 @@ }, /area/science/research) "aOU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -2682,6 +2652,16 @@ }, /turf/open/floor/iron/tech, /area/engine/engine_room) +"aPm" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hallway/secondary/exit/departure_lounge) "aPp" = ( /obj/structure/bookcase/manuals/medical, /turf/open/floor/plating, @@ -2701,6 +2681,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "aPu" = ( @@ -2740,18 +2722,9 @@ }, /area/science/research) "aQE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -2785,9 +2758,8 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "aRy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron/dark, /area/security/brig/dock) @@ -2817,8 +2789,8 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -2826,7 +2798,7 @@ /turf/open/floor/iron/dark, /area/security/brig) "aSu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -2857,10 +2829,10 @@ /area/maintenance/starboard/aft) "aST" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -2873,10 +2845,10 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/prison, @@ -2935,10 +2907,10 @@ pixel_y = -2 }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/item/radio/intercom{ @@ -2957,10 +2929,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -3012,10 +2984,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/purple, @@ -3102,8 +3074,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/construction/mining/aux_base) "aWp" = ( @@ -3119,13 +3091,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /turf/open/floor/iron/dark/telecomms{ @@ -3136,27 +3108,27 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Ports" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/tech, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "aWD" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/chapel/main) "aWK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -3181,10 +3153,17 @@ dir = 8 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"aWZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/atmos) "aXj" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -3199,7 +3178,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "aXO" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /turf/closed/wall, @@ -3324,10 +3303,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/storage/tech) "baz" = ( @@ -3381,10 +3360,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -3452,8 +3431,8 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "bcH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -3574,10 +3553,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /mob/living/basic/cockroach, @@ -3610,10 +3589,10 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/brown, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/navbeacon{ @@ -3679,7 +3658,7 @@ /turf/open/floor/iron/dark, /area/science/robotics) "bgz" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -3711,8 +3690,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted{ alpha = 140; color = "#FFFFF" @@ -3728,7 +3707,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "bha" = ( @@ -3774,8 +3752,8 @@ pixel_x = 25; prison_radio = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -3901,12 +3879,6 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, @@ -3936,8 +3908,8 @@ /turf/open/floor/plating, /area/maintenance/department/security) "blg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3947,8 +3919,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, /area/quartermaster/miningdock) @@ -3965,19 +3937,19 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "blC" = ( /obj/item/radio/intercom{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/guideline/guideline_edge/blue{ @@ -4012,8 +3984,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -4073,10 +4045,10 @@ /turf/open/floor/iron/dark, /area/bridge) "bno" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -4159,10 +4131,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /mob/living/basic/cockroach, @@ -4197,10 +4169,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/holopad{ pixel_x = 16; pixel_y = 16 @@ -4238,10 +4210,10 @@ /turf/open/floor/iron, /area/science/lab) "bpQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark/side{ @@ -4315,17 +4287,17 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/box, /turf/open/floor/carpet/green, /area/security/courtroom) "bqK" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/tech, @@ -4351,9 +4323,9 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/iron/dark/corner{ dir = 8 @@ -4378,8 +4350,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -4399,10 +4371,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -4434,9 +4406,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/atmospherics_engine) "brP" = ( @@ -4444,10 +4417,10 @@ name = "Virology Maintenance"; req_access_txt = "39" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -4493,8 +4466,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; name = "Bridge Access Blast Door" @@ -4566,12 +4537,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "btZ" = ( @@ -4618,7 +4583,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/item/radio/intercom{ @@ -4663,8 +4628,8 @@ /turf/open/floor/iron/dark, /area/storage/primary) "bva" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; req_access_txt = "3" @@ -4687,10 +4652,10 @@ /turf/open/floor/iron, /area/security/warden) "bvz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -4750,7 +4715,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "bwK" = ( /obj/effect/landmark/start/assistant, @@ -4823,7 +4788,7 @@ dir = 9 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/engine, @@ -4833,7 +4798,7 @@ /area/crew_quarters/heads/hor) "byu" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -4852,8 +4817,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/cyan, @@ -4904,8 +4869,8 @@ /turf/open/floor/iron/dark, /area/bridge) "bzD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -4932,10 +4897,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -4960,10 +4925,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "bBd" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/light, /obj/structure/cable{ icon_state = "4-8" @@ -5028,8 +4989,8 @@ /turf/open/floor/iron, /area/ai_monitored/security/armory) "bBM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/bot{ dir = 1 @@ -5057,8 +5018,8 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -5084,10 +5045,10 @@ /area/quartermaster/office) "bDq" = ( /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -5121,7 +5082,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "bDL" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/cable{ @@ -5148,10 +5109,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -5171,6 +5132,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/robotics/mechbay) "bEo" = ( @@ -5178,13 +5142,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -5233,10 +5197,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -5263,8 +5227,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_half_edge/green{ color = "#439C1E"; dir = 1 @@ -5279,10 +5243,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -5296,8 +5260,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ dir = 1 @@ -5312,10 +5276,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/robot_debris, @@ -5337,13 +5301,13 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -5355,21 +5319,20 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/maintenance/department/security) "bIG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/turf/open/floor/iron/dark, +/area/science/robotics/mechbay) "bIM" = ( /obj/item/stack/sheet/wood, /turf/open/floor/carpet/royalblack, @@ -5378,10 +5341,10 @@ /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -5412,13 +5375,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "bJV" = ( /obj/effect/spawner/structure/window/reinforced, @@ -5430,10 +5393,10 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "bJY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/item/radio/intercom{ @@ -5454,11 +5417,11 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, /turf/open/floor/engine, /area/engine/atmos) "bKr" = ( @@ -5478,15 +5441,15 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "bKM" = ( @@ -5498,10 +5461,10 @@ /turf/open/floor/iron/sepia, /area/quartermaster/office) "bKR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_edge/purple{ @@ -5516,8 +5479,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -5527,8 +5490,8 @@ /turf/open/floor/iron/white, /area/science/research) "bLf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/lattice/catwalk/over, @@ -5554,12 +5517,11 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "bLz" = ( @@ -5650,10 +5612,10 @@ /turf/open/floor/iron, /area/maintenance/department/security) "bNr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -5695,7 +5657,7 @@ /turf/open/floor/iron/cafeteria, /area/maintenance/port/aft) "bOe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -5729,10 +5691,10 @@ }, /area/hallway/primary/fore) "bOF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -5781,10 +5743,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -5821,8 +5783,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/lobby) "bQq" = ( @@ -5842,7 +5804,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/iv_drip, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /mob/living/simple_animal/bot/cleanbot/medbay, @@ -5862,10 +5824,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -5877,10 +5839,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -5916,10 +5878,10 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /mob/living/basic/mothroach{ @@ -5935,7 +5897,7 @@ /area/science/robotics) "bRg" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, /turf/open/floor/plating, @@ -5948,10 +5910,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -6007,10 +5969,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/green{ @@ -6023,10 +5985,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -6131,13 +6090,13 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "bUG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ dir = 1 }, /turf/open/floor/engine/co2, /area/engine/atmos) "bUQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6152,8 +6111,8 @@ /turf/open/floor/carpet/purple, /area/chapel/main) "bVn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -6300,7 +6259,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/radio/intercom{ @@ -6310,7 +6269,7 @@ pixel_y = 25; prison_radio = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -6342,8 +6301,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/starboard) "bZr" = ( @@ -6364,7 +6323,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6435,8 +6394,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half, /obj/effect/turf_decal/tile/yellow/half, /turf/open/floor/iron/large, @@ -6452,9 +6411,9 @@ }, /area/medical/medbay/central) "cax" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/stripes/line, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) @@ -6506,10 +6465,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -6554,8 +6513,8 @@ /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -6623,13 +6582,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "cey" = ( /obj/structure/table, @@ -6648,10 +6607,10 @@ /area/hallway/primary/port) "cfc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -6662,10 +6621,10 @@ pixel_x = 5; pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -6756,8 +6715,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "cgc" = ( @@ -6816,8 +6775,8 @@ /turf/open/floor/iron/dark, /area/science/misc_lab/range) "cgX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/navbeacon{ @@ -6884,10 +6843,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ @@ -6898,10 +6857,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "chV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark/corner{ @@ -7002,7 +6961,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "cjX" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/machinery/door/window/brigdoor{ @@ -7042,7 +7001,7 @@ alpha = 180; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail{ @@ -7050,7 +7009,7 @@ name = "Medbay Junction"; sortType = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/yellow, @@ -7073,10 +7032,10 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -7096,8 +7055,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail{ sortType = 2 }, @@ -7125,7 +7084,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -7173,10 +7132,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -7195,8 +7154,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, @@ -7226,10 +7185,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -7241,10 +7200,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/bridge) "cnX" = ( @@ -7256,10 +7215,10 @@ /turf/open/floor/iron, /area/engine/engineering) "cnY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/sink{ @@ -7349,14 +7308,14 @@ "coD" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) "coH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -7401,16 +7360,16 @@ /turf/open/floor/iron/dark, /area/science/misc_lab/range) "cpb" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/engine/atmos) "cpx" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "cpU" = ( @@ -7418,9 +7377,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cqv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -7440,7 +7396,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "cqU" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -7476,7 +7432,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) @@ -7510,7 +7466,7 @@ /turf/open/floor/iron/white, /area/science/explab) "crW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -7536,7 +7492,7 @@ /area/security/prison) "csG" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -7575,10 +7531,10 @@ /area/gateway) "cti" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -7608,10 +7564,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -7629,13 +7585,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller/directional/north, /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, @@ -7660,8 +7609,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7680,7 +7629,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "ctR" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 4 }, /turf/open/floor/engine/o2, @@ -7731,10 +7680,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -7758,7 +7707,7 @@ /turf/open/floor/plating, /area/security/prison) "cve" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -7774,8 +7723,8 @@ /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -7783,7 +7732,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "cvm" = ( @@ -7794,10 +7743,10 @@ /turf/open/floor/plating, /area/hydroponics) "cvt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -7824,7 +7773,7 @@ /obj/structure/chair/fancy/corp{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -7840,9 +7789,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -7863,10 +7809,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -7911,10 +7857,10 @@ /obj/structure/bed/dogbed/renault{ pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /mob/living/simple_animal/pet/fox/Renault{ @@ -7938,10 +7884,10 @@ /area/security/checkpoint/medical) "cxF" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/holopad{ @@ -7952,7 +7898,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "cxX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -7971,10 +7917,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -8012,7 +7958,7 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "cyG" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/closed/wall/r_wall, @@ -8041,10 +7987,10 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/box, @@ -8102,14 +8048,14 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "czL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/iron/dark/side{ dir = 6 @@ -8157,9 +8103,6 @@ /turf/open/space/basic, /area/space/nearstation) "cAT" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -8224,10 +8167,10 @@ /area/gateway) "cCl" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -8318,7 +8261,7 @@ /turf/open/floor/iron/cafeteria, /area/maintenance/port/aft) "cFj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -8331,15 +8274,15 @@ "cFn" = ( /obj/effect/turf_decal/bot, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/tech, /area/engine/engine_room) "cFr" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -8360,10 +8303,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "cFD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/stripes/line, @@ -8412,7 +8355,7 @@ /area/security/checkpoint/engineering) "cGA" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating, /area/engine/atmos) "cGD" = ( @@ -8427,10 +8370,10 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) "cGT" = ( @@ -8503,8 +8446,8 @@ /area/engine/engineering) "cIm" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -8523,10 +8466,10 @@ /turf/open/floor/iron/dark, /area/security/main) "cIJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, @@ -8552,27 +8495,27 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "cJi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "cJj" = ( /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "cJD" = ( /obj/machinery/telecomms/bus/preset_three, @@ -8609,10 +8552,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -8628,10 +8571,10 @@ /turf/closed/wall, /area/medical/apothecary) "cKR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -8640,10 +8583,10 @@ /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "cLj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -8697,7 +8640,7 @@ /turf/open/floor/iron/white, /area/science/explab) "cLG" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -8740,10 +8683,10 @@ /turf/open/space/basic, /area/space/nearstation) "cMi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -8791,18 +8734,18 @@ /turf/open/floor/iron/dark, /area/quartermaster/sorting) "cMH" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/light_switch{ pixel_x = 21 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "cMI" = ( /turf/closed/wall/r_wall, @@ -8837,15 +8780,16 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "cNj" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/tech, /area/engine/engine_room) "cNC" = ( /obj/structure/lattice/catwalk, @@ -8856,7 +8800,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "cNI" = ( /obj/item/radio/intercom{ @@ -8899,8 +8843,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -8940,10 +8884,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/machinery/airalarm/directional/east, /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, @@ -8977,10 +8917,10 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -9000,10 +8940,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -9051,7 +8991,7 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "cRQ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/machinery/meter, @@ -9074,10 +9014,10 @@ /turf/open/floor/iron/tech, /area/ai_monitored/storage/eva) "cSe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -9099,7 +9039,7 @@ /turf/open/floor/iron, /area/medical/medbay/lobby) "cSw" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -9137,10 +9077,10 @@ /turf/open/floor/plating, /area/tcommsat/computer) "cTa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -9211,10 +9151,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/item/bikehorn, @@ -9269,17 +9209,17 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "cUH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "cUS" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -9292,8 +9232,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9367,13 +9307,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/plating, /area/maintenance/department/bridge) "cXE" = ( @@ -9387,8 +9320,8 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "cXM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -9432,10 +9365,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -9487,10 +9420,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -9541,10 +9474,11 @@ /turf/open/floor/plating, /area/maintenance/port/central) "daC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1; + hide = 0 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/dark, /area/engine/engine_room) "daR" = ( @@ -9565,18 +9499,18 @@ }, /area/medical/medbay/central) "dbd" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "dbk" = ( @@ -9619,10 +9553,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_in/yellow, @@ -9643,12 +9577,10 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "dbS" = ( @@ -9661,10 +9593,10 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -9699,10 +9631,10 @@ /turf/open/floor/iron, /area/science/robotics) "dcw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark/side, @@ -9725,9 +9657,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/item/storage/secure/safe{ pixel_x = -26; pixel_y = 1 @@ -9764,10 +9693,10 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -9779,10 +9708,10 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "ddM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -9851,7 +9780,7 @@ /area/medical/break_room) "deN" = ( /obj/structure/lattice/catwalk, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "deW" = ( /obj/effect/landmark/xeno_spawn, @@ -9905,11 +9834,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, /turf/open/floor/engine, /area/engine/atmos) "dfX" = ( @@ -9933,8 +9862,8 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "dgm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair{ @@ -9976,7 +9905,7 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "dhP" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -10003,7 +9932,7 @@ uses = 10 }, /obj/effect/turf_decal/box, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "diq" = ( /obj/machinery/camera/directional/east, @@ -10014,6 +9943,13 @@ dir = 8 }, /area/medical/sleeper) +"dit" = ( +/obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engine/atmospherics_engine) "diF" = ( /obj/structure/transit_tube/station/reverse{ dir = 4 @@ -10053,8 +9989,8 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "diO" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/plasma_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/plasma_tank{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -10181,10 +10117,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -10207,8 +10143,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/cafeteria) "dlf" = ( @@ -10288,10 +10224,10 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) "dmn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/lattice/catwalk/over, @@ -10306,12 +10242,19 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) +"dmz" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "dmC" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, @@ -10346,8 +10289,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "dmM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/sepia, /area/quartermaster/storage) @@ -10355,10 +10298,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -10415,11 +10358,11 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "dpq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/iron/white, @@ -10429,10 +10372,10 @@ /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissary2) "dqc" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -10483,13 +10426,9 @@ /turf/open/floor/iron, /area/medical/sleeper) "dqt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer4{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/terminal{ @@ -10499,6 +10438,12 @@ icon_state = "1-4" }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer4{ + dir = 8 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "dqx" = ( @@ -10561,16 +10506,16 @@ /turf/open/floor/wood, /area/medical/exam_room) "drI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, /area/security/courtroom) "drK" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 4 }, /turf/open/floor/engine/air, @@ -10616,7 +10561,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "dtp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -10625,7 +10570,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -10718,10 +10663,10 @@ /area/maintenance/department/science) "dvq" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -10758,7 +10703,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "dvV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -10796,15 +10741,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/cafeteria) "dwf" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/thermomachine/heater, -/turf/open/floor/iron/tech, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "dwo" = ( /obj/machinery/holopad{ @@ -10815,7 +10760,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/camera/directional/east{ c_tag = "Interrogation room" }, @@ -10830,12 +10775,12 @@ freq = 1400; location = "Medbay" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/sleeper) "dwF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -10899,7 +10844,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -10919,7 +10864,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "dxu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ dir = 4 }, /turf/open/floor/engine/n2, @@ -10951,8 +10896,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white/corner{ dir = 4 }, @@ -10971,12 +10916,12 @@ /turf/open/floor/iron, /area/crew_quarters/cafeteria) "dyo" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/atmos_control/tank/mix_tank{ +/obj/machinery/computer/atmos_control/mix_tank{ dir = 8 }, /turf/open/floor/iron, @@ -11012,10 +10957,10 @@ /area/security/prison) "dzf" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -11065,9 +11010,6 @@ /area/security/brig/dock) "dzW" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/department/bridge) "dzY" = ( @@ -11160,8 +11102,8 @@ /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "dCe" = ( @@ -11205,13 +11147,13 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -11266,7 +11208,7 @@ /turf/open/floor/iron/dark, /area/security/nuke_storage) "dDT" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -11351,10 +11293,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -11362,8 +11300,8 @@ /area/engine/engine_room) "dFg" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -11402,12 +11340,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/security/checkpoint/escape) "dFs" = ( @@ -11444,10 +11376,10 @@ /turf/open/floor/plating, /area/hydroponics) "dGu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/lattice/catwalk/over, @@ -11475,7 +11407,7 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) "dGH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/landmark/start/quartermaster, @@ -11489,6 +11421,12 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "dGY" = ( @@ -11503,10 +11441,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -11518,10 +11456,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -11564,8 +11502,8 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -11617,15 +11555,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dIu" = ( @@ -11637,8 +11566,8 @@ dir = 5 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 10 }, /turf/open/floor/engine, /area/engine/atmos) @@ -11650,20 +11579,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/tech, /area/engine/engine_room) "dJh" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "dJr" = ( /obj/effect/decal/cleanable/dirt, @@ -11701,13 +11630,13 @@ /turf/open/space/basic, /area/space/nearstation) "dKd" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Plasma to Pure" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron, /area/engine/atmos) "dKh" = ( @@ -11720,7 +11649,7 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) "dKo" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -11734,10 +11663,10 @@ color = "#267878"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -11747,7 +11676,7 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -11756,7 +11685,7 @@ pixel_y = 16 }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -11771,7 +11700,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/engine, @@ -11848,10 +11777,10 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -11868,10 +11797,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -11999,11 +11928,11 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/blood/drip, /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 8 @@ -12097,10 +12026,10 @@ "dND" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side, -/area/science/mixing/chamber) +/area/science/mixing) "dNE" = ( /obj/effect/landmark/start/janitor, /obj/effect/landmark/xeno_spawn, @@ -12198,8 +12127,8 @@ /turf/open/floor/iron, /area/engine/engine_room) "dQv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -12214,7 +12143,7 @@ /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) "dQV" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/light{ dir = 4 }, @@ -12222,8 +12151,8 @@ /area/engine/atmos) "dRc" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -12246,10 +12175,10 @@ req_one_access_txt = "1;34;4" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -12276,7 +12205,6 @@ /turf/open/space/basic, /area/solar/starboard/fore) "dSE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, /obj/machinery/camera/directional/west, /obj/effect/turf_decal/stripes/line, /turf/open/floor/catwalk_floor/iron_dark, @@ -12323,16 +12251,14 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningdock) "dTO" = ( @@ -12348,7 +12274,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "dUi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -12380,7 +12306,7 @@ /turf/open/floor/iron/dark, /area/bridge) "dUp" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -12393,10 +12319,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/cyan{ @@ -12428,12 +12354,6 @@ /turf/open/floor/iron/dark, /area/security/prison) "dVh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -12445,13 +12365,19 @@ name = "Atmos to Loop" }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "dVj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -12570,7 +12496,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, /turf/open/floor/iron/tech, @@ -12696,10 +12622,10 @@ /turf/open/floor/iron/white/side, /area/science/research) "dYG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -12720,8 +12646,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -12755,7 +12681,7 @@ /turf/open/floor/iron, /area/quartermaster/sorting) "dZS" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -12773,22 +12699,16 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/entry) "eaN" = ( /turf/open/floor/iron, /area/engine/atmospherics_engine) "eaR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -12876,10 +12796,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, @@ -12950,8 +12870,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -13006,9 +12926,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "efl" = ( @@ -13090,10 +13007,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -13119,8 +13036,8 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "ego" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -13138,7 +13055,7 @@ /area/solar/starboard/aft) "egv" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -13152,10 +13069,10 @@ name = "Maintenance Hatch"; req_access_txt = "41" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -13166,8 +13083,8 @@ dir = 8; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "ehp" = ( @@ -13214,10 +13131,10 @@ name = "Port Mix to East Ports" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/tech, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "eiC" = ( /obj/effect/spawner/structure/window/reinforced, @@ -13267,10 +13184,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -13349,7 +13266,7 @@ /turf/open/floor/iron/dark, /area/security/brig/dock) "ekF" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "ekR" = ( @@ -13478,7 +13395,7 @@ /area/science/research) "emP" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 }, /turf/open/space/basic, @@ -13491,7 +13408,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "ens" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -13538,11 +13455,11 @@ /turf/open/floor/iron, /area/science/robotics) "eof" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -13550,7 +13467,7 @@ alpha = 180 }, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 1 }, /turf/open/floor/iron, /area/engine/engineering) @@ -13634,19 +13551,23 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "epF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/junction/flip, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/box, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "epO" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -13668,8 +13589,8 @@ color = "#DE3A3A" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -13720,7 +13641,7 @@ /area/hallway/primary/central) "eqr" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 }, /turf/open/floor/iron/dark, @@ -13759,7 +13680,7 @@ /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) "eqW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -13828,10 +13749,10 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "esk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair{ @@ -13901,10 +13822,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/landmark/start/assistant, @@ -13925,10 +13846,10 @@ color = "#FFFFFF"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, @@ -13942,13 +13863,13 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "eua" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/exploration_prep) @@ -14027,12 +13948,11 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /obj/machinery/holopad{ - pixel_x = 16; - pixel_y = 16 + pixel_x = 16 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -14061,10 +13981,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -14073,7 +13993,7 @@ /turf/open/floor/iron/dark, /area/science/mixing) "ewf" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -14101,7 +14021,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "ewu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/closed/wall/r_wall, @@ -14119,10 +14039,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -14162,21 +14082,21 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "exx" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/engine/atmos) "exY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -14289,13 +14209,13 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "eyT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "eyU" = ( /obj/machinery/camera/directional/east, @@ -14372,10 +14292,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) "eAA" = ( @@ -14420,20 +14340,20 @@ /area/medical/sleeper) "eAT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/science/mixing/chamber) +/area/science/mixing) "eAY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -14521,10 +14441,10 @@ /turf/closed/wall, /area/maintenance/department/medical/morgue) "eDx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/lattice/catwalk/over, @@ -14541,13 +14461,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "eDz" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 8 + }, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "eDH" = ( /obj/structure/table/reinforced, @@ -14583,7 +14503,7 @@ pixel_x = -6; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -14595,10 +14515,10 @@ /turf/open/floor/iron, /area/science/misc_lab) "eEf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -14638,8 +14558,8 @@ /area/space/nearstation) "eEY" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -14706,20 +14626,20 @@ /turf/open/floor/iron/tech/grid, /area/engine/engine_room) "eGD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/maintenance/port/aft) "eGH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "eGO" = ( @@ -14800,22 +14720,22 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "eHz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side, /area/hallway/secondary/exit/departure_lounge) "eHM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -14857,10 +14777,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -14881,8 +14801,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -14918,12 +14838,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "eJq" = ( @@ -14960,7 +14874,7 @@ /turf/open/floor/plating, /area/maintenance/department/science) "eKd" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /turf/open/floor/iron/white, @@ -14979,10 +14893,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -15057,12 +14971,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "eLO" = ( @@ -15072,11 +14980,11 @@ /turf/open/floor/iron, /area/maintenance/department/security) "eLY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -15096,7 +15004,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -15138,8 +15046,8 @@ /turf/open/space/basic, /area/solar/starboard/aft) "eNo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -15196,10 +15104,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -15257,10 +15165,10 @@ "eON" = ( /obj/machinery/camera/directional/north, /obj/machinery/firealarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -15398,8 +15306,8 @@ /turf/open/floor/iron, /area/maintenance/department/science) "eRv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "eRx" = ( @@ -15413,10 +15321,10 @@ /turf/open/floor/iron/dark, /area/medical/genetics) "eRL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark/corner{ @@ -15428,7 +15336,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/storage/tech) "eSu" = ( @@ -15472,10 +15380,6 @@ pixel_x = -25; pixel_y = 27 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -15486,10 +15390,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -15509,10 +15413,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "eSK" = ( /turf/closed/wall/r_wall, @@ -15573,7 +15477,7 @@ dir = 5 }, /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -15592,10 +15496,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, @@ -15621,9 +15525,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -15652,10 +15553,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -15688,10 +15589,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -15720,7 +15621,7 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "eVa" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -15735,10 +15636,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -15757,8 +15658,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "eVz" = ( @@ -15799,23 +15700,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /turf/open/floor/iron/tech, /area/engine/atmos) "eWz" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, @@ -15890,8 +15781,8 @@ /turf/open/floor/iron, /area/security/brig) "eXD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -15961,10 +15852,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -16049,7 +15940,7 @@ /area/engine/supermatter) "fan" = ( /obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -16093,6 +15984,7 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/engine/engineering) "faP" = ( @@ -16128,14 +16020,17 @@ dir = 8 }, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "Gas to Filter" }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/unlocked, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/engine, /area/engine/supermatter) "fbJ" = ( @@ -16154,10 +16049,10 @@ /turf/open/floor/plating, /area/maintenance/department/science) "fbY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -16174,7 +16069,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "fbZ" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -16191,8 +16086,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -16219,12 +16114,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/iron/tech, /area/engine/engine_room) "fcL" = ( @@ -16234,10 +16123,10 @@ /area/hallway/primary/central) "fcN" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -16335,11 +16224,11 @@ name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16382,8 +16271,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 8 }, @@ -16482,7 +16371,7 @@ }, /obj/effect/turf_decal/guideline/guideline_edge/red, /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -16532,7 +16421,7 @@ "fid" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/firealarm/directional/south, @@ -16553,8 +16442,8 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/sorting) "fiA" = ( @@ -16605,10 +16494,10 @@ /obj/effect/turf_decal/guideline/guideline_tri/brown{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -16635,10 +16524,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -16673,10 +16562,10 @@ /turf/open/floor/noslip/standard, /area/crew_quarters/toilet) "fjB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -16697,8 +16586,6 @@ }, /area/hallway/primary/central) "fjN" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/hallway/secondary/entry) "fjR" = ( @@ -16720,8 +16607,8 @@ }, /area/science/research) "fkb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/blue{ dir = 8 }, @@ -16757,8 +16644,8 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -16770,10 +16657,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -16782,10 +16669,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "fkx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -16817,10 +16704,10 @@ /turf/open/floor/iron, /area/crew_quarters/heads/hop) "fkX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -16876,25 +16763,25 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/bridge) "fmv" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "fmx" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/structure/cable/yellow{ @@ -16932,10 +16819,10 @@ /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) "fna" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/machinery/navbeacon{ @@ -16945,10 +16832,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "fnD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -17017,17 +16904,10 @@ /area/engine/engine_room) "fov" = ( /obj/structure/lattice/catwalk, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_x = -32; - pixel_y = 3 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/atmos) "foH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/spawner/structure/window/plasma/reinforced, @@ -17050,7 +16930,7 @@ dir = 8 }, /obj/structure/lattice/catwalk, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "fpi" = ( /obj/effect/turf_decal/stripes/line{ @@ -17072,10 +16952,10 @@ /obj/effect/turf_decal/guideline/guideline_out/brown{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -17102,9 +16982,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -17118,10 +16995,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -17200,7 +17077,7 @@ /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "frm" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/machinery/meter, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -17228,12 +17105,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" }, @@ -17284,8 +17155,8 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "fsB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -17357,8 +17228,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -17372,10 +17243,10 @@ name = "Break Room"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -17465,7 +17336,7 @@ name = "Secure Pen Shutters" }, /obj/effect/decal/cleanable/oil/slippery, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/engine, @@ -17522,10 +17393,10 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/machinery/photocopier, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -17596,7 +17467,7 @@ /obj/structure/chair/fancy/corp{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -17651,7 +17522,7 @@ /area/quartermaster/sorting) "fyZ" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -17681,7 +17552,7 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/yellow/half, @@ -17690,8 +17561,8 @@ /area/hallway/primary/central) "fzn" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -17743,8 +17614,8 @@ /turf/open/floor/iron, /area/medical/genetics/cloning) "fzK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -17853,7 +17724,7 @@ /turf/open/floor/iron/sepia, /area/quartermaster/office) "fBl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -17862,10 +17733,10 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "fBx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -17943,10 +17814,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -17972,7 +17843,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/engine, /area/engine/atmospherics_engine) "fDQ" = ( @@ -17980,7 +17851,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ @@ -18053,22 +17924,18 @@ /turf/open/floor/iron/white, /area/science/lab) "fEY" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "fFf" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -18080,6 +17947,12 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "fFj" = ( @@ -18090,10 +17963,10 @@ /turf/open/floor/engine, /area/science/xenobiology) "fFo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -18116,10 +17989,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -18138,10 +18011,10 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -18209,7 +18082,7 @@ /area/security/brig) "fHP" = ( /obj/effect/turf_decal/tile/blue/half, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/structure/cable/yellow{ @@ -18251,7 +18124,7 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/box, @@ -18259,10 +18132,10 @@ /area/security/brig/medbay) "fIz" = ( /obj/effect/turf_decal/siding/wideplating/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -18345,8 +18218,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -18390,10 +18263,10 @@ name = "Cabin 1" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -18412,18 +18285,16 @@ }, /obj/effect/landmark/event_spawn, /obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "fKE" = ( @@ -18466,8 +18337,8 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -18478,9 +18349,6 @@ /turf/open/floor/iron/sepia, /area/quartermaster/office) "fMa" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/landmark/blobstart, /turf/open/floor/circuit/telecomms/server, /area/science/server) @@ -18515,23 +18383,23 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, /area/maintenance/central) "fME" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + icon_state = "2-4" }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/engine/engine_room) @@ -18574,10 +18442,10 @@ /turf/open/floor/wood, /area/library) "fNR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner, @@ -18659,10 +18527,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -18681,10 +18549,10 @@ /turf/open/floor/carpet/royalblack, /area/library) "fPi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -18713,10 +18581,10 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_edge_alt/red{ @@ -18737,10 +18605,10 @@ /turf/open/floor/iron, /area/security/brig) "fQw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -18805,10 +18673,10 @@ }, /area/tcommsat/server) "fQX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -18845,15 +18713,15 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "fRG" = ( @@ -18890,24 +18758,20 @@ /area/engine/engine_room) "fRN" = ( /obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/item/book/manual/wiki/atmospherics, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "fRP" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -18927,17 +18791,17 @@ "fSI" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/quartermaster/storage) "fTb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -18951,22 +18815,22 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "fTn" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -19047,8 +18911,8 @@ /area/hallway/primary/central) "fVw" = ( /obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "fVx" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -19119,7 +18983,7 @@ "fXw" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "fXJ" = ( /turf/closed/wall/r_wall/rust, @@ -19157,14 +19021,19 @@ "fYo" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/mixingchamber{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -24 }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "toxinsburn" + }, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/science/mixing/chamber) +/area/science/mixing) "fYr" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal) @@ -19179,10 +19048,10 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/brown, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -19192,10 +19061,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -19205,8 +19074,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "fYI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -19291,10 +19160,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -19323,29 +19192,26 @@ /turf/open/floor/plating, /area/library) "gaJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet, /area/library) "gaL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "gaV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -19447,8 +19313,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -19465,7 +19331,7 @@ }, /area/bridge) "gbF" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ dir = 1 }, /turf/open/floor/engine/co2, @@ -19564,7 +19430,7 @@ /area/security/brig) "geq" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -19639,8 +19505,8 @@ /area/medical/genetics) "gfC" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -19661,7 +19527,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -19677,10 +19543,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -19711,12 +19577,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/science/shuttledock) "ggs" = ( @@ -19783,8 +19643,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/guideline/guideline_edge/purple, @@ -19808,10 +19668,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -19821,10 +19681,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -19843,10 +19703,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -19925,12 +19785,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/reflector/box{ dir = 8 }, @@ -20037,10 +19891,10 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "glw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -20116,10 +19970,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_edge_alt/_offset/red{ @@ -20138,10 +19992,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/blood/footprints{ @@ -20186,8 +20040,8 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "gmv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window, /obj/structure/disposalpipe/segment{ dir = 2 @@ -20196,8 +20050,8 @@ /area/quartermaster/sorting) "gmF" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -20225,7 +20079,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -20263,10 +20117,10 @@ /turf/open/floor/plating, /area/security/brig/dock) "gnU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=25-NHall"; location = "24-CenterNE" @@ -20345,12 +20199,12 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "gpK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "gpX" = ( /obj/machinery/door/airlock/grunge{ @@ -20381,8 +20235,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, @@ -20395,7 +20249,7 @@ /obj/machinery/sparker/toxmix{ pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/engine/vacuum, @@ -20512,10 +20366,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -20679,17 +20533,17 @@ /turf/open/floor/iron/dark, /area/science/robotics) "gvJ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 1 }, /turf/open/floor/circuit/telecomms/server, /area/science/xenobiology) "gvR" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -20717,17 +20571,17 @@ pixel_y = 14 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet, /area/library) "gwk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -20743,7 +20597,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "gwr" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -20798,8 +20652,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "gxP" = ( @@ -20822,19 +20676,19 @@ req_one_access_txt = "10;13" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/department/bridge) "gyy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -20930,7 +20784,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/science/mixing/chamber) +/area/science/mixing) "gAU" = ( /obj/machinery/vendor/mining, /obj/machinery/light{ @@ -20985,24 +20839,13 @@ /turf/open/floor/engine, /area/engine/atmos) "gCk" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/closed/wall/r_wall, /area/engine/supermatter) "gCB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - req_one_access_txt = "7;30,29,63" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/fans/tiny, -/turf/open/floor/circuit/telecomms/server, +/turf/open/floor/iron/dark, /area/science/server) "gCH" = ( /obj/effect/decal/cleanable/dirt, @@ -21035,7 +20878,7 @@ /turf/open/floor/carpet/royalblack, /area/library) "gCT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/holopad{ @@ -21050,15 +20893,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/wood, /area/chapel/office) "gDB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer4, /turf/open/floor/iron/dark, /area/engine/engine_room) "gDW" = ( @@ -21069,8 +20912,8 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /mob/living/simple_animal/bot/secbot/beepsky{ @@ -21097,7 +20940,7 @@ /obj/effect/turf_decal/guideline/guideline_in/green{ color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/effect/turf_decal/tile/dark_green/half{ @@ -21113,7 +20956,7 @@ /turf/open/space/basic, /area/solar/port/fore) "gEV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -21170,8 +21013,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -21182,10 +21025,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/junction/flip{ @@ -21225,10 +21068,10 @@ }, /area/maintenance/department/medical) "gGx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -21244,8 +21087,8 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -21255,7 +21098,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "gGE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, /obj/effect/landmark/event_spawn, @@ -21266,8 +21109,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -21275,7 +21118,7 @@ /turf/open/floor/iron/white, /area/science/research) "gGM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -21306,8 +21149,8 @@ /area/hallway/primary/port) "gGZ" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -21417,14 +21260,8 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) @@ -21459,7 +21296,7 @@ /turf/open/floor/wood, /area/medical/exam_room) "gKg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -21511,10 +21348,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -21580,10 +21417,10 @@ /obj/effect/turf_decal/guideline/guideline_in/neutral{ alpha = 255 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_edge/green{ @@ -21599,11 +21436,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -21621,7 +21454,7 @@ /turf/open/floor/iron/sepia, /area/maintenance/port/central) "gNi" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, @@ -21629,13 +21462,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "gNm" = ( /obj/structure/chair/office{ @@ -21683,10 +21516,10 @@ alpha = 180; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -21708,8 +21541,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "gNI" = ( @@ -21725,10 +21558,10 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/captain/private) "gNV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -21791,7 +21624,7 @@ /turf/open/floor/iron/sepia, /area/maintenance/port/central) "gPq" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -21844,8 +21677,8 @@ /turf/open/floor/iron, /area/maintenance/department/security) "gQs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "gQz" = ( @@ -21912,6 +21745,8 @@ /obj/structure/sign/departments/minsky/security/command{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/bridge) "gRJ" = ( @@ -21922,7 +21757,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "gRR" = ( /obj/machinery/camera/directional/west{ @@ -21935,7 +21770,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -21957,8 +21792,8 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "gSI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -22003,29 +21838,25 @@ /turf/open/floor/iron, /area/engine/engine_room) "gTo" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/box/white, /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, -/turf/open/floor/circuit/telecomms/server, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, /area/science/server) "gTp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/green, /area/security/courtroom) "gTs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -22045,7 +21876,7 @@ }, /obj/machinery/light, /obj/effect/turf_decal/guideline/guideline_edge/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -22134,10 +21965,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -22198,10 +22029,10 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22249,10 +22080,10 @@ /turf/open/floor/plating, /area/bridge) "gVl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, -/obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/atmos) "gVn" = ( @@ -22273,10 +22104,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "gVH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/holopad{ @@ -22303,6 +22134,20 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall, /area/maintenance/solars/port/aft) +"gVV" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access_txt = "19" + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/bridge) "gVY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -22325,8 +22170,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "gWE" = ( @@ -22418,8 +22263,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -22429,7 +22274,7 @@ /turf/open/floor/iron/white, /area/science/research) "gYH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/chemistry) @@ -22467,7 +22312,7 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "gZx" = ( -/obj/machinery/air_sensor/atmos/oxygen_tank, +/obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/engine/atmos) "gZQ" = ( @@ -22483,10 +22328,10 @@ /turf/open/floor/iron, /area/hallway/primary/port) "gZR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22514,10 +22359,10 @@ name = "Cell 1" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -22567,7 +22412,7 @@ /turf/closed/wall/r_wall, /area/bridge) "hbe" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, /obj/machinery/meter, @@ -22592,6 +22437,14 @@ }, /turf/open/floor/iron/dark, /area/science/misc_lab) +"hbn" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/bridge) "hbo" = ( /obj/structure/sink{ dir = 1; @@ -22626,8 +22479,8 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "hcr" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -22642,10 +22495,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -22667,7 +22520,7 @@ /turf/open/floor/iron, /area/security/brig) "hcF" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -22694,10 +22547,10 @@ /turf/open/floor/iron/dark, /area/engine/storage) "hcU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -22740,6 +22593,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 10 + }, /turf/open/floor/iron, /area/engine/engine_room) "hea" = ( @@ -22748,7 +22604,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/carpet/grimy, @@ -22851,7 +22707,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -22869,20 +22725,16 @@ /turf/open/floor/iron/white, /area/security/brig/medbay) "hfT" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/tech, /area/engine/engine_room) "hgd" = ( /obj/machinery/newscaster{ @@ -22898,10 +22750,10 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/engine, @@ -22910,7 +22762,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_edge/neutral{ @@ -22921,7 +22773,7 @@ /area/medical/medbay/central) "hgw" = ( /obj/effect/turf_decal/tile/blue/half, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/cable/yellow{ @@ -22936,6 +22788,15 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) +"hgH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/science/robotics/mechbay) "hhn" = ( /obj/effect/spawner/room/tenxfive, /turf/open/floor/plating, @@ -22963,8 +22824,8 @@ /turf/open/floor/iron, /area/maintenance/department/security) "hhG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "hhS" = ( @@ -22975,10 +22836,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -23100,10 +22961,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -23206,15 +23067,12 @@ pixel_x = -33; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "hlL" = ( @@ -23298,10 +23156,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/glass{ @@ -23325,8 +23183,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "hnl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "hno" = ( @@ -23343,8 +23201,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -23469,21 +23327,23 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "hqf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "hqx" = ( @@ -23492,7 +23352,7 @@ }, /obj/machinery/light/small, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/engine/atmospherics_engine) "hqy" = ( @@ -23520,8 +23380,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/construction/mining/aux_base) "hre" = ( @@ -23537,7 +23397,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "hrP" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/meter, @@ -23559,10 +23419,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/advanced_airlock_controller/directional/west{ - pixel_x = -32; - pixel_y = 3 - }, /turf/open/floor/iron/dark, /area/security/brig/dock) "hsm" = ( @@ -23596,7 +23452,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -23613,7 +23469,7 @@ /area/security/main) "htm" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/plating, @@ -23691,8 +23547,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -23712,10 +23568,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -23764,7 +23620,7 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "hvL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, /turf/open/floor/iron/tech, @@ -23806,9 +23662,6 @@ /turf/open/floor/iron/white, /area/science/lab) "hwk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -23834,7 +23687,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "hwE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -23880,23 +23733,21 @@ /turf/open/floor/iron/dark, /area/security/prison) "hxw" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "hxA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -23944,13 +23795,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -23974,10 +23825,10 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -23986,10 +23837,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_half_in/purple, @@ -24011,10 +23862,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24039,13 +23890,13 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -24061,10 +23912,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -24099,8 +23950,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/holopad{ pixel_y = 16 }, @@ -24123,10 +23974,10 @@ req_access_txt = "16" }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24161,10 +24012,10 @@ "hBM" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24223,12 +24074,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "hCq" = ( @@ -24239,17 +24084,17 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "hCt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -24291,7 +24136,7 @@ /area/maintenance/department/engine) "hDv" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, /obj/structure/sign/warning/nosmoking{ @@ -24312,7 +24157,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -24421,10 +24266,10 @@ "hGp" = ( /obj/effect/landmark/start/quartermaster, /obj/structure/chair/fancy/corp, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -24445,10 +24290,10 @@ /area/hallway/primary/central) "hGJ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -24466,14 +24311,14 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "hHm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_tri/_offset/red{ dir = 5 }, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/darkblue{ @@ -24500,13 +24345,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, @@ -24531,8 +24376,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -24540,10 +24385,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/purple, @@ -24604,7 +24449,7 @@ }, /area/hallway/primary/central) "hJH" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /obj/machinery/light/small{ @@ -24652,12 +24497,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -24672,7 +24514,7 @@ /obj/structure/sign/warning/securearea{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -24722,17 +24564,6 @@ /area/science/xenobiology) "hLc" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_x = -1; - pixel_y = 35 - }, /turf/open/floor/iron/dark, /area/security/brig/dock) "hLi" = ( @@ -24749,12 +24580,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -24764,8 +24589,8 @@ name = "Court Cell"; req_access_txt = "42" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -24804,12 +24629,12 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "hLD" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, /turf/open/floor/iron/tech, /area/engine/atmos) "hLI" = ( @@ -24833,20 +24658,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) "hMe" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/poddoor/shutters{ @@ -24886,7 +24711,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) "hMs" = ( @@ -24909,18 +24734,18 @@ /turf/open/floor/iron, /area/security/brig) "hMG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/meter, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/machinery/meter, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "hMK" = ( /obj/machinery/camera/directional/south, @@ -24976,8 +24801,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) "hNP" = ( @@ -25007,7 +24832,7 @@ id = "quarantineshutters"; name = "Isolation Shutters" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -25049,7 +24874,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "hOQ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -25065,8 +24890,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -25085,6 +24910,10 @@ /area/engine/engine_room) "hPi" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1; + hide = 0 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "hPm" = ( @@ -25169,8 +24998,8 @@ /turf/open/floor/iron, /area/crew_quarters/cafeteria) "hPP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/security) "hQd" = ( @@ -25240,16 +25069,16 @@ /area/crew_quarters/heads/captain/private) "hSa" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/corner{ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) "hSm" = ( /obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "hSn" = ( @@ -25301,15 +25130,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/security/checkpoint/escape) "hTD" = ( @@ -25335,7 +25155,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "hTQ" = ( @@ -25354,10 +25174,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -25367,21 +25187,22 @@ /area/hallway/primary/central) "hUO" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig/dock) "hVf" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 8 }, /turf/open/floor/engine/airless, /area/engine/atmos) "hVq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, /turf/open/floor/iron/stairs/medium{ dir = 1 }, @@ -25422,12 +25243,6 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "hVV" = ( @@ -25448,10 +25263,10 @@ /turf/open/floor/iron, /area/science/storage) "hWz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -25549,8 +25364,8 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -25562,23 +25377,23 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) "hZz" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) "hZF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "hZQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -25653,10 +25468,10 @@ /turf/open/floor/plating, /area/crew_quarters/kitchen) "ibc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -25705,8 +25520,8 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/brown, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -25719,9 +25534,10 @@ /turf/closed/wall, /area/science/misc_lab) "icl" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 22; - dir = 1 + dir = 1; + locked = "0" }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/atmospherics, @@ -25731,10 +25547,10 @@ /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "icE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/firealarm/directional/south, @@ -25771,16 +25587,16 @@ "idg" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron, /area/science/storage) "iee" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -25789,10 +25605,10 @@ /turf/open/floor/wood, /area/security/prison) "ief" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/power/terminal{ @@ -25801,7 +25617,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/iron/dark/telecomms{ @@ -25837,7 +25653,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 1 }, /turf/open/floor/iron/tech, @@ -25923,10 +25739,10 @@ /area/maintenance/department/engine) "igJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -25987,10 +25803,10 @@ /area/science/xenobiology) "iin" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -26000,7 +25816,7 @@ /area/security/prison) "iis" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/item/flashlight/lamp{ @@ -26021,6 +25837,12 @@ alpha = 180; dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "iiM" = ( @@ -26096,8 +25918,8 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/medbay/lobby) "ikE" = ( @@ -26158,10 +25980,10 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat_interior) "imh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -26191,9 +26013,6 @@ /turf/open/floor/iron/dark, /area/security/warden) "imA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/stack/rods/fifty, /obj/item/rcl/pre_loaded, @@ -26303,10 +26122,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -26379,7 +26198,7 @@ /turf/open/floor/iron/techmaint, /area/science/xenobiology) "ipZ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/structure/cable{ @@ -26403,7 +26222,7 @@ /turf/open/floor/iron/white, /area/science/lab) "iqg" = ( -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "iqm" = ( /obj/structure/sign/warning/pods, @@ -26443,13 +26262,13 @@ /turf/open/floor/wood, /area/security/detectives_office) "iqR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/wood, @@ -26466,10 +26285,10 @@ "iqX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -26559,6 +26378,12 @@ /area/crew_quarters/kitchen) "isP" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engine_room) "isT" = ( @@ -26594,7 +26419,7 @@ /turf/open/space/basic, /area/space) "itk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -26614,13 +26439,13 @@ icon_state = "1-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -26641,10 +26466,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -26656,8 +26481,8 @@ name = "Xenobiology Junction"; sortType = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26688,7 +26513,7 @@ /turf/open/floor/iron, /area/engine/break_room) "ivH" = ( -/obj/machinery/air_sensor/atmos/air_tank, +/obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) "ivY" = ( @@ -26698,13 +26523,13 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ dir = 10 }, /obj/machinery/firealarm/directional/north, @@ -26741,8 +26566,8 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -26871,8 +26696,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/genetics) "izn" = ( @@ -26880,8 +26705,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -27019,8 +26844,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -27059,7 +26884,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "iCx" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -27068,7 +26893,7 @@ /turf/open/floor/iron, /area/engine/atmos) "iCJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -27076,13 +26901,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "iCN" = ( /obj/structure/table/wood, @@ -27102,10 +26927,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -27141,7 +26966,7 @@ /turf/open/floor/grass, /area/hallway/primary/central) "iDU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -27160,8 +26985,8 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "iEz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -27205,10 +27030,10 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -27233,10 +27058,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/crowbar, @@ -27263,10 +27088,10 @@ /turf/open/floor/iron, /area/maintenance/department/science) "iHs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -27358,7 +27183,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /turf/open/floor/iron/tech, @@ -27406,10 +27231,10 @@ /turf/open/floor/iron/white, /area/security/brig/medbay) "iJm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -27421,19 +27246,15 @@ /turf/open/floor/plating, /area/maintenance/port/central) "iJN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/trinary/filter, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/engine/atmospherics_engine) "iJR" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/atmos) "iJV" = ( /obj/machinery/light{ dir = 1 @@ -27468,10 +27289,10 @@ /area/hallway/primary/central) "iKL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -27493,10 +27314,10 @@ /turf/open/floor/iron/techmaint, /area/storage/tech) "iLp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -27551,12 +27372,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/power/terminal{ dir = 4 }, @@ -27566,6 +27381,12 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "iMb" = ( @@ -27663,7 +27484,7 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -27678,7 +27499,7 @@ name = "engineering Security Door" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -27715,7 +27536,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/bar) @@ -27723,8 +27544,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/lattice/catwalk/over, @@ -27749,8 +27570,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -27796,13 +27617,13 @@ name = "Port to Filter" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "iQa" = ( /obj/structure/extinguisher_cabinet{ @@ -27830,7 +27651,7 @@ }, /area/hallway/primary/central) "iQp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -27839,10 +27660,10 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "iQt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/railing/corner, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) @@ -27856,7 +27677,7 @@ pixel_x = -6; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -27871,15 +27692,9 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/security/brig/dock) "iQZ" = ( @@ -27930,9 +27745,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -28010,7 +27822,7 @@ /turf/open/floor/iron, /area/security/brig) "iTt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, /obj/effect/turf_decal/delivery, @@ -28047,10 +27859,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/plating, @@ -28066,10 +27878,10 @@ /turf/open/space/basic, /area/solar/port/fore) "iVd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -28094,8 +27906,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted{ alpha = 140; color = "#FFFFF" @@ -28103,13 +27915,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "iVl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 9 }, -/turf/open/floor/iron/tech, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/engine/atmos) "iVs" = ( /obj/machinery/airalarm/directional/west, @@ -28180,10 +27990,10 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/guideline/guideline_in/yellow{ @@ -28263,7 +28073,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/chair/office/light{ dir = 8 }, @@ -28294,10 +28104,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -28327,10 +28137,10 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -28359,8 +28169,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -28409,10 +28219,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -28434,8 +28244,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=21-Dorms"; location = "20-Cryo" @@ -28473,6 +28283,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "jbH" = ( @@ -28502,16 +28315,18 @@ /area/medical/medbay/central) "jca" = ( /obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/storage) "jcl" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -28523,10 +28338,10 @@ /obj/effect/turf_decal/tile/green/half{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -28546,13 +28361,11 @@ /turf/open/floor/iron/white, /area/science/explab) "jcv" = ( -/obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light, -/obj/structure/cable/yellow, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/camera/directional/south, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 8 }, -/obj/machinery/camera/directional/south, /turf/open/floor/circuit/telecomms/server, /area/science/server) "jcy" = ( @@ -28618,7 +28431,7 @@ pixel_x = -8; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -28638,10 +28451,10 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -28675,10 +28488,10 @@ name = "Cabin 2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -28724,7 +28537,7 @@ id = "quarantineshutters"; name = "Isolation Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/grid/steel, @@ -28768,14 +28581,14 @@ icon_state = "4-8" }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ +/obj/machinery/airlock_controller/incinerator_atmos{ pixel_x = 6; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, @@ -28796,12 +28609,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/department/medical/morgue) "jfG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/ai_slipper{ uses = 10 }, @@ -28809,6 +28616,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "jgz" = ( @@ -28851,9 +28661,9 @@ /turf/open/floor/iron/dark, /area/storage/tech) "jgI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/start/cook, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -28927,10 +28737,10 @@ /turf/open/floor/iron/grid/steel, /area/hydroponics) "jhx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -28961,7 +28771,7 @@ /turf/open/floor/plating, /area/maintenance/department/science) "jir" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, /obj/structure/cable/yellow{ @@ -28969,13 +28779,13 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "jiy" = ( /obj/effect/turf_decal/tile/purple{ @@ -29036,8 +28846,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/landmark/blobstart, /turf/open/floor/catwalk_floor, /area/maintenance/department/security) @@ -29080,7 +28890,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "jkr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -29151,7 +28961,7 @@ /turf/open/floor/iron/dark, /area/security/brig) "jlM" = ( -/obj/machinery/air_sensor/atmos/sm_core, +/obj/machinery/air_sensor/engine_chamber, /turf/open/floor/engine, /area/engine/supermatter) "jlP" = ( @@ -29215,9 +29025,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -29235,7 +29042,7 @@ dir = 2 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/light_switch{ @@ -29245,8 +29052,8 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "jof" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -29332,11 +29139,11 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "jqt" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -29400,7 +29207,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -29515,10 +29322,10 @@ }, /obj/machinery/computer/cargo/request, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/bridge) "jsM" = ( @@ -29529,15 +29336,15 @@ /turf/open/space/basic, /area/space/nearstation) "jsN" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ + dir = 1 + }, /turf/open/floor/engine, /area/science/mixing/chamber) "jsT" = ( @@ -29545,8 +29352,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/junction/flip{ dir = 8 }, @@ -29559,7 +29366,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/teleporter) "jtA" = ( @@ -29581,10 +29388,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "juy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/computer/security/telescreen/court{ @@ -29595,10 +29402,10 @@ /turf/open/floor/carpet/green, /area/security/courtroom) "juC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/item/toy/crayon/spraycan{ @@ -29645,7 +29452,7 @@ /area/engine/engine_room) "jvo" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -29659,8 +29466,8 @@ /turf/open/floor/grass, /area/hallway/primary/central) "jvx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -29716,12 +29523,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig/dock) "jwj" = ( @@ -29731,8 +29536,8 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "jwn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -29774,10 +29579,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/sorting/mail/destination/law_office/flip{ @@ -29798,7 +29603,7 @@ /turf/open/floor/iron, /area/maintenance/central) "jxw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_edge_alt/red{ @@ -29842,10 +29647,10 @@ /turf/open/space/basic, /area/solar/port/fore) "jyo" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/wood, @@ -30014,13 +29819,13 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "jBO" = ( /obj/structure/reagent_dispensers/peppertank{ @@ -30138,12 +29943,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "jDD" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/components/binary/valve/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/terminal{ dir = 8 @@ -30155,6 +29955,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "jDH" = ( @@ -30177,10 +29979,10 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "jEi" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -30216,10 +30018,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -30234,16 +30036,16 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Engine Room"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -30271,10 +30073,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -30391,10 +30193,10 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -30431,8 +30233,8 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hos) "jHR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -30448,13 +30250,13 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "jHW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/iron/dark/telecomms{ @@ -30490,10 +30292,10 @@ /turf/open/floor/iron/dark, /area/science/robotics/mechbay) "jIv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -30502,7 +30304,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "jII" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -30562,11 +30364,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron/dark, /area/science/shuttledock) @@ -30581,7 +30383,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "jKk" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ dir = 8 }, /turf/open/floor/engine/vacuum, @@ -30614,17 +30416,17 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "jKN" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -30696,7 +30498,7 @@ /turf/open/floor/iron/dark, /area/engine/storage) "jMN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -30738,7 +30540,7 @@ /obj/machinery/porta_turret/ai{ dir = 4 }, -/turf/open/floor/engine/air, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "jNP" = ( /obj/structure/cable/yellow{ @@ -30781,14 +30583,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig/dock) "jOP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/structure/cable{ @@ -30817,12 +30619,9 @@ /turf/open/floor/plating, /area/engine/engineering) "jPc" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/light, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -30832,7 +30631,7 @@ /area/engine/atmos) "jPk" = ( /obj/effect/decal/cleanable/shreds, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -30909,7 +30708,7 @@ /area/maintenance/port/aft) "jQe" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/space/basic, /area/space/nearstation) "jQo" = ( @@ -30929,11 +30728,11 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "jQt" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/light{ @@ -30943,7 +30742,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "jQB" = ( /obj/machinery/door/airlock{ @@ -31104,7 +30903,7 @@ "jSk" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/kitchen_cold_room{ +/obj/machinery/airalarm{ dir = 1; pixel_y = 24 }, @@ -31121,10 +30920,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -31157,13 +30956,13 @@ /turf/open/floor/iron/grid/steel, /area/hydroponics) "jSI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "20" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31208,8 +31007,8 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "jTr" = ( /obj/effect/spawner/randomarcade{ @@ -31302,7 +31101,7 @@ pixel_y = 16 }, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/iv_drip, @@ -31431,9 +31230,8 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "jYb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/iron/dark, /area/engine/engine_room) "jYe" = ( @@ -31451,7 +31249,7 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "jYn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 8 }, /turf/open/floor/engine/n2o, @@ -31465,8 +31263,8 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "jZm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -31503,10 +31301,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ @@ -31520,13 +31318,13 @@ name = "MiniSat External Access"; req_one_access_txt = "65;61" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/machinery/door/poddoor/preopen{ id = "AIwindows"; name = "AI View Blast Door" }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "jZL" = ( @@ -31573,10 +31371,10 @@ }, /area/science/lobby) "kaA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31587,7 +31385,7 @@ /area/crew_quarters/heads/captain) "kaD" = ( /obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8; initialize_directions = 8 }, @@ -31598,8 +31396,8 @@ dir = 8 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/lattice/catwalk/over, @@ -31630,17 +31428,28 @@ /turf/open/floor/iron, /area/engine/storage) "kbs" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "kbH" = ( @@ -31685,15 +31494,15 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "keM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/iron/tech, /area/engine/atmos) "keV" = ( @@ -31716,8 +31525,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -31845,10 +31654,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/green{ @@ -31886,10 +31695,10 @@ /area/security/brig) "kht" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -31916,10 +31725,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -31956,7 +31765,7 @@ "khS" = ( /obj/machinery/telecomms/processor/preset_exploration, /obj/machinery/camera/directional/east, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "khT" = ( /obj/structure/disposalpipe/segment{ @@ -32040,13 +31849,13 @@ /turf/open/floor/wood, /area/chapel/office) "kiZ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "kje" = ( @@ -32056,8 +31865,8 @@ /turf/open/floor/wood, /area/security/detectives_office) "kjg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32128,10 +31937,10 @@ alpha = 255; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -32154,10 +31963,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -32171,10 +31980,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -32193,12 +32002,6 @@ /turf/open/floor/iron/dark, /area/security/prison) "kla" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -32234,7 +32037,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "klA" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 8 }, /turf/open/floor/engine/n2o, @@ -32294,14 +32097,13 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "kmq" = ( /obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "server vent" +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, /turf/open/floor/circuit/telecomms/server, /area/science/server) @@ -32359,10 +32161,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -32372,10 +32174,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction, @@ -32398,17 +32200,17 @@ /area/security/brig/dock) "koB" = ( /obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "4-8" }, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) @@ -32484,11 +32286,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -32498,7 +32300,7 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -32527,12 +32329,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/science/shuttledock) "krA" = ( @@ -32545,10 +32341,10 @@ /obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_half_in/green{ @@ -32594,10 +32390,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/green{ @@ -32613,7 +32409,7 @@ icon_state = "1-2" }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -32645,7 +32441,7 @@ /turf/open/floor/plating, /area/bridge) "ksT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -32786,7 +32582,7 @@ /turf/open/floor/iron/dark, /area/storage/tech) "kuR" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /turf/open/floor/iron/tech, @@ -32836,19 +32632,19 @@ /turf/open/floor/plating, /area/security/warden) "kvU" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "kwh" = ( /turf/closed/wall, @@ -32857,10 +32653,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -32874,7 +32670,7 @@ /area/security/main) "kwv" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -32892,9 +32688,9 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, -/area/science/mixing/chamber) +/area/science/mixing) "kwX" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input{ dir = 4 }, /turf/open/floor/engine/vacuum, @@ -32943,10 +32739,10 @@ /turf/open/floor/plating, /area/library) "kxz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -32970,23 +32766,22 @@ /turf/open/floor/plating, /area/crew_quarters/kitchen) "kxQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 8 }, /turf/open/floor/engine/airless, /area/engine/atmos) "kyg" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/engine/atmos) "kyx" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -33002,10 +32797,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -33044,12 +32839,14 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "kzq" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 8 +/obj/effect/turf_decal/box/white, +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "kzB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/structure/cable/yellow{ @@ -33092,13 +32889,13 @@ pixel_y = 16 }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/iron/dark/telecomms{ @@ -33139,7 +32936,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "kBB" = ( /obj/machinery/light/floor, @@ -33162,7 +32959,7 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/engine, /area/science/mixing/chamber) "kCk" = ( @@ -33231,10 +33028,10 @@ /area/crew_quarters/heads/chief) "kCP" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/cyan{ @@ -33302,12 +33099,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "kDW" = ( @@ -33372,10 +33163,10 @@ /turf/open/floor/plating, /area/engine/engine_room) "kFb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/railing/corner{ dir = 4 }, @@ -33428,7 +33219,7 @@ /area/medical/cryo) "kGm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -33464,10 +33255,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -33476,10 +33267,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/purple, @@ -33489,8 +33280,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/mixing) "kHy" = ( @@ -33510,8 +33301,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -33521,7 +33312,7 @@ /turf/open/floor/iron, /area/security/brig) "kIi" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -33529,13 +33320,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "kIj" = ( /obj/structure/closet/secure_closet/personal, @@ -33574,10 +33365,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/purple, @@ -33591,19 +33382,16 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "kJm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/atmos) "kJv" = ( @@ -33634,10 +33422,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -33710,9 +33498,6 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "kKG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ - dir = 6 - }, /obj/effect/decal/cleanable/greenglow, /obj/machinery/light{ bulb_colour = "#22bfa2"; @@ -33767,15 +33552,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -33883,8 +33659,9 @@ /turf/open/space/basic, /area/space) "kOp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1; + hide = 0 }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -33915,11 +33692,11 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hor) "kOM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 6 }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -33931,10 +33708,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -33944,7 +33721,7 @@ /area/hallway/secondary/entry) "kOX" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -34048,8 +33825,8 @@ /turf/open/floor/iron/large, /area/hallway/primary/central) "kRj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -34084,8 +33861,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -34189,10 +33966,10 @@ req_access_txt = "41" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -34223,10 +34000,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -34244,7 +34021,7 @@ /area/science/research) "kTN" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/sepia, @@ -34259,10 +34036,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_edge/purple{ @@ -34274,10 +34051,7 @@ /turf/open/floor/iron, /area/hallway/primary/port) "kUa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron/tech, @@ -34287,10 +34061,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "kUm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable{ @@ -34307,7 +34078,7 @@ /turf/open/floor/iron/grid/steel, /area/hydroponics) "kUF" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -34326,7 +34097,7 @@ /area/maintenance/department/security) "kVm" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 }, /turf/open/space/basic, @@ -34445,8 +34216,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34464,10 +34235,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -34503,10 +34274,10 @@ /turf/open/floor/carpet/red, /area/security/detectives_office) "kYk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/cable/yellow{ @@ -34554,10 +34325,10 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "kYH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -34580,8 +34351,8 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/bridge) "kZj" = ( @@ -34623,10 +34394,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -34642,8 +34413,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/decal/cleanable/blood/footprints{ dir = 4; pixel_x = 6; @@ -34664,10 +34435,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -34683,13 +34454,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "las" = ( /obj/structure/disposalpipe/segment{ @@ -34711,10 +34482,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34768,8 +34539,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34783,7 +34554,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "lbl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -34835,8 +34606,8 @@ /turf/open/floor/plating, /area/engine/supermatter) "lbV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -34858,7 +34629,7 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "lce" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -34888,10 +34659,10 @@ /turf/open/floor/prison, /area/security/prison) "lcG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -34924,19 +34695,16 @@ /turf/open/floor/wood, /area/security/prison) "lef" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "lem" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera/directional/south, @@ -35007,12 +34775,6 @@ name = "Solar Maintenance"; req_one_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "lfC" = ( @@ -35189,8 +34951,8 @@ /obj/effect/turf_decal/tile/green/half{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "lka" = ( @@ -35303,16 +35065,20 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"llo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/atmos) "llp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "lls" = ( @@ -35434,8 +35200,8 @@ /turf/open/floor/engine, /area/science/xenobiology) "lnQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -35453,10 +35219,10 @@ alpha = 180 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/light/small{ @@ -35486,10 +35252,10 @@ req_one_access_txt = "32;48;29" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -35551,8 +35317,8 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -35574,17 +35340,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/tech, /area/engine/engine_room) "lqc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -35610,7 +35373,7 @@ /turf/open/floor/iron/dark, /area/security/brig/dock) "lqk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -35638,8 +35401,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/dark_red/half{ @@ -35821,8 +35584,8 @@ /turf/open/floor/noslip/standard, /area/quartermaster/storage) "ltK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -35837,7 +35600,7 @@ /area/crew_quarters/cryopods) "ltU" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 }, /turf/open/space/basic, @@ -35900,8 +35663,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/lobby) "luD" = ( @@ -35909,8 +35672,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -35999,7 +35762,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -36011,8 +35774,8 @@ /turf/open/floor/iron, /area/medical/medbay/lobby) "lvK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/railing/corner{ dir = 8 }, @@ -36074,12 +35837,12 @@ /area/maintenance/department/bridge) "lxi" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/medical/morgue) "lxk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, @@ -36221,9 +35984,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36270,10 +36030,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -36287,9 +36047,14 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "lBo" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/window/brigdoor{ + dir = 1; + req_one_access_txt = "7;30,29,63" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/circuit/telecomms/server, /area/science/server) "lBr" = ( @@ -36305,8 +36070,8 @@ req_one_access_txt = "46;37" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -36343,10 +36108,10 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction{ @@ -36406,10 +36171,10 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "lCr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark/smooth_large, @@ -36440,20 +36205,14 @@ /turf/open/floor/noslip/standard, /area/security/prison) "lCR" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /turf/open/floor/iron, /area/engine/engineering) "lDa" = ( @@ -36507,7 +36266,6 @@ name = "Atmospherics External Airlock"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/atmos) "lEo" = ( @@ -36533,20 +36291,20 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "lEA" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "lFf" = ( /obj/effect/turf_decal/guideline/guideline_in/neutral{ @@ -36598,8 +36356,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "lGH" = ( @@ -36724,8 +36482,8 @@ /turf/open/floor/plating, /area/bridge) "lJz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -36831,8 +36589,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -36898,10 +36656,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/white, @@ -36925,15 +36683,15 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/heads/hor) "lNN" = ( /turf/open/floor/engine/n2, /area/engine/atmos) "lNS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -36977,7 +36735,7 @@ }, /area/hallway/primary/central) "lOS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/white, @@ -36995,10 +36753,10 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/brown, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -37020,10 +36778,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -37041,13 +36799,13 @@ color = "#edaa0c" }, /obj/item/clothing/gloves/color/black, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "lQp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark, @@ -37111,11 +36869,11 @@ /turf/open/floor/iron, /area/engine/atmos) "lRK" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/space/basic, /area/space/nearstation) "lSa" = ( @@ -37145,7 +36903,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "lTc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -37181,12 +36939,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -37281,10 +37033,10 @@ /area/hallway/primary/port) "lUQ" = ( /obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ - dir = 8 - }, /obj/machinery/rnd/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, /turf/open/floor/circuit/telecomms/server, /area/science/server) "lVm" = ( @@ -37313,8 +37065,8 @@ /turf/open/floor/engine, /area/engine/atmos) "lVB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/blood/old, @@ -37344,10 +37096,10 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/holopad{ @@ -37410,7 +37162,7 @@ /area/science/xenobiology) "lWI" = ( /obj/effect/turf_decal/tile/blue/half, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -37440,10 +37192,10 @@ }, /area/science/research) "lYp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -37490,10 +37242,10 @@ color = "#FFFFFF"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_half_edge/blue{ @@ -37602,8 +37354,8 @@ /turf/open/floor/iron/freezer, /area/security/prison) "maj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -37690,10 +37442,7 @@ /area/crew_quarters/heads/captain) "mbJ" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/white, @@ -37714,10 +37463,10 @@ pixel_x = 1; pixel_y = -31 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/virology/glass{ @@ -37727,20 +37476,20 @@ /turf/open/floor/iron/white, /area/medical/virology) "mbS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "mbT" = ( /obj/effect/turf_decal/tile/blue/half{ @@ -37790,12 +37539,12 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "mcM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -38003,13 +37752,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -38044,8 +37793,8 @@ /obj/effect/turf_decal/tile/green/half{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -38097,10 +37846,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -38177,10 +37926,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -38212,10 +37961,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -38266,14 +38015,14 @@ /turf/open/floor/iron/dark, /area/bridge) "mkS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -38319,7 +38068,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "mlF" = ( @@ -38377,7 +38126,7 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "mmz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/chair{ @@ -38428,8 +38177,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/closet/secure_closet/medical2, /obj/item/clothing/suit/apron/surgical, /turf/open/floor/iron, @@ -38459,7 +38208,7 @@ /obj/structure/urinal{ pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -38488,11 +38237,11 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/box, @@ -38576,10 +38325,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -38592,10 +38341,10 @@ /obj/structure/desk_bell{ pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -38607,8 +38356,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38633,7 +38382,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/mining{ @@ -38641,7 +38390,7 @@ req_access_txt = "41" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/light_switch{ @@ -38652,10 +38401,10 @@ /area/quartermaster/qm) "mqg" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/button/door{ @@ -38716,10 +38465,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -38737,21 +38486,21 @@ /turf/open/floor/iron, /area/hallway/primary/port) "mrL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) "mrM" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -38760,7 +38509,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/science/mixing/chamber) +/area/science/mixing) "msd" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted, /obj/item/ammo_casing/spent, @@ -38773,8 +38522,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -38795,8 +38544,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/department/security) "msM" = ( @@ -38818,10 +38567,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -38872,8 +38621,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_half_edge/purple{ dir = 1 }, @@ -38889,7 +38638,7 @@ }, /area/science/research) "mtO" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -38916,10 +38665,10 @@ /area/medical/storage) "mui" = ( /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -39036,10 +38785,10 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "mwz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -39065,10 +38814,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/table, /obj/item/paper/pamphlet/ruin/spacehotel{ pixel_x = -3; @@ -39093,7 +38842,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "mxd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/box/corners{ dir = 8; pixel_x = 15; @@ -39127,10 +38876,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron, @@ -39154,11 +38903,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/science/shuttledock) @@ -39170,8 +38916,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "myU" = ( @@ -39185,8 +38931,8 @@ }, /obj/effect/turf_decal/tile/blue/half, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/storage) "mzr" = ( @@ -39196,10 +38942,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor, @@ -39222,10 +38968,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "mzx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39265,8 +39011,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, @@ -39293,7 +39039,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron/dark, @@ -39319,12 +39065,12 @@ /turf/open/floor/wood, /area/library) "mBh" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "mBi" = ( @@ -39346,17 +39092,21 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "mBn" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer2{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/volume_pump, /obj/structure/cable{ icon_state = "1-4" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "mBq" = ( @@ -39405,7 +39155,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ dir = 4 }, /turf/open/floor/plating, @@ -39455,10 +39205,10 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39474,7 +39224,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/security/brig) @@ -39496,10 +39246,10 @@ /obj/effect/turf_decal/guideline/guideline_edge/brown{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -39533,7 +39283,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "mDH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -39564,8 +39314,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=4-CenterNW"; location = "3-Tools" @@ -39588,15 +39338,9 @@ /obj/effect/turf_decal/guideline/guideline_edge/yellow{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/iron, /area/engine/engineering) "mEI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -39655,7 +39399,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/brown/half{ @@ -39726,10 +39470,10 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/department/medical/morgue) "mGo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39753,15 +39497,13 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "mGB" = ( @@ -39784,10 +39526,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "mGF" = ( @@ -39834,10 +39574,10 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "mHh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -39905,10 +39645,10 @@ /obj/effect/turf_decal/guideline/guideline_edge/brown{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron, @@ -40019,8 +39759,8 @@ /area/hallway/primary/central) "mJb" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -40071,7 +39811,7 @@ pixel_x = -11; pixel_y = 22 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -40125,8 +39865,8 @@ /area/ai_monitored/storage/eva) "mKS" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -40154,10 +39894,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/landmark/blobstart, @@ -40230,10 +39970,10 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -40358,10 +40098,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -40391,10 +40131,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/white, @@ -40415,8 +40155,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_half_edge/green{ color = "#439C1E"; dir = 6 @@ -40491,15 +40231,15 @@ req_access = null; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "mRK" = ( @@ -40510,8 +40250,8 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/guideline/guideline_edge/blue, /turf/open/floor/iron, @@ -40542,18 +40282,14 @@ /area/hallway/primary/starboard) "mSp" = ( /obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/item/t_scanner, /obj/item/t_scanner, /obj/item/storage/belt/utility, /obj/item/t_scanner, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "mSs" = ( /obj/effect/turf_decal/stripes/line{ @@ -40612,8 +40348,8 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/box, /turf/open/floor/iron, /area/crew_quarters/heads/hor) @@ -40639,7 +40375,6 @@ name = "Engineering External Access"; req_one_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/engine_room) "mTD" = ( @@ -40705,8 +40440,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -40716,8 +40451,8 @@ /area/hallway/secondary/entry) "mUn" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -40744,10 +40479,10 @@ /obj/effect/turf_decal/guideline/guideline_in/green{ color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -40801,7 +40536,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -40828,8 +40563,8 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -40857,10 +40592,10 @@ alpha = 180 }, /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -40886,10 +40621,10 @@ /turf/open/floor/catwalk_floor, /area/maintenance/port/central) "mWT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -40903,12 +40638,6 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "mXa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -40917,6 +40646,12 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "mXh" = ( @@ -40927,8 +40662,8 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "mXi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "mXj" = ( @@ -40940,17 +40675,16 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "mXk" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/engine/supermatter" + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "0-4" }, /turf/open/floor/iron/dark, /area/engine/engine_room) @@ -41056,8 +40790,8 @@ }, /area/medical/sleeper) "mYT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -41208,10 +40942,10 @@ /area/hallway/primary/central) "ncf" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/table/glass, @@ -41321,19 +41055,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "nes" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -41367,8 +41095,8 @@ /turf/open/floor/iron, /area/hydroponics) "neS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/security/glass{ name = "Prisoner Dock"; req_access_txt = "1" @@ -41416,16 +41144,16 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "nfk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "nfH" = ( @@ -41471,10 +41199,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -41483,12 +41211,10 @@ /turf/open/floor/iron/white, /area/science/lobby) "ngR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/floor{ - pixel_y = 16 - }, -/turf/open/floor/iron/tech, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/turf/open/floor/iron, /area/engine/engine_room) "nhf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -41504,12 +41230,9 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "nhg" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41549,10 +41272,10 @@ name = "EVA"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -41579,8 +41302,8 @@ }, /area/hallway/primary/central) "nhQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 4 }, @@ -41592,10 +41315,10 @@ /turf/closed/wall/r_wall, /area/science/test_area) "nir" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, /obj/structure/chair{ @@ -41620,7 +41343,7 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -41638,10 +41361,8 @@ /turf/open/floor/wood, /area/vacant_room/office) "niS" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 1 - }, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /turf/open/floor/plating, /area/engine/atmospherics_engine) "niY" = ( @@ -41651,10 +41372,10 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "nju" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -41674,10 +41395,10 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "njM" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/navbeacon{ @@ -41746,10 +41467,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -41775,7 +41496,7 @@ /turf/closed/wall/r_wall, /area/security/detectives_office) "nlu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -41815,19 +41536,22 @@ /turf/open/space/basic, /area/space/nearstation) "nlM" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "nlR" = ( /obj/effect/landmark/start/station_engineer, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/storage) "nlW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -41902,10 +41626,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "nmq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/cable/yellow{ @@ -41943,16 +41667,16 @@ dir = 9 }, /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/grid/steel, /area/hydroponics) "nnr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/mapping_helpers/tile_breaker, @@ -41978,7 +41702,7 @@ /turf/closed/wall, /area/quartermaster/storage) "nnF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/firealarm/directional/west, @@ -42058,7 +41782,7 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "npQ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/machinery/meter, @@ -42066,7 +41790,7 @@ /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "nqe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -42084,8 +41808,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "nqX" = ( @@ -42109,7 +41833,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "nrd" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -42176,10 +41900,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -42195,10 +41919,10 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -42238,8 +41962,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=23-EHall"; location = "22-Kitchen" @@ -42258,13 +41982,13 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/box, @@ -42282,8 +42006,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -42341,10 +42065,10 @@ }, /area/hallway/secondary/exit/departure_lounge) "ntn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -42382,10 +42106,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -42405,10 +42129,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -42436,8 +42160,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/cafeteria) "nuw" = ( @@ -42477,10 +42201,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -42520,10 +42244,10 @@ icon_state = "1-4" }, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/catwalk_floor, @@ -42536,8 +42260,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -42559,7 +42283,7 @@ id = "teleshutter"; name = "Teleporter Access Shutter" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -42573,15 +42297,15 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "nxQ" = ( @@ -42602,28 +42326,16 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "nxW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/science/xenobiology) -"nyb" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ - alpha = 230; - color = "#edaa0c" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron, -/area/engine/engine_room) "nyz" = ( /obj/structure/railing{ dir = 1 @@ -42667,8 +42379,8 @@ dir = 4; id = "packageSort2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -42716,10 +42428,10 @@ alpha = 180; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -42839,8 +42551,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -42898,18 +42610,14 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) "nCg" = ( -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ - alpha = 200; - color = "#267878" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/turf/open/floor/iron/dark, +/area/quartermaster/miningdock) "nCn" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -42958,10 +42666,10 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/green, @@ -42970,7 +42678,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -43000,12 +42708,12 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "nDD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/machinery/light/floor, @@ -43069,7 +42777,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ @@ -43081,15 +42789,15 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "nEF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/railing/corner{ dir = 1 }, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "nFj" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 4 }, /turf/open/floor/engine/n2, @@ -43109,16 +42817,16 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "nFA" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/closed/wall/r_wall, @@ -43155,10 +42863,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -43177,8 +42885,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43195,7 +42903,7 @@ /turf/open/floor/iron, /area/engine/atmos) "nGG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -43243,10 +42951,10 @@ /turf/open/floor/iron/dark, /area/security/main) "nHw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/lattice/catwalk/over, @@ -43272,7 +42980,7 @@ /turf/open/floor/engine, /area/security/nuke_storage) "nHQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -43280,7 +42988,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -43293,10 +43001,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -43341,7 +43049,7 @@ name = "Solitary confinement timer"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -43397,9 +43105,9 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "nJT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /obj/machinery/firealarm/directional/east, @@ -43446,8 +43154,8 @@ /obj/structure/desk_bell{ pixel_x = -8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/paper_bin{ pixel_x = 7; pixel_y = 2 @@ -43487,8 +43195,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/generic, /obj/effect/turf_decal/guideline/guideline_tri/purple{ dir = 8 @@ -43508,8 +43216,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair{ @@ -43547,10 +43255,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -43587,10 +43295,10 @@ /obj/effect/turf_decal/tile/neutral/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -43606,18 +43314,18 @@ /obj/effect/turf_decal/caution{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/bridge) "nOJ" = ( @@ -43676,10 +43384,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -43707,16 +43415,16 @@ /area/hallway/primary/port) "nQm" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/atmos) "nQt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark/side{ @@ -43736,8 +43444,8 @@ /area/science/xenobiology) "nQF" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -43784,12 +43492,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, @@ -43802,8 +43504,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half{ dir = 1 }, @@ -43838,19 +43540,20 @@ }, /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/iron, /area/engine/storage) "nSe" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -43996,8 +43699,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -44056,10 +43757,10 @@ /turf/open/floor/grass, /area/hallway/primary/central) "nVS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -44109,8 +43810,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "nXb" = ( @@ -44127,8 +43828,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/science/server) "nXr" = ( @@ -44136,7 +43835,7 @@ dir = 4 }, /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44217,11 +43916,11 @@ /turf/open/floor/iron, /area/ai_monitored/security/armory) "nYt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, @@ -44250,7 +43949,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /turf/open/floor/iron/dark, /area/engine/atmos) "nYQ" = ( @@ -44311,10 +44010,10 @@ /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) "oaT" = ( @@ -44410,12 +44109,6 @@ /turf/open/floor/engine/o2, /area/engine/atmos) "ocl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -44428,6 +44121,12 @@ pixel_y = 16 }, /obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "ocD" = ( @@ -44453,7 +44152,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -44473,8 +44172,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted{ alpha = 140; color = "#FFFFF" @@ -44516,10 +44215,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "oeh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -44533,7 +44232,6 @@ dir = 1; req_access = null }, -/obj/machinery/advanced_airlock_controller/directional/west, /turf/open/floor/iron, /area/quartermaster/miningdock) "oeo" = ( @@ -44551,10 +44249,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -44577,10 +44275,10 @@ /area/science/research) "oeL" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron/tech, /area/engine/engine_room) "oeW" = ( @@ -44606,8 +44304,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, @@ -44649,7 +44347,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "ogm" = ( @@ -44661,10 +44359,10 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -44691,7 +44389,7 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -44738,10 +44436,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -44826,8 +44524,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = -25; pixel_y = 5 @@ -44877,8 +44575,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "ojh" = ( @@ -44907,10 +44605,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -44945,8 +44643,8 @@ pixel_x = 5; pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -44988,16 +44686,16 @@ /turf/open/floor/noslip/standard, /area/quartermaster/miningdock) "oll" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/cyan{ icon_state = "0-2" }, /obj/effect/turf_decal/stripes/end, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "olv" = ( @@ -45030,10 +44728,10 @@ /turf/open/floor/grass, /area/hallway/primary/central) "olR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -45049,17 +44747,21 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/white, /area/science/lobby) "omg" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/dark/telecomms{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, @@ -45070,7 +44772,7 @@ color = "#edaa0c" }, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/color/yellow, /turf/open/floor/iron/dark, @@ -45148,10 +44850,10 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "ooT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/medical/morgue) "ooY" = ( @@ -45166,7 +44868,7 @@ /turf/open/floor/iron/white, /area/medical/surgery) "ooZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -45217,8 +44919,8 @@ dir = 1 }, /obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/blue{ dir = 1 }, @@ -45234,10 +44936,10 @@ /turf/open/floor/iron/dark, /area/chapel/main) "oqg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -45281,10 +44983,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/item/storage/backpack{ @@ -45309,6 +45011,12 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "org" = ( @@ -45322,8 +45030,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "orV" = ( @@ -45432,7 +45140,7 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "ott" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -45471,8 +45179,6 @@ }, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/storage) "otP" = ( @@ -45628,10 +45334,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/holopad{ @@ -45688,10 +45394,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_half_edge/blue{ @@ -45705,10 +45411,10 @@ /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "oxF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -45737,10 +45443,10 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) "oym" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -45769,7 +45475,7 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "ozx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -45779,10 +45485,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -45913,28 +45619,28 @@ /turf/open/floor/plating, /area/maintenance/disposal) "oCV" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/stripes/corner, /obj/item/radio/intercom{ pixel_x = 33; pixel_y = -3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "oCW" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "oDk" = ( /obj/effect/decal/cleanable/dirt, @@ -46021,10 +45727,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "oEG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -46056,7 +45762,7 @@ /turf/open/floor/iron/dark, /area/security/brig/dock) "oFY" = ( -/obj/machinery/air_sensor/atmos/plasma_tank, +/obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/engine/atmos) "oGm" = ( @@ -46067,8 +45773,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 }, /turf/open/floor/engine, /area/engine/atmos) @@ -46099,7 +45805,7 @@ /turf/open/floor/wood, /area/security/prison) "oGJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -46138,10 +45844,10 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "oGS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -46190,10 +45896,10 @@ /turf/open/floor/circuit/telecomms/server, /area/science/xenobiology) "oId" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -46208,10 +45914,10 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/catwalk_floor, @@ -46223,7 +45929,7 @@ /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "oIB" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /turf/open/floor/iron/white, @@ -46235,8 +45941,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -46258,6 +45964,15 @@ pixel_y = 16 }, /obj/effect/turf_decal/box, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/iron, /area/engine/storage) "oJi" = ( @@ -46267,10 +45982,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -46293,8 +46008,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "oJI" = ( @@ -46366,7 +46081,7 @@ /turf/open/floor/wood, /area/security/detectives_office) "oKE" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/holopad{ pixel_y = 16 }, @@ -46409,24 +46124,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/tech, /area/engine/engine_room) "oLv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/carpet/purple, /area/chapel/main) "oLA" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/plating, /area/science/server) "oLB" = ( @@ -46505,7 +46216,7 @@ /turf/open/floor/iron/dark, /area/storage/primary) "oMq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -46515,13 +46226,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ alpha = 180; dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light_switch{ @@ -46562,11 +46273,11 @@ /turf/open/floor/iron, /area/security/brig) "oMV" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -46600,9 +46311,6 @@ }, /obj/effect/landmark/start/head_of_personnel, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/carpet/blue, @@ -46711,10 +46419,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "oON" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -46726,10 +46434,10 @@ /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "oPd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -46753,10 +46461,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -46792,10 +46500,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "oQg" = ( @@ -46829,7 +46537,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -46865,14 +46573,14 @@ /turf/closed/wall, /area/crew_quarters/kitchen) "oQI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/plating, /area/maintenance/department/bridge) @@ -46880,10 +46588,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -46896,8 +46604,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=8-WSci"; location = "7-Mining" @@ -46945,10 +46653,10 @@ /turf/open/floor/carpet, /area/quartermaster/exploration_prep) "oRo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ @@ -46959,7 +46667,7 @@ /turf/open/floor/plating, /area/maintenance/central) "oRw" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -46967,16 +46675,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "oRP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark/smooth_large, @@ -47031,10 +46739,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -47044,8 +46752,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -47153,19 +46861,16 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "oUy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/table, @@ -47193,16 +46898,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/structure/closet/secure_closet/atmospherics{ anchored = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/light/directional/south, @@ -47251,10 +46956,10 @@ /turf/open/floor/iron/techmaint, /area/engine/gravity_generator) "oVx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "oVz" = ( @@ -47277,10 +46982,10 @@ "oVB" = ( /obj/machinery/light/small, /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -47317,20 +47022,14 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/aft) "oWm" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/light, @@ -47376,7 +47075,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -47394,13 +47093,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "oXv" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "N2O to Pure" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron, /area/engine/atmos) "oXG" = ( @@ -47436,11 +47135,11 @@ /turf/open/floor/iron/half, /area/hallway/primary/central) "oYk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/light_switch{ pixel_x = 21 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/chapel/office) "oYr" = ( @@ -47456,7 +47155,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/science/mixing/chamber) +/area/science/mixing) "oYy" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -47506,7 +47205,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -47538,8 +47237,8 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -47599,7 +47298,7 @@ /turf/open/floor/iron, /area/medical/chemistry) "paa" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "pab" = ( @@ -47648,10 +47347,10 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -47693,10 +47392,10 @@ /turf/open/space/basic, /area/space) "paR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -47752,9 +47451,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /turf/open/floor/iron/white, @@ -47785,7 +47484,7 @@ pixel_x = -6; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/bot, @@ -47822,19 +47521,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/glass/reinforced, /area/hallway/primary/central) -"pdv" = ( -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig/dock) "pdT" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/central) @@ -47876,10 +47562,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -47975,10 +47661,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -48067,8 +47753,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -48109,10 +47795,10 @@ /area/engine/engine_room) "pix" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -48214,12 +47900,6 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/holopad{ pixel_x = 16; pixel_y = 16 @@ -48230,6 +47910,10 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -48274,10 +47958,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "pkd" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -48360,13 +48044,6 @@ dir = 4 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/iron, /area/hallway/secondary/entry) "plH" = ( @@ -48422,18 +48099,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/engine/engine_room) "pmQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /turf/open/floor/iron/white, @@ -48478,6 +48155,12 @@ /area/engine/engineering) "pnz" = ( /obj/effect/turf_decal/box/white, +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/rnd/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/circuit/telecomms/server, /area/science/server) "pod" = ( @@ -48526,10 +48209,10 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -48553,10 +48236,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -48571,8 +48254,8 @@ "poU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -48639,10 +48322,10 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -48703,8 +48386,8 @@ /turf/open/floor/iron/dark, /area/security/prison/shielded) "psm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -48785,12 +48468,6 @@ /area/maintenance/department/bridge) "pun" = ( /obj/structure/tank_dispenser/oxygen, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/security/brig/dock) "puq" = ( @@ -48802,16 +48479,19 @@ dir = 1 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/security/checkpoint/escape) "puG" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48851,7 +48531,7 @@ /area/chapel/office) "pva" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -48876,7 +48556,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ @@ -48977,7 +48657,7 @@ /turf/open/floor/prison, /area/security/prison) "pxB" = ( -/obj/machinery/air_sensor/atmos/carbon_tank, +/obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, /area/engine/atmos) "pxM" = ( @@ -48992,7 +48672,7 @@ pixel_x = -5 }, /obj/item/geiger_counter, -/obj/machinery/airalarm/engine{ +/obj/machinery/airalarm{ dir = 8; pixel_x = -23 }, @@ -49007,10 +48687,10 @@ icon_state = "snake"; name = "Hugel" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -49020,7 +48700,7 @@ /area/security/prison) "pyp" = ( /obj/structure/grille, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space/nearstation) "pyt" = ( /obj/structure/table, @@ -49064,8 +48744,8 @@ /turf/open/floor/plating, /area/security/courtroom) "pzH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -49167,16 +48847,10 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/trunk{ - dir = 4 + dir = 1 }, /turf/open/floor/iron, /area/engine/storage) @@ -49192,10 +48866,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "pBg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark/corner{ @@ -49240,7 +48914,7 @@ /turf/open/floor/iron/tech/grid, /area/engine/engineering) "pBG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, /turf/open/floor/iron/tech, @@ -49250,14 +48924,14 @@ /turf/open/floor/iron, /area/maintenance/central) "pCu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ dir = 4 }, /turf/open/floor/engine/o2, /area/engine/atmos) "pCI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -49276,7 +48950,7 @@ pixel_y = -8 }, /obj/item/kirbyplants/random, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "pCW" = ( /obj/effect/turf_decal/stripes/line, @@ -49290,8 +48964,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/stairs/medium, /area/chapel/main) "pDE" = ( @@ -49334,13 +49008,13 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "pEi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/decal/cleanable/vomit, @@ -49427,10 +49101,10 @@ "pFb" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -49481,8 +49155,8 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "pGg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -49495,7 +49169,7 @@ /turf/open/floor/iron, /area/science/mixing) "pGp" = ( -/obj/machinery/air_sensor/atmos/mix_tank, +/obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/airless, /area/engine/atmos) "pGt" = ( @@ -49580,10 +49254,10 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "pHU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark/corner, @@ -49619,8 +49293,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/item/book/manual/wiki/sopcommand, /obj/structure/disposalpipe/segment{ dir = 2 @@ -49735,10 +49409,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "pJr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -49806,10 +49480,10 @@ /area/science/xenobiology) "pKL" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -49869,9 +49543,6 @@ /turf/open/floor/wood, /area/library) "pLM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -49881,6 +49552,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "pLN" = ( @@ -49916,7 +49591,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, /obj/machinery/meter, @@ -49935,7 +49610,7 @@ /area/medical/sleeper) "pMQ" = ( /obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/circuit/telecomms/server, /area/science/server) "pNy" = ( @@ -49962,10 +49637,10 @@ /area/engine/atmospherics_engine) "pNF" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -49974,7 +49649,7 @@ /turf/open/floor/prison, /area/security/prison) "pNR" = ( -/obj/machinery/air_sensor/atmos/nitrogen_tank, +/obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/engine/atmos) "pOc" = ( @@ -49995,8 +49670,8 @@ /area/hallway/primary/fore) "pOp" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50019,14 +49694,14 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "pOL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/closed/wall/r_wall, /area/science/mixing/chamber) "pOX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -50046,10 +49721,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -50072,8 +49747,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -50084,7 +49759,7 @@ /area/medical/surgery) "pPz" = ( /obj/effect/turf_decal/guideline/guideline_edge/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -50097,10 +49772,10 @@ /area/science/storage) "pPY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50119,15 +49794,8 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/aft) "pQu" = ( -/obj/machinery/advanced_airlock_controller/directional/north, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/aisat_interior) +/turf/open/floor/iron, +/area/hallway/secondary/entry) "pQV" = ( /obj/machinery/computer/xenoartifact_console{ dir = 8 @@ -50148,9 +49816,8 @@ /turf/open/floor/iron, /area/science/explab) "pQZ" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 4; - initialize_directions = 4 +/obj/machinery/cryo_cell{ + dir = 4 }, /obj/effect/turf_decal/bot, /obj/machinery/light{ @@ -50183,6 +49850,7 @@ pixel_x = 32; pixel_y = -3 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/circuit/telecomms/server, /area/science/server) "pRA" = ( @@ -50228,8 +49896,8 @@ dir = 2 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -50266,17 +49934,17 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "pSf" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -50418,10 +50086,10 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -50454,8 +50122,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -50479,10 +50147,10 @@ /turf/open/floor/iron, /area/security/brig) "pUv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -50521,10 +50189,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -50547,10 +50215,10 @@ /turf/open/floor/iron, /area/science/lab) "pVM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -50593,7 +50261,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "pWY" = ( /obj/effect/landmark/start/chemist, @@ -50623,10 +50291,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -50701,8 +50369,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -50740,10 +50408,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/green{ @@ -50756,8 +50424,8 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "pZc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "4" @@ -50782,10 +50450,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "pZF" = ( @@ -50793,10 +50461,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -50814,9 +50482,6 @@ /turf/open/floor/wood, /area/maintenance/central) "pZU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, /obj/item/stack/sheet/mineral/plasma/fifty, @@ -50848,7 +50513,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/iron/tech, @@ -50928,8 +50593,8 @@ /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -50963,9 +50628,6 @@ /obj/effect/turf_decal/guideline/guideline_tri/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /turf/open/floor/iron, /area/engine/engineering) "qbO" = ( @@ -50989,10 +50651,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/red, @@ -51004,8 +50666,8 @@ /turf/open/floor/iron, /area/maintenance/department/science) "qcl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -51013,10 +50675,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "qcz" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -51055,10 +50717,10 @@ /turf/open/space/basic, /area/ai_monitored/turret_protected/ai) "qcM" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/engine/engine_room) "qde" = ( @@ -51099,8 +50761,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/department/security) "qea" = ( @@ -51125,17 +50787,26 @@ }, /area/medical/sleeper) "qek" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/tech, -/area/engine/engine_room) +/obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/engine/storage) "qeu" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/airlock/security/glass{ @@ -51151,14 +50822,14 @@ /turf/open/floor/iron, /area/security/checkpoint/auxiliary) "qeG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 6 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ @@ -51170,10 +50841,10 @@ /turf/open/floor/iron, /area/engine/engineering) "qeL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -51217,12 +50888,6 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /turf/open/floor/iron/dark, /area/security/brig/dock) "qgr" = ( @@ -51239,7 +50904,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ pixel_x = 33; @@ -51307,8 +50972,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -51322,12 +50987,7 @@ }, /area/maintenance/starboard/aft) "qiW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "qiZ" = ( @@ -51374,10 +51034,10 @@ }, /area/medical/genetics/cloning) "qjY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, /turf/open/floor/iron/tech, /area/engine/atmos) "qks" = ( @@ -51408,14 +51068,14 @@ /turf/open/floor/iron/white, /area/medical/genetics) "qkx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -51510,10 +51170,10 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hos) "qmO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -51543,16 +51203,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/service) "qnr" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "O2 to Pure" @@ -51582,7 +51242,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /turf/open/floor/iron/white, @@ -51607,7 +51267,7 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/box, @@ -51626,10 +51286,10 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -51733,7 +51393,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "qpA" = ( /obj/effect/turf_decal/siding/wideplating/dark, @@ -51744,10 +51404,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -51792,15 +51452,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "qrt" = ( @@ -51820,10 +51471,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -51863,8 +51514,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/white, @@ -51921,14 +51572,14 @@ }, /area/maintenance/department/engine) "qtB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_half_in/darkblue{ dir = 4 }, @@ -51997,8 +51648,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron, /area/crew_quarters/cafeteria) @@ -52060,13 +51711,6 @@ dir = 8 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller/directional/north, /obj/structure/cable{ icon_state = "4-8" }, @@ -52102,7 +51746,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /obj/machinery/portable_thermomachine, @@ -52140,10 +51784,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -52156,10 +51800,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -52167,8 +51811,8 @@ /area/medical/surgery) "qxK" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -52180,12 +51824,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/engine/engine_room) "qxZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/machinery/light{ @@ -52197,10 +51841,10 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "qyo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -52275,10 +51919,10 @@ alpha = 140; color = "#FFFFF" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -52306,13 +51950,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/brown/half{ @@ -52383,10 +52027,10 @@ /turf/open/floor/iron, /area/science/mixing) "qBR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -52407,7 +52051,7 @@ }, /area/medical/genetics/cloning) "qBW" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -52479,10 +52123,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/green{ @@ -52540,8 +52184,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "qDc" = ( @@ -52585,10 +52229,10 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "qEf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -52614,10 +52258,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/green{ @@ -52645,8 +52289,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, @@ -52682,6 +52326,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "qEZ" = ( @@ -52702,10 +52349,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -52756,8 +52403,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "qGG" = ( @@ -52819,8 +52466,6 @@ name = "Atmospherics External Airlock"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/engine/atmos) "qIp" = ( @@ -52861,12 +52506,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/crew_quarters/heads/hop) "qJC" = ( @@ -52888,7 +52527,7 @@ /turf/open/floor/plating, /area/medical/exam_room) "qJI" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 9 }, /obj/item/kirbyplants/random, @@ -52901,7 +52540,7 @@ /area/solar/port/fore) "qJT" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "qKa" = ( @@ -52909,10 +52548,10 @@ /turf/open/floor/grass, /area/hallway/primary/central) "qKg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/computer/security, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, @@ -52937,8 +52576,8 @@ /area/quartermaster/storage) "qKB" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -52954,10 +52593,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/light_switch{ @@ -53026,10 +52665,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, @@ -53076,7 +52715,7 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "qMM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -53114,18 +52753,18 @@ req_access_txt = "27" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "qOl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "qOm" = ( /obj/structure/table, @@ -53168,8 +52807,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/lobby) "qPp" = ( @@ -53204,10 +52843,6 @@ /obj/effect/decal/cleanable/food/plant_smudge, /turf/open/floor/iron, /area/hydroponics) -"qPO" = ( -/obj/structure/sign/warning/nosmoking/circle, -/turf/closed/wall, -/area/engine/engine_room) "qPU" = ( /obj/machinery/light_switch{ pixel_y = -20 @@ -53233,12 +52868,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "qQT" = ( @@ -53258,6 +52887,12 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/robotics/mechbay) "qRe" = ( @@ -53385,25 +53020,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -26 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plating, /area/engine/atmospherics_engine) "qTn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/table, @@ -53487,8 +53110,8 @@ /turf/open/floor/iron, /area/gateway) "qUt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/navbeacon{ @@ -53499,8 +53122,8 @@ /area/hallway/primary/central) "qUv" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -53527,10 +53150,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -53575,12 +53198,11 @@ name = "Server Room"; req_access_txt = "61" }, -/obj/machinery/door/firedoor, /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 }, @@ -53593,8 +53215,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engine_room) "qWg" = ( @@ -53604,16 +53224,16 @@ /turf/open/floor/plating, /area/maintenance/department/science) "qWi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "qWm" = ( /obj/structure/sign/departments/minsky/engineering/engineering, @@ -53666,7 +53286,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -53675,7 +53295,7 @@ /obj/effect/turf_decal/guideline/guideline_in/green{ color = "#439C1E" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/dark_green/half{ @@ -53730,8 +53350,8 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "qXS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -53741,18 +53361,16 @@ /turf/open/floor/carpet, /area/library) "qXU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "qYf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/light/small{ @@ -53765,16 +53383,19 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "qYC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -53799,16 +53420,14 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "qYR" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow, /turf/open/floor/iron/dark, /area/science/server) "qYY" = ( @@ -53831,20 +53450,20 @@ /turf/open/floor/iron, /area/medical/break_room) "qYZ" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/tech, /area/engine/atmos) "qZa" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/machinery/holopad{ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/box, @@ -53854,8 +53473,8 @@ /turf/open/floor/iron/dark, /area/quartermaster/qm) "qZB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -53900,8 +53519,8 @@ name = "Medbay"; req_one_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 @@ -53960,8 +53579,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig/dock) "rbi" = ( @@ -54048,7 +53667,7 @@ /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) "rcw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -54111,8 +53730,8 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54130,20 +53749,14 @@ /turf/open/floor/iron/white, /area/science/research) "rdu" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/space/basic, /area/space/nearstation) "rdx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -54153,10 +53766,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/machinery/firealarm/directional/west, @@ -54356,8 +53969,8 @@ /turf/open/floor/wood, /area/library) "rhj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -54456,19 +54069,13 @@ /obj/effect/turf_decal/guideline/guideline_tri/yellow{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /turf/open/floor/iron, /area/engine/engineering) "rij" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -54490,23 +54097,18 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, /turf/open/floor/iron, /area/quartermaster/qm) "rjk" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig/dock) +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "rjl" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180; @@ -54520,18 +54122,18 @@ /area/security/checkpoint/auxiliary) "rjH" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "rjX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -54543,13 +54145,13 @@ /turf/open/floor/iron/white, /area/science/lab) "rkf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "rki" = ( @@ -54632,7 +54234,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -54641,10 +54243,10 @@ /turf/open/floor/iron/dark, /area/storage/tech) "rlB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_half_edge/purple{ @@ -54682,13 +54284,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/engine/engine_room) "rmH" = ( @@ -54696,13 +54298,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -54716,11 +54318,11 @@ /turf/open/floor/iron, /area/security/brig) "rmV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron/dark/side{ dir = 1 @@ -54771,7 +54373,7 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -54779,6 +54381,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "rnY" = ( @@ -54832,10 +54435,10 @@ color = "#DE3A3A" }, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -54867,10 +54470,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -54900,10 +54503,10 @@ /turf/open/floor/iron, /area/security/brig) "rpJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -54938,6 +54541,14 @@ /obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron, /area/medical/apothecary) +"rpZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "rqd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54969,7 +54580,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -54988,7 +54599,7 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "rqm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -55054,10 +54665,10 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -55069,22 +54680,17 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "rrP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -55112,23 +54718,15 @@ color = "#267878"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/hallway/secondary/entry) "rsc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1; + hide = 0 }, -/turf/open/floor/iron/tech, +/turf/open/floor/iron, /area/engine/engine_room) "rsw" = ( /obj/structure/cable/yellow{ @@ -55170,8 +54768,8 @@ /turf/open/floor/iron/grid/steel, /area/medical/sleeper) "rtt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/construction/mining/aux_base) "rtY" = ( @@ -55203,7 +54801,7 @@ pixel_x = 16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -55233,10 +54831,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/chair{ @@ -55251,10 +54849,10 @@ /obj/machinery/door/airlock/grunge{ name = "Court Lounge" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ @@ -55268,9 +54866,6 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /turf/open/floor/iron/tech, /area/engine/engine_room) "rvv" = ( @@ -55290,10 +54885,10 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) "rvH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/airlock/public/glass{ @@ -55333,9 +54928,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, @@ -55361,8 +54953,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -55378,8 +54970,8 @@ /turf/open/floor/iron, /area/engine/atmospherics_engine) "rwU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -55390,7 +54982,7 @@ /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "rxw" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; @@ -55455,12 +55047,6 @@ name = "MiniSat External Access"; req_one_access_txt = "65;61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "ryi" = ( @@ -55527,15 +55113,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/department/bridge) "rzS" = ( @@ -55598,22 +55181,22 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal) "rAL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "rAN" = ( /obj/structure/extinguisher_cabinet{ @@ -55755,10 +55338,10 @@ dir = 8 }, /obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -55810,10 +55393,10 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "rDB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/green, @@ -55898,7 +55481,7 @@ icon_state = "1-2" }, /obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -55922,10 +55505,10 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "rEu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ @@ -55980,8 +55563,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/cafeteria) @@ -55994,10 +55577,22 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "rFN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + alpha = 180 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, /area/engine/storage) "rFR" = ( /obj/structure/window/reinforced, @@ -56008,11 +55603,11 @@ /turf/open/floor/grass/no_border, /area/hallway/secondary/exit/departure_lounge) "rGd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/iron/tech, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "rGf" = ( /obj/structure/window/reinforced{ @@ -56049,18 +55644,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/brig/dock) "rGU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/machinery/firealarm/directional/west{ pixel_y = -2 }, @@ -56073,6 +55661,7 @@ pixel_y = 10 }, /obj/machinery/camera/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/grid/steel, /area/medical/virology) "rHa" = ( @@ -56130,10 +55719,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_edge/purple, @@ -56154,15 +55743,10 @@ /area/library) "rIo" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - areastring = "/area/engine/supermatter" - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" + dir = 8 }, -/turf/open/floor/iron/dark, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/tech, /area/engine/engine_room) "rIt" = ( /obj/machinery/portable_atmospherics/pump, @@ -56178,13 +55762,13 @@ /turf/open/floor/iron/white, /area/security/brig/medbay) "rIN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "rIQ" = ( @@ -56196,10 +55780,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -56209,18 +55793,18 @@ /area/ai_monitored/turret_protected/aisat/foyer) "rJv" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, /turf/open/floor/iron/white, /area/medical/sleeper) "rJD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -56245,8 +55829,8 @@ req_access_txt = "1" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -56332,15 +55916,13 @@ name = "Engineering External Access"; req_one_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/engine/engine_room) "rLX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light, @@ -56425,8 +56007,8 @@ /turf/open/floor/iron/dark, /area/medical/genetics) "rOz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 @@ -56496,7 +56078,7 @@ /turf/open/floor/iron/dark, /area/security/prison) "rPf" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -56581,10 +56163,10 @@ /area/space/nearstation) "rRL" = ( /obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/engine/storage) "rRY" = ( @@ -56616,10 +56198,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -56660,8 +56242,6 @@ }, /area/hallway/secondary/exit/departure_lounge) "rSS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "4-8" }, @@ -56676,10 +56256,10 @@ /obj/effect/turf_decal/guideline/guideline_edge/brown{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -56689,12 +56269,12 @@ name = "MiniSat Maintenance"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/firedoor, /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/turretid{ @@ -56723,19 +56303,19 @@ /turf/open/floor/noslip/standard, /area/quartermaster/miningdock) "rTS" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "rTU" = ( /obj/effect/decal/cleanable/dirt, @@ -56778,7 +56358,7 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/light_switch{ pixel_x = 21; pixel_y = -21 @@ -56808,10 +56388,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -56836,9 +56416,6 @@ /turf/closed/wall, /area/medical/storage) "rVg" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, /obj/effect/decal/cleanable/blood/old, /obj/machinery/light{ bulb_colour = "#22bfa2"; @@ -56855,10 +56432,10 @@ pixel_y = -5 }, /obj/item/paper/fluff/jobs/security/beepsky_mom, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -56900,10 +56477,10 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow/half, /obj/effect/turf_decal/tile/yellow/half, /turf/open/floor/iron/large, @@ -56933,8 +56510,8 @@ dir = 2 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) @@ -56950,7 +56527,7 @@ /area/quartermaster/qm) "rXF" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 10 }, /turf/open/space/basic, @@ -57014,8 +56591,8 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "rYy" = ( @@ -57026,9 +56603,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -57049,14 +56623,14 @@ /area/crew_quarters/dorms) "rYV" = ( /obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, -/area/science/mixing/chamber) +/area/science/mixing) "rYY" = ( /obj/item/paint/blue, /obj/structure/rack, @@ -57094,8 +56668,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/destination/hos_office{ dir = 8 }, @@ -57122,10 +56696,10 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;22;25;26;28;35;37;38;46" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -57188,10 +56762,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -57199,6 +56773,23 @@ }, /turf/open/floor/iron, /area/security/brig) +"sbc" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + alpha = 180; + dir = 1 + }, +/obj/effect/turf_decal/guideline/guideline_in/yellow{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "sbd" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -57226,19 +56817,19 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "sbt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "sbZ" = ( /obj/effect/spawner/structure/window/plasma/reinforced, @@ -57314,10 +56905,10 @@ alpha = 180; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -57347,10 +56938,10 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -57363,8 +56954,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -57405,10 +56994,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/guideline/guideline_half_in/neutral{ @@ -57450,7 +57039,6 @@ name = "Engineering External Access"; req_one_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/hallway/secondary/entry) "sfs" = ( @@ -57466,7 +57054,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "sga" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -57517,15 +57105,15 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "shB" = ( @@ -57671,8 +57259,8 @@ /turf/open/floor/iron/half, /area/hallway/primary/central) "sjI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -57697,13 +57285,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "skG" = ( /obj/effect/turf_decal/tile/blue{ @@ -57747,10 +57335,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/tech, /area/engine/engine_room) @@ -57778,14 +57362,11 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "skZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/power/terminal, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "slc" = ( @@ -57794,12 +57375,9 @@ }, /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) }, /obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/tech, /area/engine/engine_room) "slj" = ( @@ -57822,8 +57400,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "slz" = ( @@ -57852,8 +57430,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 4 }, @@ -57908,8 +57486,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -57965,10 +57543,10 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -57982,10 +57560,10 @@ /area/medical/genetics) "soj" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -57995,10 +57573,10 @@ /area/security/prison) "soB" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /mob/living/simple_animal/chicken{ @@ -58026,8 +57604,8 @@ /turf/open/floor/noslip/standard, /area/engine/engineering) "spg" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -58091,12 +57669,9 @@ pixel_x = -16; pixel_y = -15 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/tech, /area/engine/engine_room) "srn" = ( @@ -58117,7 +57692,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -58297,14 +57872,11 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/iron/dark, /area/security/brig/dock) @@ -58348,8 +57920,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "swj" = ( @@ -58369,10 +57941,10 @@ /area/ai_monitored/turret_protected/aisat/foyer) "swv" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -58404,10 +57976,10 @@ /area/science/research) "sxx" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -58422,8 +57994,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "sxG" = ( @@ -58463,10 +58035,10 @@ /turf/open/floor/iron/white/side, /area/medical/sleeper) "sxV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark/side{ @@ -58537,8 +58109,8 @@ /area/maintenance/port/aft) "szP" = ( /obj/structure/chair/stool/bar/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/cafeteria) "szX" = ( @@ -58636,10 +58208,10 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal) "sDa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) "sDt" = ( @@ -58660,10 +58232,10 @@ /turf/open/space/basic, /area/space/nearstation) "sDJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -58800,7 +58372,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "sGt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/sink{ @@ -58838,8 +58410,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "sGI" = ( @@ -58897,8 +58469,8 @@ req_access_txt = "20" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -58918,10 +58490,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -58940,7 +58512,7 @@ /area/crew_quarters/kitchen) "sIn" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/plating, /area/engine/atmos) "sIt" = ( @@ -58994,7 +58566,7 @@ /turf/open/floor/iron, /area/crew_quarters/cafeteria) "sIW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, @@ -59002,15 +58574,15 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/fore) "sJf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59023,7 +58595,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -59081,10 +58653,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/cafeteria) "sKG" = ( @@ -59126,7 +58698,7 @@ dir = 8 }, /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/science/mixing/chamber) "sLf" = ( @@ -59179,13 +58751,13 @@ name = "Incinerator"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59193,7 +58765,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "sLF" = ( /obj/structure/table/wood, @@ -59252,8 +58824,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/green, /turf/open/floor/iron/white/side{ dir = 1 @@ -59284,10 +58856,10 @@ /area/vacant_room/office) "sNs" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -59300,10 +58872,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ @@ -59333,8 +58905,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -59342,7 +58914,7 @@ /area/hallway/secondary/exit/departure_lounge) "sOl" = ( /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/storage) @@ -59355,16 +58927,16 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "sOJ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ +/obj/machinery/computer/atmos_control/oxygen_tank{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "sOT" = ( @@ -59393,12 +58965,6 @@ name = "Atmospherics External Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, @@ -59461,7 +59027,7 @@ /area/space/nearstation) "sQB" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /obj/structure/cable{ @@ -59653,12 +59219,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; name = "Privacy Shutters" @@ -59694,10 +59254,10 @@ /area/crew_quarters/dorms) "sTz" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -59719,10 +59279,12 @@ }, /area/medical/medbay/central) "sUi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "sUj" = ( @@ -59761,10 +59323,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/lattice/catwalk/over, @@ -59781,10 +59343,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -59815,8 +59377,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "sWe" = ( @@ -59887,7 +59451,7 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "sXu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/effect/turf_decal/tile/neutral, @@ -59953,12 +59517,6 @@ /turf/open/floor/iron, /area/engine/break_room) "sYP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -59966,11 +59524,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "sYQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/holopad{ pixel_x = 16; pixel_y = 16 @@ -59991,7 +59555,7 @@ /turf/open/space/basic, /area/solar/port/fore) "sZq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/chemistry) @@ -60003,10 +59567,10 @@ /turf/open/floor/plating, /area/maintenance/port/central) "sZS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/fireplace, @@ -60020,8 +59584,8 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "sZU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -60050,8 +59614,8 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/bridge) "taa" = ( @@ -60066,7 +59630,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -60117,18 +59681,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "taY" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, @@ -60159,10 +59720,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -60181,8 +59742,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/blood/tracks, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted{ alpha = 140; @@ -60241,8 +59802,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, /area/quartermaster/miningdock) @@ -60253,8 +59814,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_in/green{ color = "#439C1E" }, @@ -60268,14 +59829,14 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "tdF" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "teh" = ( /obj/structure/rack, @@ -60286,10 +59847,10 @@ /obj/item/circuitboard/machine/shuttle/engine/plasma, /obj/item/circuitboard/machine/shuttle/engine/plasma, /obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/iron/dark, @@ -60333,13 +59894,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/camera/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -60357,8 +59912,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -60394,7 +59949,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/advanced_airlock_controller/directional/west, /turf/open/floor/plating, /area/hallway/secondary/entry) "tfC" = ( @@ -60450,6 +60004,9 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "tfZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "tgx" = ( @@ -60482,8 +60039,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "tgI" = ( @@ -60503,7 +60060,7 @@ /obj/structure/sign/warning/securearea{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60512,8 +60069,8 @@ /obj/effect/turf_decal/guideline/guideline_in/purple{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -60528,10 +60085,10 @@ "thC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/south, @@ -60588,10 +60145,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/dark, @@ -60605,10 +60162,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -60635,8 +60192,6 @@ name = "Engineering External Access"; req_one_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/hallway/secondary/entry) "tiX" = ( @@ -60730,8 +60285,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "tkQ" = ( @@ -60742,7 +60297,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -60768,8 +60323,8 @@ icon_state = "1-8" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -60797,13 +60352,11 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "tlS" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/rnd/server, -/obj/effect/turf_decal/box/white, -/turf/open/floor/circuit/telecomms/server, +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/components/unary/portables_connector, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/mapping_helpers/atmos_auto_connect, +/turf/open/floor/iron/dark, /area/science/server) "tlT" = ( /obj/machinery/computer/atmos_alert, @@ -60818,11 +60371,11 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) @@ -60841,8 +60394,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -60889,8 +60442,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=20-Cryo"; location = "19-Cafeteria" @@ -60927,8 +60480,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_half_edge/green{ color = "#439C1E"; dir = 10 @@ -60954,8 +60507,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -60981,8 +60534,8 @@ /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "toz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/preopen{ id = "cmoprivacy"; name = "CMO Blast Door" @@ -60999,10 +60552,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, @@ -61057,9 +60610,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "tpA" = ( @@ -61067,7 +60617,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61107,8 +60657,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -61182,8 +60732,6 @@ }, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -61240,8 +60788,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/security{ name = "Re-Education Chamber"; req_access_txt = "3" @@ -61260,8 +60808,8 @@ req_access_txt = "7" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -61314,10 +60862,10 @@ /area/hallway/secondary/entry) "ttd" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61389,10 +60937,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61402,18 +60950,18 @@ /area/hallway/primary/fore) "tuq" = ( /obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) "tuD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/spawner/structure/window, @@ -61454,10 +61002,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/security/glass{ @@ -61515,8 +61063,8 @@ req_one_access_txt = "63;38" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/door/poddoor/preopen{ @@ -61553,19 +61101,19 @@ /turf/open/floor/iron/dark, /area/security/execution/education) "twC" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ dir = 4 }, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron/tech, /area/engine/atmos) "twF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/space/basic, /area/space/nearstation) "twG" = ( @@ -61580,10 +61128,10 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "twN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61649,12 +61197,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "txQ" = ( @@ -61690,10 +61232,10 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "tye" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -61702,10 +61244,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -61803,9 +61345,8 @@ }, /area/medical/sleeper) "tzD" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 4; - initialize_directions = 4 +/obj/machinery/cryo_cell{ + dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/iron, @@ -61817,8 +61358,8 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/quartermaster/miningdock) "tzT" = ( @@ -61845,17 +61386,17 @@ alpha = 180; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 1 }, /turf/open/floor/iron, /area/engine/break_room) "tAk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -61864,7 +61405,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ @@ -61891,10 +61432,10 @@ /area/engine/engineering) "tBn" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/holopad{ @@ -61962,10 +61503,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -61980,7 +61521,7 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/holopad{ pixel_x = 16; pixel_y = 16 @@ -61990,6 +61531,14 @@ }, /turf/open/floor/iron, /area/bridge) +"tBV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/engine/engine_room) "tCh" = ( /obj/structure/lattice/catwalk, /obj/machinery/button/flasher{ @@ -62048,12 +61597,9 @@ /turf/open/floor/iron/white, /area/medical/genetics/cloning) "tCA" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -62080,10 +61626,10 @@ name = "radiation Shelter" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/stripes/closeup{ @@ -62129,8 +61675,8 @@ dir = 1 }, /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 8 }, @@ -62142,12 +61688,6 @@ /turf/open/floor/iron, /area/maintenance/department/medical) "tEe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -62200,10 +61740,10 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -62216,10 +61756,10 @@ /turf/open/floor/iron/grid/steel, /area/hydroponics) "tEG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -62231,8 +61771,8 @@ /obj/effect/turf_decal/tile/neutral/half{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) "tFi" = ( @@ -62242,10 +61782,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -62354,10 +61894,10 @@ icon_state = "4-8" }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -62366,10 +61906,10 @@ }, /area/tcommsat/computer) "tHZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 8 + }, /turf/open/floor/plating, /area/engine/atmos) "tIG" = ( @@ -62411,14 +61951,14 @@ /turf/closed/wall, /area/maintenance/department/science) "tIT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, @@ -62480,8 +62020,8 @@ req_one_access_txt = "31;48" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/quartermaster/storage) "tJM" = ( @@ -62514,24 +62054,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/brig/dock) "tKh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engine/storage) +/turf/open/floor/iron/tech, +/area/engine/engine_room) "tKm" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain/private) @@ -62558,10 +62097,10 @@ /turf/closed/wall, /area/maintenance/department/bridge) "tKP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -62615,8 +62154,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62711,10 +62250,10 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/science/mixing/chamber) +/area/science/mixing) "tNi" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 }, /turf/open/space/basic, @@ -62747,10 +62286,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/carpet/green, @@ -62770,10 +62309,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/holopad{ @@ -62850,8 +62389,8 @@ /turf/open/floor/iron, /area/security/main) "tQd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -62889,13 +62428,13 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ +/obj/machinery/airlock_controller/incinerator_toxmix{ pixel_x = -24 }, /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/science/mixing/chamber) +/area/science/mixing) "tQv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62905,17 +62444,17 @@ pixel_x = 15; pixel_y = -15 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/tech, /area/engine/engine_room) "tQy" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -62936,7 +62475,7 @@ /turf/open/floor/carpet/red, /area/crew_quarters/cafeteria) "tQK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/structure/table, @@ -62974,7 +62513,7 @@ /turf/open/floor/wood, /area/vacant_room/office) "tQS" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -63047,8 +62586,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /obj/effect/landmark/blobstart, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -63097,19 +62636,15 @@ /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) "tUD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 1 }, /turf/open/floor/iron/white, /area/science/xenobiology) "tUU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, /obj/structure/cable/yellow{ @@ -63118,6 +62653,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4, /turf/open/floor/iron/dark, /area/engine/engine_room) "tVd" = ( @@ -63149,10 +62686,10 @@ }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -63206,7 +62743,7 @@ /turf/open/floor/iron/dark, /area/bridge) "tVN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -63354,9 +62891,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, @@ -63427,10 +62961,10 @@ /turf/open/floor/wood, /area/library) "tYP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera/directional/north, @@ -63441,10 +62975,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -63467,10 +63001,10 @@ }, /area/science/research) "tZf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -63575,7 +63109,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -63587,7 +63121,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/pipe_dispenser/disposal/transit_tube, /turf/open/floor/iron/dark, /area/engine/atmos) "ubU" = ( @@ -63622,10 +63156,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/cafeteria) "uci" = ( @@ -63652,7 +63186,7 @@ /turf/open/floor/iron, /area/maintenance/port/aft) "ucx" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -63669,7 +63203,7 @@ /turf/open/floor/iron/techmaint, /area/science/xenobiology) "ucR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engine/supermatter) @@ -63780,9 +63314,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "uff" = ( @@ -63796,7 +63328,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/engine, @@ -63814,14 +63346,14 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/blue{ @@ -63840,10 +63372,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ @@ -63880,7 +63412,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/yellow{ @@ -63921,10 +63453,10 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -64005,13 +63537,13 @@ /area/maintenance/port/central) "uiA" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /turf/open/space/basic, /area/space/nearstation) "uiP" = ( -/obj/machinery/air_sensor/atmos/nitrous_tank, +/obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/engine/atmos) "uiZ" = ( @@ -64102,10 +63634,10 @@ name = "Primary Tool Storage"; req_one_access_txt = "32;19" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -64144,10 +63676,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "ult" = ( @@ -64192,8 +63724,8 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "uml" = ( @@ -64279,10 +63811,10 @@ /obj/structure/disposalpipe/sorting/wrap/flip{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -64388,10 +63920,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet/purple, @@ -64458,10 +63990,10 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "urX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -64481,8 +64013,8 @@ name = "Conference Room"; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64498,13 +64030,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "utc" = ( /obj/machinery/door/poddoor{ @@ -64540,13 +64072,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "utW" = ( @@ -64632,10 +64160,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) "uvC" = ( @@ -64739,7 +64267,7 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "uxA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /obj/machinery/light{ @@ -64761,10 +64289,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/guideline/guideline_in/neutral{ @@ -64789,11 +64317,11 @@ /area/science/robotics/mechbay) "uxW" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/landmark/start/bartender, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/iron/dark, @@ -64804,10 +64332,10 @@ req_access_txt = "27" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/wood, @@ -64816,7 +64344,7 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -64867,10 +64395,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron, @@ -64879,12 +64407,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -64936,8 +64458,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/aft) "uAF" = ( @@ -64990,10 +64512,10 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -65013,10 +64535,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -65052,17 +64574,17 @@ /area/crew_quarters/heads/hos) "uCd" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/central) "uCx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/grimy, /area/chapel/office) "uCC" = ( @@ -65097,6 +64619,7 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/break_room) "uCQ" = ( @@ -65108,7 +64631,7 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -65173,17 +64696,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/cafeteria) "uDQ" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/space/basic, /area/space/nearstation) "uEa" = ( @@ -65191,10 +64714,10 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "uEq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -65269,10 +64792,10 @@ /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissary1) "uEP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -65302,7 +64825,7 @@ /area/engine/engineering) "uFI" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/structure/cable{ @@ -65345,7 +64868,7 @@ /area/space/nearstation) "uGm" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plating, @@ -65361,8 +64884,8 @@ name = "Secure Tech Storage"; req_one_access_txt = "19;23" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/storage/tech) "uHB" = ( @@ -65431,7 +64954,7 @@ /turf/open/space/basic, /area/solar/port/aft) "uIy" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/light{ dir = 8 }, @@ -65482,10 +65005,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, @@ -65540,7 +65063,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/tile/dark_red/half{ @@ -65552,19 +65075,19 @@ /turf/open/floor/iron/large, /area/hallway/primary/central) "uKv" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "uKR" = ( /obj/structure/table, @@ -65607,8 +65130,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/crew_quarters/dorms) "uLd" = ( @@ -65654,7 +65177,7 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "uLk" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /obj/machinery/meter, @@ -65723,10 +65246,10 @@ /turf/open/floor/engine, /area/engine/atmos) "uME" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner{ @@ -65734,15 +65257,8 @@ }, /area/hallway/primary/central) "uMO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "uMP" = ( @@ -65761,8 +65277,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -65779,7 +65295,7 @@ /turf/open/space/basic, /area/space/nearstation) "uNr" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -65788,7 +65304,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/guideline/guideline_edge/red, @@ -65856,15 +65372,15 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "uPj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/camera/directional/south, @@ -65943,7 +65459,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 1 }, /obj/machinery/light/small/directional/west, @@ -65978,7 +65494,7 @@ /area/quartermaster/sorting) "uRo" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) "uRr" = ( @@ -66086,10 +65602,10 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "uTB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/carpet, @@ -66103,8 +65619,8 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -66124,13 +65640,13 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary1) "uUZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/office) "uVd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -66139,10 +65655,10 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "uVt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/corner{ @@ -66215,10 +65731,10 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "uWy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -66226,8 +65742,8 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -66250,10 +65766,10 @@ /obj/effect/turf_decal/guideline/guideline_in/neutral{ alpha = 255 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -66268,8 +65784,8 @@ pixel_x = -2; pixel_y = 14 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/wideplating/dark, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -66297,10 +65813,10 @@ dir = 1; pixel_y = -3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/carpet/green, @@ -66334,10 +65850,10 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66349,8 +65865,8 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "uXO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -66387,10 +65903,10 @@ /turf/open/floor/iron/dark, /area/medical/genetics) "uYv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/lattice/catwalk/over, @@ -66492,10 +66008,10 @@ id = "AIwindows"; name = "AI View Blast Door" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/cyan{ @@ -66535,10 +66051,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -66576,7 +66092,7 @@ /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "vcw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -66586,7 +66102,7 @@ /area/engine/engine_room) "vcG" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/pipedispenser/disposal, +/obj/machinery/pipe_dispenser/disposal, /turf/open/floor/iron/dark, /area/engine/atmos) "vcJ" = ( @@ -66595,10 +66111,10 @@ /turf/open/floor/iron, /area/science/shuttledock) "vcO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -66629,7 +66145,7 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "vdH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "N2 to Pure" @@ -66655,15 +66171,15 @@ /area/crew_quarters/dorms) "vex" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/sleeper) "vfm" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -66683,10 +66199,10 @@ /area/crew_quarters/cafeteria) "vft" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -66716,14 +66232,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "vfY" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/engine/atmos) "vge" = ( @@ -66766,10 +66280,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) "vhl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ @@ -66784,6 +66298,7 @@ /obj/machinery/door/airlock/atmos/glass{ req_access_txt = "24" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) "vhr" = ( @@ -66814,8 +66329,8 @@ color = "#267878"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) "vic" = ( @@ -66866,8 +66381,8 @@ color = "#FFFFFF"; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -66911,8 +66426,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "vjS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -66937,8 +66452,8 @@ }, /area/maintenance/port/central) "vkl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/security/detectives_office) "vks" = ( @@ -67022,11 +66537,11 @@ /area/science/mixing) "vlw" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/science/mixing/chamber) +/area/science/mixing) "vlR" = ( /obj/structure/table, /obj/structure/disposalpipe/segment{ @@ -67081,10 +66596,10 @@ /area/maintenance/central) "vmM" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/cyan{ @@ -67179,10 +66694,10 @@ /obj/effect/turf_decal/guideline/guideline_in/neutral{ alpha = 255 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ @@ -67198,10 +66713,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -67335,10 +66850,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ @@ -67397,8 +66912,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/research) "vtv" = ( @@ -67406,8 +66921,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67421,7 +66936,7 @@ /area/chapel/main) "vtK" = ( /obj/effect/turf_decal/siding/wideplating/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/machinery/camera/directional/south, @@ -67456,10 +66971,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -67496,8 +67011,10 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "vvC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/green/visible, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, /turf/open/space/basic, /area/space/nearstation) "vvJ" = ( @@ -67548,10 +67065,10 @@ /turf/closed/wall, /area/quartermaster/qm) "vwL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -67616,10 +67133,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -67669,8 +67186,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -67701,8 +67218,8 @@ alpha = 255; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -67725,10 +67242,10 @@ /turf/open/floor/iron/half, /area/hallway/primary/central) "vzg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -67749,8 +67266,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/brig) "vzt" = ( @@ -67794,10 +67311,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, /turf/open/floor/iron/tech, /area/engine/engine_room) "vAC" = ( @@ -67831,8 +67345,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/chapel/main) "vAU" = ( @@ -67869,10 +67383,10 @@ name = "Library" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -67915,8 +67429,8 @@ /turf/open/floor/iron, /area/engine/atmos) "vCB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_tri/blue{ dir = 1 }, @@ -67982,7 +67496,7 @@ pixel_y = 16 }, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/engine{ @@ -68005,12 +67519,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "vDB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 230; color = "#edaa0c" @@ -68018,10 +67526,16 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engine_room) "vDS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ @@ -68105,11 +67619,11 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "vFa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -68118,7 +67632,7 @@ pixel_y = 16 }, /obj/effect/turf_decal/box, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmospherics_engine) "vFo" = ( /turf/closed/wall, @@ -68273,10 +67787,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "vIY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "vJf" = ( @@ -68301,7 +67815,7 @@ /turf/open/floor/iron/white, /area/maintenance/port/aft) "vJn" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/machinery/door/airlock/research{ @@ -68371,8 +67885,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_half_edge/purple{ dir = 5 }, @@ -68412,20 +67926,20 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) "vLB" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/catwalk_floor, @@ -68438,10 +67952,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -68466,8 +67980,8 @@ alpha = 200; color = "#267878" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -68508,10 +68022,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor, @@ -68527,17 +68041,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 }, /turf/open/floor/iron, /area/engine/engine_room) "vNk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -68559,6 +68073,12 @@ dir = 1 }, /obj/effect/turf_decal/caution, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "vNH" = ( @@ -68584,8 +68104,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/dark_red/half{ color = "#DE3A3A" }, @@ -68654,9 +68174,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/science/shuttledock) "vQc" = ( @@ -68667,8 +68184,8 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -68682,8 +68199,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -68704,8 +68221,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/blue{ dir = 1 }, @@ -68749,8 +68266,8 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "vRh" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/box/corners{ @@ -68817,19 +68334,16 @@ /turf/closed/wall/mineral/wood, /area/hallway/primary/central) "vSn" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/computer/atmos_control/tank/carbon_tank{ +/obj/machinery/computer/atmos_control/carbon_tank{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/atmos) "vSu" = ( @@ -68841,8 +68355,8 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/machinery/holopad{ @@ -68863,13 +68377,13 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "vTh" = ( /obj/structure/window/reinforced{ @@ -68893,7 +68407,7 @@ /turf/open/floor/iron, /area/quartermaster/qm) "vTJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/box/corners{ @@ -68922,10 +68436,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/catwalk_floor, @@ -68955,7 +68469,7 @@ /turf/open/space/basic, /area/solar/port/fore) "vUP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 4 }, /turf/open/floor/engine/air, @@ -68979,8 +68493,8 @@ /turf/closed/wall, /area/crew_quarters/theatre/backstage) "vVy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/computer/atmos_control/nitrous_tank{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -69019,8 +68533,8 @@ /turf/open/floor/iron/half, /area/hallway/primary/central) "vVE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -69053,7 +68567,7 @@ /area/medical/genetics/cloning) "vVO" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -69122,10 +68636,10 @@ dir = 1 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -69137,8 +68651,8 @@ /obj/effect/turf_decal/guideline/guideline_in/purple{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -69152,16 +68666,16 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "vYf" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -69189,10 +68703,10 @@ name = "Showers" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/closeup{ @@ -69201,15 +68715,20 @@ /turf/open/floor/prison, /area/security/prison) "vYG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/chair{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/iron/dark/side{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "vYH" = ( /obj/structure/rack, @@ -69226,10 +68745,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -69242,7 +68761,7 @@ /turf/open/floor/iron/dark, /area/science/shuttledock) "vZb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /obj/effect/turf_decal/bot, @@ -69271,18 +68790,18 @@ /turf/open/floor/plating, /area/maintenance/department/science) "vZB" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/depleteduranium, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 8 + }, /turf/open/floor/engine, /area/engine/atmospherics_engine) "wae" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -69297,10 +68816,10 @@ /area/library) "wap" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/airlock/public/glass{ @@ -69378,12 +68897,12 @@ /turf/open/space/basic, /area/solar/port/aft) "wbU" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/catwalk_floor, +/area/engine/atmos) "wcq" = ( /obj/structure/closet/crate, /obj/item/storage/box, @@ -69478,21 +68997,19 @@ /turf/open/floor/engine, /area/science/xenobiology) "wdh" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "wdi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor, @@ -69512,7 +69029,7 @@ /turf/open/space/basic, /area/ai_monitored/turret_protected/ai) "wdr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/apothecary) "wdz" = ( @@ -69523,8 +69040,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/science/server) @@ -69683,15 +69200,15 @@ alpha = 230; color = "#edaa0c" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "whe" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -69747,7 +69264,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "wjt" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/structure/lattice/catwalk, @@ -69779,8 +69296,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/carpet/purple, /area/chapel/main) "wke" = ( @@ -69794,7 +69311,7 @@ /turf/open/floor/iron, /area/crew_quarters/heads/hor) "wkj" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/iron/grid/steel, @@ -69825,8 +69342,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/ridged/steel, @@ -69969,10 +69486,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -69998,19 +69515,19 @@ /turf/open/floor/iron/dark, /area/science/shuttledock) "wnx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "wnI" = ( /obj/effect/turf_decal/stripes/corner, @@ -70029,19 +69546,19 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "wor" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) "wot" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/table, @@ -70138,10 +69655,10 @@ codes_txt = "patrol;next_patrol=22-Kitchen"; location = "21-Dorms" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -70185,7 +69702,7 @@ pixel_x = 9; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/iron/dark, @@ -70291,10 +69808,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /turf/open/floor/carpet, @@ -70432,8 +69949,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/light_switch{ @@ -70501,16 +70018,16 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "wxK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -70556,8 +70073,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -70673,10 +70190,10 @@ /turf/open/floor/iron, /area/security/brig) "wzY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron/dark/side{ @@ -70707,7 +70224,7 @@ /area/library) "wAk" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/atmos) "wAl" = ( @@ -70749,15 +70266,15 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "wAt" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, /obj/machinery/meter, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 8 + }, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "wAA" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -70811,12 +70328,12 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/brig/dock) "wBq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/structure/cable/yellow{ @@ -70825,10 +70342,10 @@ /turf/open/floor/iron/dark, /area/engine/engine_room) "wBr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -70840,9 +70357,6 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -70862,12 +70376,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -70957,6 +70465,12 @@ /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/lobby) "wEG" = ( @@ -70980,10 +70494,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/table, @@ -71071,25 +70585,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/structure/closet/secure_closet/atmospherics{ anchored = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, /area/engine/atmos) "wFT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light, @@ -71131,7 +70645,7 @@ /turf/open/floor/iron/dark, /area/security/nuke_storage) "wGw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -71147,7 +70661,7 @@ dir = 9 }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark, @@ -71191,10 +70705,10 @@ alpha = 180; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -71222,7 +70736,7 @@ /area/security/detectives_office) "wHX" = ( /obj/machinery/telecomms/server/presets/exploration, -/turf/open/floor/circuit/green/telecomms/mainframe, +/turf/open/floor/circuit/green, /area/quartermaster/exploration_prep) "wHY" = ( /obj/structure/closet, @@ -71270,10 +70784,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -71298,10 +70812,10 @@ /turf/closed/wall, /area/crew_quarters/dorms) "wIQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -71327,7 +70841,7 @@ /turf/open/floor/iron, /area/quartermaster/miningdock) "wJr" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -71369,6 +70883,18 @@ req_access_txt = "10" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/storage) "wKx" = ( @@ -71401,7 +70927,7 @@ "wKP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, @@ -71425,10 +70951,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "wLg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/disposalpipe/junction/flip{ @@ -71458,7 +70984,7 @@ /turf/open/floor/prison, /area/security/prison) "wLT" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -71495,7 +71021,7 @@ /area/chapel/main) "wMj" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 }, /obj/structure/cable{ @@ -71566,10 +71092,6 @@ /turf/open/floor/plating, /area/maintenance/department/science) "wNh" = ( -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -22 - }, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; name = "mainframe floor" @@ -71611,8 +71133,8 @@ /area/science/misc_lab/range) "wOb" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -71640,8 +71162,8 @@ /area/medical/cryo) "wOI" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -71686,8 +71208,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -71698,10 +71220,10 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/white, @@ -71797,7 +71319,7 @@ }, /area/library) "wRy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/effect/turf_decal/siding/wood{ @@ -71827,13 +71349,13 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "wSi" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -71849,9 +71371,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /turf/open/floor/iron/dark, /area/engine/engine_room) "wSs" = ( @@ -71884,10 +71403,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -71899,13 +71418,13 @@ /turf/open/floor/iron, /area/hallway/primary/port) "wSy" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /turf/open/floor/iron, @@ -71937,10 +71456,12 @@ /turf/open/floor/iron/white, /area/science/robotics) "wTI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "wUf" = ( @@ -71961,6 +71482,10 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/brig/dock) +"wUV" = ( +/obj/machinery/air_sensor/toxins_burn_chamber, +/turf/open/floor/engine/vacuum, +/area/science/mixing/chamber) "wUW" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180; @@ -72028,9 +71553,9 @@ name = "Medbay"; req_one_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/medical/sleeper) "wXg" = ( @@ -72119,7 +71644,9 @@ pixel_x = -25; pixel_y = -5 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/science/mixing/chamber" + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -72130,7 +71657,7 @@ /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/science/mixing/chamber) +/area/science/mixing) "wYC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -72146,8 +71673,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/blood/footprints, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted{ alpha = 140; @@ -72160,10 +71687,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/white, @@ -72172,7 +71699,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/machinery/firealarm/directional/north, @@ -72205,8 +71732,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "wZs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -72233,20 +71760,22 @@ req_one_access_txt = "12;35" }, /obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/central) "xac" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, /turf/open/floor/iron, /area/engine/atmos) "xaj" = ( @@ -72275,8 +71804,8 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "xaU" = ( @@ -72335,10 +71864,10 @@ /turf/open/floor/iron, /area/engine/engineering) "xbC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -72373,9 +71902,6 @@ /area/hallway/primary/starboard) "xcR" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -72383,8 +71909,8 @@ /turf/open/floor/iron, /area/engine/engine_room) "xdi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -72446,8 +71972,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -72504,9 +72030,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "xfs" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/landmark/xeno_spawn, /obj/machinery/holopad{ pixel_x = 16; @@ -72555,10 +72078,10 @@ /turf/open/floor/wood, /area/library) "xgv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark/side, @@ -72579,7 +72102,7 @@ /area/hallway/primary/aft) "xhl" = ( /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/structure/cable{ @@ -72603,8 +72126,8 @@ /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) "xhB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -72629,10 +72152,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -72657,8 +72180,17 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/structure/disposalpipe/segment{ - dir = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) @@ -72679,10 +72211,10 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -72711,12 +72243,6 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_y = 25 }, @@ -72726,8 +72252,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 2 @@ -72736,10 +72262,10 @@ /area/maintenance/department/security) "xjG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -72784,7 +72310,7 @@ /turf/open/floor/iron/dark, /area/security/nuke_storage) "xkg" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -72840,8 +72366,8 @@ /turf/open/floor/iron, /area/science/lobby) "xlk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -72858,8 +72384,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/holopad{ pixel_x = 16; pixel_y = 16 @@ -72926,8 +72452,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/blood/footprints, /turf/open/floor/iron/white, /area/medical/sleeper) @@ -73006,9 +72532,6 @@ name = "Atmospherics External Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -73033,10 +72556,10 @@ /obj/effect/turf_decal/guideline/guideline_in/neutral{ alpha = 255 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron, @@ -73085,7 +72608,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/grid/steel, @@ -73134,8 +72657,8 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "xoD" = ( @@ -73190,7 +72713,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/sepia, @@ -73224,10 +72747,10 @@ /turf/open/floor/iron, /area/security/brig) "xqq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/structure/cable/yellow{ @@ -73332,7 +72855,7 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "xsA" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron/tech, /area/engine/atmos) "xsC" = ( @@ -73346,10 +72869,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -73374,8 +72897,8 @@ /area/hallway/secondary/entry) "xte" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -73385,8 +72908,8 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "xtn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/blue, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -73404,18 +72927,18 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/aft) "xtE" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/light_switch{ @@ -73475,7 +72998,7 @@ "xug" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -73485,7 +73008,7 @@ /mob/living/simple_animal/bot/cleanbot/larry{ on = 0 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -73505,9 +73028,6 @@ pixel_x = 1; pixel_y = 33 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, @@ -73517,7 +73037,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "xuN" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /turf/open/floor/iron/tech, /area/engine/engine_room) "xuV" = ( @@ -73532,10 +73052,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -73566,13 +73083,13 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "xvx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/iron/dark, @@ -73590,12 +73107,6 @@ id = "hopqueue"; name = "HoP Queue Shutters" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/grass/no_border, /area/crew_quarters/heads/hop) "xvM" = ( @@ -73688,10 +73199,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ @@ -73711,10 +73222,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/plating, @@ -73731,8 +73242,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "xxh" = ( @@ -73771,14 +73282,14 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "xxw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -73790,11 +73301,11 @@ /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) "xxA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/tech, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "xxE" = ( /obj/effect/turf_decal/siding/wideplating/dark, @@ -73804,10 +73315,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/carpet/purple, @@ -73830,10 +73341,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, @@ -73878,10 +73389,10 @@ /turf/open/floor/iron/dark, /area/science/robotics) "xyC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /obj/structure/cable/yellow{ @@ -73912,10 +73423,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -73952,8 +73463,8 @@ alpha = 180; color = "#DE3A3A" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -73977,6 +73488,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/break_room) "xzI" = ( @@ -74090,8 +73602,8 @@ /area/medical/apothecary) "xBP" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -74223,10 +73735,10 @@ /area/security/checkpoint/engineering) "xFb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/structure/cable/yellow{ @@ -74307,7 +73819,7 @@ /turf/open/floor/iron/dark, /area/teleporter) "xGG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/science/robotics) "xGI" = ( @@ -74316,7 +73828,7 @@ }, /obj/effect/landmark/start/security_officer, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/dark, @@ -74345,10 +73857,10 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "xHy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -74372,7 +73884,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "xHZ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light{ dir = 4 }, @@ -74395,10 +73907,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/catwalk_floor, @@ -74425,8 +73937,8 @@ /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron/dark/side{ @@ -74441,10 +73953,10 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable/yellow{ @@ -74491,10 +74003,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -74541,14 +74053,14 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -74560,9 +74072,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, @@ -74589,8 +74098,6 @@ /turf/open/floor/iron/white, /area/medical/office) "xKW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -74602,6 +74109,7 @@ pixel_x = 33; pixel_y = -2 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/bridge) "xLd" = ( @@ -74609,8 +74117,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ dir = 2 @@ -74621,7 +74129,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/engine, @@ -74641,7 +74149,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -74651,8 +74159,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -74687,10 +74195,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/cyan{ @@ -74727,8 +74235,8 @@ /area/hallway/primary/aft) "xOB" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/grunge{ name = "Chapel Office"; req_access_txt = "27" @@ -74736,9 +74244,9 @@ /turf/open/floor/wood, /area/chapel/office) "xOE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, /turf/open/floor/catwalk_floor/iron_dark, @@ -74762,8 +74270,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_edge/purple, /obj/structure/disposalpipe/segment{ dir = 4 @@ -74791,7 +74299,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/tech, @@ -74819,10 +74327,10 @@ /area/library) "xRe" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -74831,10 +74339,10 @@ /turf/open/floor/iron, /area/crew_quarters/cafeteria) "xRk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -74922,9 +74430,6 @@ }, /area/hallway/primary/central) "xTh" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer4{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom{ pixel_x = -32; @@ -74938,8 +74443,8 @@ /area/engine/engine_room) "xTD" = ( /obj/effect/spawner/lootdrop/ruinloot/medical, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -75041,7 +74546,7 @@ /turf/open/floor/iron, /area/security/brig) "xUY" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -75081,8 +74586,8 @@ /turf/open/floor/iron, /area/engine/atmos) "xVo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -75094,7 +74599,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -75103,9 +74608,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/engine_room) @@ -75115,16 +74617,6 @@ burnt = 1 }, /area/maintenance/port/central) -"xWf" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/engine_room) "xWu" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -75170,15 +74662,9 @@ /turf/open/floor/iron/dark, /area/storage/primary) "xWS" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -75188,11 +74674,17 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "xXh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/carpet/orange, @@ -75216,7 +74708,7 @@ /turf/open/floor/iron, /area/science/lobby) "xXT" = ( -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/iron/tech, /area/engine/atmos) "xXY" = ( @@ -75234,7 +74726,7 @@ /area/security/prison) "xYn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/detectives_office) "xYq" = ( @@ -75246,7 +74738,7 @@ /turf/open/floor/holofloor/wood, /area/security/main) "xYK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -75266,8 +74758,8 @@ /turf/open/floor/iron, /area/engine/engineering) "xYT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -75295,15 +74787,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "xZa" = ( @@ -75371,7 +74857,7 @@ /area/janitor) "xZZ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 }, /turf/open/floor/plating, @@ -75397,7 +74883,7 @@ /turf/open/floor/engine, /area/science/explab) "yaw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/chemistry) "yay" = ( @@ -75414,8 +74900,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -75426,20 +74912,20 @@ /area/security/brig) "yaL" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "yaP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 9 }, /turf/open/floor/iron/dark, @@ -75505,11 +74991,11 @@ pixel_y = -5; req_access_txt = "19" }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "ycs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_one_access_txt = "12;6" @@ -75658,8 +75144,8 @@ /area/vacant_room/commissary/commissary1) "ygb" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/yellow{ @@ -75676,15 +75162,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/airless, /area/ai_monitored/turret_protected/ai) "ygY" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, +/turf/open/floor/catwalk_floor, /area/engine/atmos) "yhq" = ( /obj/structure/table, @@ -75749,10 +75235,10 @@ /turf/open/floor/iron, /area/engine/storage) "yie" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -75781,10 +75267,10 @@ /obj/machinery/turnstile{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, @@ -75824,10 +75310,10 @@ /area/tcommsat/server) "yjO" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -75882,11 +75368,11 @@ /obj/effect/turf_decal/tile/blue/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 8 }, @@ -75981,9 +75467,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "ylI" = ( @@ -76010,10 +75493,10 @@ /turf/open/floor/iron, /area/security/main) "ymh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/structure/cable/yellow{ @@ -97197,7 +96680,7 @@ gsA gsA nEb hsk -rjk +hLc nEb gsA gsA @@ -97499,7 +96982,7 @@ fMi kSY olk kIo -kDV +nCg rYk wJl vJE @@ -97534,7 +97017,7 @@ jJT mxU fSH qbS -frc +wUV kwX fFP kCC @@ -97718,7 +97201,7 @@ oTi oTi dHr dqx -pdv +hVH pfv lqg yil @@ -97975,7 +97458,7 @@ wDe wDe wDe dvV -pdv +hVH uQg tKV jSQ @@ -98013,7 +97496,7 @@ vxB cbf cbf vzD -kDV +nCg xNU aHc vJE @@ -100589,7 +100072,7 @@ gAf odP uKi mHk -rlV +hgH jIs iiM ryi @@ -101360,7 +100843,7 @@ vof wjz uKi wQI -bEk +bIG hWH uKi cKb @@ -101893,12 +101376,12 @@ dEP vJq nXn gTo -pMQ +kzq pMQ pMQ lUQ oLA -jxg +gsA fAl iqX jZA @@ -102155,7 +101638,7 @@ xfs fMa jcv dEP -kzq +gsA qZZ pPY oGP @@ -102409,10 +101892,10 @@ dEP tlS pnz pRx -pnz +pMQ kmq oLA -jsM +gsA qZZ pPY vqT @@ -103459,7 +102942,7 @@ mge jDD dqt cax -hVq +tBV fEY gaL uuG @@ -104231,7 +103714,7 @@ qva ixS pvb hYY -xWf +voY svB jcW jcW @@ -106148,7 +105631,7 @@ gsA gsA gsA wsM -pQu +mZi wsM gsA gsA @@ -106550,9 +106033,9 @@ ckw pxP kKM uLf -nCn +ngR xkg -iIs +rIo pva txT hPc @@ -106804,15 +106287,15 @@ bBd peX wSq kOM -daC -daC -daC +jYb +jYb +jYb daC vAu -uMO +qiW ufe kOp -kOp +wdk rve lDa ctA @@ -106917,10 +106400,10 @@ mZi iPo wsM inN +dNM mZi -iPo jfG -dNM +mZi mZi upL uuQ @@ -107055,10 +106538,10 @@ qhN epO arL hZF -ngR -qek +nUC +pCW rSS -qPO +peX mXk mXa akQ @@ -107311,7 +106794,7 @@ cKp jcW yfq gcc -nSh +tKh nSh pCW tEe @@ -107568,7 +107051,7 @@ xrM jcW hJm rPp -nSh +tKh ebv cjK lTH @@ -107825,7 +107308,7 @@ rcc jcW fdi mSs -niG +cNj niG hEa cwp @@ -108082,7 +107565,7 @@ iCf jcW aCR rPp -nSh +tKh nUC hlL hwk @@ -108097,8 +107580,8 @@ wMj bDL uFI mKJ -rIo -rsc +niY +dIL crW kuR lOI @@ -108224,9 +107707,9 @@ mMV eQk bPV nOz -beS -bPV -bPV +gVV +hbn +hbn gRC vND twm @@ -108339,7 +107822,7 @@ vrh tBa cGs dET -rfM +hfT sVR xVF xcR @@ -108834,8 +108317,8 @@ pEe pay nxJ hHG -hHG -hHG +sbc +sbc nzF dmD oEe @@ -109004,7 +108487,7 @@ rlg mqa rlg gOj -bIG +feL lWz pOj nec @@ -109365,7 +108848,7 @@ esC pyt drZ nlR -hFC +qek jca oJg rRL @@ -109373,7 +108856,7 @@ hFC pgY nAR wBq -hfT +sYP kOX mES mLR @@ -109622,15 +109105,15 @@ fmy pLT ehX kaQ -kaQ +rFN pAP nRX cPy otM tqL -rFN -cNj -nyb +mlm +wBq +sYP kOX pNy mLR @@ -109880,7 +109363,7 @@ iEO yid sTA wKp -tKh +sTA iEO iEO iEO @@ -110392,7 +109875,7 @@ dmC hCt jKN eof -kbs +eof kbs lCR mcM @@ -110405,10 +109888,10 @@ gDB jYb jYb jYb -jYb +daC vfU qiW -pCW +uMO hPi wdk qag @@ -111944,7 +111427,7 @@ dGa pim lbs hdz -lbs +rsc luv tDv wcw @@ -113742,7 +113225,7 @@ uiA uDQ rdu kVm -dUp +dmz jGx jGx jGx @@ -113994,7 +113477,7 @@ avH uGm iRY htm -uGm +llo xZZ iRY htm @@ -114762,7 +114245,7 @@ lKC vEV tMW vTJ -iVl +psH dWR iIT eLY @@ -114771,7 +114254,7 @@ mxd sXu lce frm -aHe +iCx avH jGx jGx @@ -115016,7 +114499,7 @@ sbt eyT tdF rGd -xxA +wbU oCW dJh xxA @@ -115272,7 +114755,7 @@ jnE kvU dbF ifh -twC +rpZ twC qYZ vRh @@ -117074,9 +116557,9 @@ blB wlD wId hcF -htm -htm -jII +aWZ +iJR +iVl bRg avH htm @@ -117331,9 +116814,9 @@ aXu jrm iRY wjt -wbU +jGx vvC -iJR +jGx dUp jGx dKo @@ -119118,7 +118601,7 @@ dHW dHW dHW gLb -vZB +dit jjt vZB gLb @@ -119543,9 +119026,9 @@ kOt sfq fjN tiR -gQs -gQs -gQs +pQu +aHe +rjk gQs gQs gQs @@ -119595,14 +119078,14 @@ lZw nXU jbn kla +hxw sVi -vYG sVi ntm sVi sVi czL -mXh +vYG ejx puq dSJ @@ -119814,7 +119297,7 @@ hcr hcr hcr bnK -nCg +eaE sSH wuO hcr @@ -119852,8 +119335,8 @@ lUa nXU yfH hVS -slU -hxw +aPm +yfH yfH yfH slU diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index cb883ac183f9c..61a867adaebba 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -46,7 +46,7 @@ /turf/open/floor/plating, /area/engine/atmos) "am" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/engine/atmos) "an" = ( @@ -132,17 +132,17 @@ /turf/open/floor/plating, /area/engine/atmos) "ax" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating, /area/engine/atmos) "ay" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating, /area/engine/atmos) "az" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/machinery/meter, @@ -248,7 +248,7 @@ /turf/open/floor/iron, /area/engine/atmos) "aP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -313,7 +313,7 @@ /area/engine/gravity_generator) "aX" = ( /obj/machinery/gravity_generator/main/station, -/turf/open/openspace, +/turf/open/space/basic, /area/security) "aY" = ( /obj/machinery/light{ @@ -394,13 +394,13 @@ /turf/open/floor/plating, /area/engine/atmos) "bk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating, /area/engine/atmos) "bl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/meter, @@ -413,7 +413,7 @@ /turf/open/floor/plating, /area/engine/atmos) "bn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/machinery/light, @@ -453,7 +453,7 @@ /area/hallway/primary/central) "bt" = ( /obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/engine/atmos) "bu" = ( @@ -464,7 +464,7 @@ /turf/open/floor/plating, /area/bridge) "bw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall/r_wall, /area/engine/engineering) "bx" = ( @@ -503,7 +503,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "bC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/iron, @@ -573,7 +573,7 @@ }, /area/crew_quarters/heads/captain) "bN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/hallway/primary/central) "bO" = ( @@ -661,7 +661,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/hallway/primary/central) "cc" = ( @@ -713,7 +713,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/captain) "ci" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable{ icon_state = "4-8" }, @@ -775,14 +775,14 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "ct" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/light{ dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) "cv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "cw" = ( @@ -802,13 +802,13 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "cA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) "cB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/light{ @@ -819,13 +819,13 @@ }, /area/hallway/primary/central) "cC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron{ dir = 1 }, /area/hallway/primary/central) "cD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron{ @@ -836,7 +836,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/light{ @@ -847,11 +847,11 @@ }, /area/hallway/primary/central) "cF" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron, /area/hallway/primary/central) "cG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/closed/wall/r_wall, @@ -910,7 +910,7 @@ /turf/closed/wall/r_wall, /area/construction) "cP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall/r_wall, /area/construction) "cQ" = ( @@ -931,7 +931,7 @@ /turf/closed/wall/r_wall, /area/storage/primary) "cU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall/r_wall, /area/storage/primary) "cV" = ( @@ -1163,7 +1163,7 @@ /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/airless, /area/hallway/primary/central) "dH" = ( /obj/effect/landmark/start, @@ -1578,6 +1578,9 @@ }, /turf/open/floor/iron, /area/construction) +"kT" = ( +/turf/open/space/basic, +/area/space/nearstation) "lj" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/structure/cable{ @@ -2113,6 +2116,9 @@ /obj/effect/turf_decal/stripes/asteroid/line, /turf/open/floor/iron, /area/security) +"VU" = ( +/turf/open/space/basic, +/area/security) "Wf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3412,10 +3418,10 @@ aa aa aa ab -ac +kT ae -ac -ac +kT +kT ag aB ag @@ -3466,10 +3472,10 @@ aa aa aa ab -ac +kT ae -ac -ac +kT +kT aj dZ aj @@ -3520,10 +3526,10 @@ aa aa aa ab -ac +kT ae -ac -ac +kT +kT aj aD aj @@ -3574,7 +3580,7 @@ aa aa aa ab -ac +kT ad ad aj @@ -4460,18 +4466,18 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +kT +kT +kT +kT +kT +kT +kT +kT +kT +kT +kT +kT ab aa aa @@ -5245,48 +5251,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -5299,48 +5305,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -5353,48 +5359,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -5407,48 +5413,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -5461,48 +5467,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -5515,11 +5521,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad ad ad @@ -5552,11 +5558,11 @@ ad ad ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5569,11 +5575,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af af @@ -5606,11 +5612,11 @@ af af af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5623,11 +5629,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ah @@ -5660,11 +5666,11 @@ cN cN af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5677,11 +5683,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad Dm ah @@ -5714,11 +5720,11 @@ ep cN ME ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5731,11 +5737,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ah @@ -5768,11 +5774,11 @@ ep cN af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5785,11 +5791,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ah @@ -5822,11 +5828,11 @@ ep cN af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5839,11 +5845,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ah @@ -5876,11 +5882,11 @@ cN cN ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5893,11 +5899,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ah @@ -5930,11 +5936,11 @@ SI SI ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -5947,11 +5953,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad ad ah @@ -5984,11 +5990,11 @@ SI SI ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6001,19 +6007,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU bu ea ea @@ -6038,11 +6044,11 @@ SI SI ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6055,19 +6061,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU bv eb eb @@ -6092,11 +6098,11 @@ cN cN ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6109,19 +6115,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU eO eb eb @@ -6146,11 +6152,11 @@ ep cN af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6163,19 +6169,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU eO eb eb @@ -6200,11 +6206,11 @@ ep cN af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6217,19 +6223,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU eO eb eb @@ -6254,11 +6260,11 @@ ep cN ME ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6271,19 +6277,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU bv eb eb @@ -6308,11 +6314,11 @@ ep cN af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6325,19 +6331,19 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU bu ec rr @@ -6362,11 +6368,11 @@ cS cS af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6379,11 +6385,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad ad aj @@ -6416,11 +6422,11 @@ dJ cS af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6433,11 +6439,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af aj @@ -6470,11 +6476,11 @@ dJ cS af ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6487,11 +6493,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af aj @@ -6524,11 +6530,11 @@ dJ cS ME ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6541,11 +6547,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af aj @@ -6578,11 +6584,11 @@ ex cS KM ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6595,11 +6601,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -6632,11 +6638,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6649,11 +6655,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad Dm ak @@ -6686,11 +6692,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6703,11 +6709,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -6740,11 +6746,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6757,11 +6763,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -6794,11 +6800,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6811,11 +6817,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -6848,11 +6854,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6865,11 +6871,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -6902,11 +6908,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6919,11 +6925,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -6956,11 +6962,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -6973,11 +6979,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad Dm ak @@ -7010,11 +7016,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -7027,11 +7033,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -7064,11 +7070,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -7081,11 +7087,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af ak @@ -7118,11 +7124,11 @@ au au eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -7135,11 +7141,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad af oA @@ -7172,11 +7178,11 @@ eC eC eC ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -7189,11 +7195,11 @@ aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU ad ad ad @@ -7226,11 +7232,11 @@ ad ad ad ad -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa @@ -7243,48 +7249,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -7297,48 +7303,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -7351,48 +7357,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -7405,48 +7411,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -7459,48 +7465,48 @@ aa aa aa aa -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa @@ -8054,6 +8060,336 @@ aa aa aa aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(7,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(8,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(9,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(10,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(11,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(12,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn au au au @@ -8084,30 +8420,30 @@ au au au au -au -au -au -au -au -au -au -au -au -au -au -au +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(7,1,3) = {" +(13,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au @@ -8138,30 +8474,32 @@ au au au au -au -au -au -au -au -au -au -au -au -au -au -au +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(8,1,3) = {" +(14,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn +au +au au au au @@ -8182,6 +8520,38 @@ au au au au +Kq +YD +YD +YD +YD +YD +YD +YD +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(15,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn au au au @@ -8204,18 +8574,38 @@ au au au au +Jz +KR +KR +KR +KR +KR +KR +KR +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(9,1,3) = {" +(16,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au @@ -8238,6 +8628,38 @@ au au au au +Jz +KR +KR +KR +KR +KR +KR +KR +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(17,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn au au au @@ -8258,18 +8680,40 @@ au au au au +au +au +Jz +KR +oY +yz +yz +yz +yz +yz +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa aa -aa -aa -aa -aa "} -(10,1,3) = {" +(18,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au @@ -8285,66 +8729,44 @@ au au au au +SA au au au au au au +Jz +KR +KR au au au au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +yz +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(11,1,3) = {" +(19,1,3) = {" aa aa aa aa aa -au -au -au -au -au -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn +VU +VU +VU +VU +VU fn fn fn @@ -8354,51 +8776,6 @@ fn fn fn fn -fn -fn -fn -fn -fn -fn -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(12,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au au au au @@ -8406,37 +8783,52 @@ au au au au +sG +YD +Fz au au au au +Jz +KR +KR au au au au +yz fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(13,1,3) = {" +(20,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU +fn +VU +VU +VU +VU +VU +VU +VU fn au au @@ -8445,52 +8837,52 @@ au au au au +vw +ux +Uc au au au au +Jz +KR +KR au au au au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +yz fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(14,1,3) = {" +(21,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU +fn +VU +VU +VU +VU +VU +VU +VU fn au au @@ -8499,52 +8891,52 @@ au au au au +KL +Hv +Pl au au au au -au -au -au -au -au -au -au -au -au -au -au -Kq -YD -YD -YD -YD -YD -YD -YD +Jz +KR +OJ +yz +yz +yz +yz +yz fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(15,1,3) = {" +(22,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU +fn +VU +VU +VU +VU +VU +VU +VU fn au au @@ -8554,15 +8946,7 @@ au au au au -au -au -au -au -au -au -au -au -au +SE au au au @@ -8572,863 +8956,161 @@ Jz KR KR KR -KR +Cc KR KR KR fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(16,1,3) = {" +(23,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU +fn +VU +VU +VU +VU +VU +VU +VU fn au au au au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -Jz -KR -KR -KR -KR -KR -KR -KR -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(17,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -Jz -KR -oY -yz -yz -yz -yz -yz -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(18,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -SA -au -au -au -au -au -au -Jz -KR -KR -au -au -au -au -yz -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(19,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -fn -fn -fn -fn -fn -fn -fn -fn -au -au -au -au -au -au -au -sG -YD -Fz -au -au -au -au -Jz -KR +eP +eT +eT +eT +jn +Jv +eW +vl +vl +vl +LJ +LJ +LJ +LJ +Qx KR -au -au -au -au -yz -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(20,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -au -au -au -vw -ux -Uc -au -au -au -au -Jz KR KR -au -au -au -au -yz fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(21,1,3) = {" +VU +VU +VU +VU +VU aa aa aa aa aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -au -au -au -KL -Hv -Pl -au -au -au -au -Jz -KR -OJ -yz -yz -yz -yz -yz -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(22,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -SE -au -au -au -au -au -Jz -KR -KR -KR -Cc -KR -KR -KR -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(23,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -eP -eT -eT -eT -jn -Jv -eW -vl -vl -vl -LJ -LJ -LJ -LJ -Qx -KR -KR -KR -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(24,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -eQ -bE -bE -bE -bE -bE -eX -WC -WC -WC -WC -WC -WC -WC -WC -WC -WC -WC -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(25,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -eQ -bE -bE -co -eV -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(26,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -dG -fo -dS -dS -dS -dS -eR -bE -bE -bA -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(27,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -fn -fn -fn -fn -fn -fn -fn -fn -au -au -au -au -eQ -bE -bE -ej -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(28,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -eQ -bE -bE -bE -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(29,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -eS -eU -eU -eU -eU -eU -eY -au -au -au -au -au -au -au -au -au -au -au -fn -au -au -au -au -au -aa -aa -aa -aa -aa -"} -(30,1,3) = {" -aa -aa -aa -aa -aa -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +"} +(24,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn +VU +VU +VU +VU +VU +VU +VU fn au au au au -au +eQ +bE +bE +bE +bE +bE +eX +WC +WC +WC +WC +WC +WC +WC +WC +WC +WC +WC +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(31,1,3) = {" +(25,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU +fn +VU +VU +VU +VU +VU +VU +VU fn au au au au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +eQ +bE +bE +co +eV +bE +eX au au au @@ -9441,48 +9123,48 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(32,1,3) = {" +(26,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +VU +dG +fo +dS +dS +dS +dS +eR +bE +bE +bA +bE +bE +eX au au au @@ -9495,48 +9177,48 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(33,1,3) = {" +(27,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU +fn +fn +fn +fn +fn +fn +fn +fn fn au au au au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au +eQ +bE +bE +ej +bE +bE +eX au au au @@ -9549,28 +9231,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(34,1,3) = {" +(28,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9584,13 +9266,13 @@ au au au au -au -au -au -au -au -au -au +eQ +bE +bE +bE +bE +bE +eX au au au @@ -9603,28 +9285,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(35,1,3) = {" +(29,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9638,13 +9320,13 @@ au au au au -au -au -au -au -au -au -au +eS +eU +eU +eU +eU +eU +eY au au au @@ -9657,28 +9339,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(36,1,3) = {" +(30,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9711,28 +9393,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(37,1,3) = {" +(31,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9765,28 +9447,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(38,1,3) = {" +(32,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9819,28 +9501,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(39,1,3) = {" +(33,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9873,28 +9555,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(40,1,3) = {" +(34,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9927,28 +9609,28 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(41,1,3) = {" +(35,1,3) = {" aa aa aa aa aa -au -au -au -au -au +VU +VU +VU +VU +VU fn au au @@ -9981,77 +9663,39 @@ au au au fn -au -au -au -au -au +VU +VU +VU +VU +VU aa aa aa aa aa "} -(42,1,3) = {" +(36,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au au au -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn au au au au au -aa -aa -aa -aa -aa -"} -(43,1,3) = {" -aa -aa -aa -aa -aa au au au @@ -10072,6 +9716,32 @@ au au au au +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(37,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn +au +au au au au @@ -10094,18 +9764,36 @@ au au au au +au +au +au +au +au +au +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(44,1,3) = {" +(38,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au @@ -10136,42 +9824,30 @@ au au au au -au -au -au -au -au -au -au -au -au -au -au -au +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(45,1,3) = {" +(39,1,3) = {" aa aa aa aa aa -au -au -au -aX -au -au -au -au -au -au -au -au +VU +VU +VU +VU +VU +fn au au au @@ -10202,18 +9878,30 @@ au au au au +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(46,1,3) = {" +(40,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au @@ -10244,30 +9932,30 @@ au au au au -au -au -au -au -au -au -au -au -au -au -au -au +fn +VU +VU +VU +VU +VU aa aa aa aa aa "} -(47,1,3) = {" +(41,1,3) = {" aa aa aa aa aa +VU +VU +VU +VU +VU +fn au au au @@ -10298,18 +9986,336 @@ au au au au -au -au -au -au -au -au -au -au -au -au -au -au +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(42,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(43,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(44,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(45,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +aX +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(46,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +aa +aa +aa +aa +aa +"} +(47,1,3) = {" +aa +aa +aa +aa +aa +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU aa aa aa diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 8dc13698cda1e..3c26abde493c6 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -40,7 +40,7 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "am" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/engine/atmos) "an" = ( @@ -61,9 +61,10 @@ /turf/open/space, /area/space/nearstation) "ap" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/structure/closet/secure_closet/engineering_electrical{ locked = 0 @@ -95,9 +96,10 @@ /obj/machinery/power/smes{ charge = 5e+006 }, -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/structure/cable{ icon_state = "0-4" @@ -136,12 +138,12 @@ /turf/open/floor/plating, /area/engine/atmos) "ax" = ( -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/engine/atmos) "az" = ( /obj/machinery/meter, -/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/engine/atmos) "aA" = ( @@ -184,7 +186,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "aF" = ( @@ -267,7 +270,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "aU" = ( @@ -280,7 +284,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "aV" = ( @@ -290,7 +295,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "aW" = ( @@ -300,7 +306,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/gravity_generator) "aX" = ( @@ -319,7 +326,8 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "ba" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/engine/atmos) "bb" = ( @@ -349,7 +357,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "bf" = ( @@ -376,12 +385,13 @@ icon_state = "1-2" }, /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/engine/atmos) "bl" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -419,9 +429,10 @@ /turf/open/floor/iron, /area/engine/gravity_generator) "bs" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/rnd/destructive_analyzer, /turf/open/floor/iron, @@ -433,7 +444,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/science) "bu" = ( @@ -452,7 +464,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/engine/engineering) "by" = ( @@ -482,7 +495,8 @@ /turf/open/floor/iron, /area/science) "bH" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "bI" = ( @@ -524,9 +538,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "bP" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/structure/table, /obj/machinery/reagentgrinder, @@ -577,7 +592,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/science) "cc" = ( @@ -609,7 +625,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "cj" = ( @@ -673,7 +690,8 @@ /area/medical/medbay) "cw" = ( /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/bridge) "cx" = ( @@ -710,7 +728,8 @@ /turf/open/floor/iron, /area/medical/chemistry) "cG" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "cI" = ( @@ -758,16 +777,17 @@ /turf/closed/wall/r_wall, /area/construction) "cP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, /area/engine/atmos) "cQ" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/power/apc{ dir = 8; @@ -799,9 +819,10 @@ /turf/open/floor/iron, /area/storage/primary) "cW" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/structure/cable, /obj/machinery/power/apc{ @@ -844,9 +865,10 @@ /turf/open/floor/iron, /area/storage/primary) "dd" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/power/apc{ dir = 8; @@ -866,7 +888,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "dg" = ( @@ -894,7 +917,8 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/corner, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "dl" = ( @@ -991,7 +1015,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "dB" = ( @@ -1026,7 +1051,8 @@ /area/storage/primary) "dH" = ( /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/bridge) "dI" = ( @@ -1082,7 +1108,7 @@ /turf/open/floor/iron, /area/security/brig) "dS" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/machinery/camera/directional/north, /turf/open/floor/plating, /area/engine/atmos) @@ -1165,7 +1191,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/security/brig) "eh" = ( @@ -1175,7 +1202,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "ej" = ( @@ -1186,7 +1214,8 @@ /area/hallway/secondary/entry) "ek" = ( /obj/machinery/door/airlock/public/glass, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "el" = ( @@ -1217,14 +1246,16 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "eq" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "et" = ( @@ -1273,7 +1304,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "eC" = ( @@ -1306,9 +1338,10 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "eG" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_x = -32; - dir = 1 + dir = 1; + locked = "0" }, /turf/open/floor/iron, /area/quartermaster/storage) @@ -1333,11 +1366,13 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "eL" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "eM" = ( @@ -1586,7 +1621,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/hallway/primary/central) "fu" = ( @@ -1596,11 +1632,13 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "fv" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/storage) "fw" = ( @@ -1608,7 +1646,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/corner, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fx" = ( @@ -1648,7 +1687,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fB" = ( @@ -1662,7 +1702,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fD" = ( @@ -1676,7 +1717,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fE" = ( @@ -1686,7 +1728,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fF" = ( @@ -1705,7 +1748,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fH" = ( @@ -1715,12 +1759,14 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "fI" = ( /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "fK" = ( @@ -1742,7 +1788,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "fM" = ( @@ -1778,7 +1825,8 @@ /obj/machinery/keycard_auth{ pixel_y = 28 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fQ" = ( @@ -1786,7 +1834,8 @@ /obj/machinery/status_display/evac{ pixel_y = 32 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fR" = ( @@ -1794,7 +1843,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/storage/primary) "fS" = ( @@ -1805,36 +1855,42 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fT" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "fU" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fV" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fW" = ( /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fX" = ( @@ -1924,9 +1980,10 @@ dir = 1; pixel_y = 23 }, -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_x = 32; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, @@ -1955,7 +2012,8 @@ /area/quartermaster/miningoffice) "gm" = ( /obj/machinery/door/airlock/public/glass, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay) "gn" = ( @@ -1966,7 +2024,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "gp" = ( @@ -1974,7 +2033,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/miningoffice) "gq" = ( @@ -1982,15 +2042,18 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "gr" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/medbay) "gs" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/bridge) "gt" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "gu" = ( @@ -2000,7 +2063,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "gv" = ( @@ -2009,7 +2073,8 @@ /area/hallway/secondary/entry) "gw" = ( /obj/machinery/light, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) "gx" = ( @@ -2042,7 +2107,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "gB" = ( @@ -2085,7 +2151,8 @@ icon_state = "4-8" }, /obj/machinery/camera/directional/north, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "gI" = ( @@ -2105,7 +2172,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/science) "hD" = ( @@ -2125,7 +2193,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -2143,7 +2212,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/science) "jE" = ( @@ -2189,7 +2259,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) "mm" = ( @@ -2240,7 +2311,8 @@ /turf/open/floor/iron, /area/storage/primary) "nA" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/cable{ icon_state = "4-8" }, @@ -2263,7 +2335,8 @@ /area/storage/primary) "ou" = ( /obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/engine/atmos) "oV" = ( @@ -2276,7 +2349,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, @@ -2303,14 +2377,16 @@ /area/medical/chemistry) "qb" = ( /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/engine/atmos) "qn" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/maintenance/department/bridge) @@ -2329,12 +2405,14 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "tX" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "ut" = ( @@ -2351,12 +2429,14 @@ /area/maintenance/aft) "vv" = ( /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/storage/primary) "vP" = ( /obj/machinery/door/airlock/public/glass, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "vY" = ( @@ -2368,7 +2448,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "wD" = ( @@ -2389,9 +2470,10 @@ /turf/open/floor/iron/white/corner, /area/medical/medbay) "wS" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -2418,9 +2500,10 @@ /turf/open/floor/iron, /area/bridge) "AT" = ( -/obj/machinery/airalarm/unlocked{ +/obj/machinery/airalarm{ pixel_y = 23; - dir = 1 + dir = 1; + locked = "0" }, /obj/machinery/power/apc{ dir = 8; @@ -2475,7 +2558,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "Ce" = ( @@ -2520,7 +2604,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/medical/chemistry) "CZ" = ( @@ -2553,7 +2638,8 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "El" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/cable{ icon_state = "4-8" }, @@ -2569,7 +2655,8 @@ /turf/open/floor/iron, /area/construction) "EM" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/machinery/power/apc{ dir = 1; pixel_y = 23 @@ -2580,7 +2667,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "EP" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/cable{ icon_state = "1-4" }, @@ -2590,7 +2678,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "EX" = ( @@ -2616,7 +2705,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -2629,7 +2719,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/storage/primary) "If" = ( @@ -2663,7 +2754,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/bridge) "MT" = ( @@ -2679,7 +2771,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/engine/atmos) "NQ" = ( @@ -2718,7 +2811,7 @@ /turf/open/floor/plating, /area/medical/medbay) "Qz" = ( -/obj/effect/mapping_helpers/simple_pipes/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, @@ -2728,7 +2821,8 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/bridge) "QV" = ( @@ -2758,7 +2852,8 @@ /turf/open/floor/iron/white/corner, /area/medical/medbay) "Tt" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) "Ut" = ( @@ -2795,14 +2890,16 @@ /turf/open/floor/iron, /area/engine/engineering) "VC" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/iron, /area/hallway/secondary/entry) "VF" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/hallway/primary/central) @@ -2844,7 +2941,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /turf/open/floor/iron, /area/science) "XR" = ( @@ -2854,7 +2952,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "XU" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/machinery/light{ dir = 1 }, @@ -2894,7 +2992,8 @@ /area/bridge) "YU" = ( /obj/machinery/door/airlock, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4, /obj/structure/cable{ icon_state = "4-8" }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b75eae3b320c4..b0b89ffa660e6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -252,7 +252,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/centcom{ @@ -2242,7 +2242,7 @@ /turf/open/floor/iron/smooth_large, /area/centcom/evac) "aiZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/white{ @@ -2340,7 +2340,7 @@ /area/centcom/supplypod) "ajP" = ( /obj/structure/chair/fancy/comfy, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/wood, /area/centcom/ferry) "ajQ" = ( @@ -2947,7 +2947,7 @@ /turf/open/floor/holofloor/hyperspace, /area/centcom/supplypod/supplypod_temp_holding) "alU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/trimline/green/line, /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron/edge{ @@ -3546,7 +3546,7 @@ /area/centcom/evac) "aog" = ( /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/airlock/centcom{ name = "Administrative Office"; req_access_txt = "109" @@ -3692,7 +3692,7 @@ /turf/open/floor/iron/tech, /area/centcom/ferry) "aoF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/centcom/ferry) "aoH" = ( @@ -3874,7 +3874,7 @@ }, /area/centcom/supplypod/loading/four) "ape" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/iron/smooth_large, /area/centcom/evac) "apf" = ( @@ -3896,7 +3896,7 @@ }, /area/tdome/tdomeadmin) "apj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/railing{ dir = 8 }, @@ -4040,19 +4040,19 @@ /turf/open/floor/iron/large, /area/centcom/evac) "apI" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/wood, /area/centcom/ferry) "apJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, /area/centcom/ferry) "apK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/wood, /area/centcom/ferry) "apL" = ( @@ -5042,7 +5042,7 @@ /area/centcom/supplypod) "atH" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/white{ @@ -5789,7 +5789,7 @@ /turf/open/floor/iron, /area/centcom/control) "awI" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/machinery/firealarm{ @@ -6615,7 +6615,7 @@ /obj/structure/chair/office{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -7707,7 +7707,7 @@ /turf/open/floor/iron/dark, /area/centcom/evac) "aDX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 10 }, /obj/machinery/meter, @@ -8189,7 +8189,7 @@ /turf/open/floor/iron/white, /area/ctf) "aGg" = ( -/turf/open/floor/plating/snowed, +/turf/open/floor/plating, /area/ctf) "aGi" = ( /obj/structure/girder, @@ -8645,7 +8645,7 @@ /turf/open/floor/plating, /area/centcom/evac) "aHI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/white{ @@ -9440,7 +9440,7 @@ /turf/open/floor/iron/dark, /area/centcom/ferry) "aKf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /obj/machinery/meter, @@ -10445,9 +10445,7 @@ /turf/open/floor/iron/techmaint, /area/centcom/ferry) "aNT" = ( -/obj/structure/window/paperframe{ - CanAtmosPass = 0 - }, +/obj/structure/window/paperframe, /turf/open/floor/wood, /area/centcom/holding) "aNV" = ( @@ -12973,7 +12971,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, /obj/structure/cable/white{ @@ -13684,7 +13682,7 @@ /turf/open/floor/iron, /area/centcom/control) "bvf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/silver{ name = "Bathroom" @@ -14019,12 +14017,12 @@ "dpS" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/green, /area/centcom/ferry) "dqh" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/wood, /area/centcom/ferry) "dsv" = ( @@ -14121,7 +14119,7 @@ /obj/structure/chair/fancy/comfy{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -14920,6 +14918,7 @@ id = 8; dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/iron/techmaint, /area/centcom/supply) "iVh" = ( @@ -14958,7 +14957,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/turf_decal/siding/wood, @@ -15262,6 +15261,7 @@ /area/ctf) "lKb" = ( /obj/effect/turf_decal/stripes/closeup, +/obj/structure/fans/tiny, /turf/open/floor/iron/techmaint, /area/centcom/supply) "lKt" = ( @@ -15344,7 +15344,7 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron/showroomfloor, @@ -15706,7 +15706,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/centcom{ @@ -16106,6 +16106,7 @@ id = 8; dir = 8 }, +/obj/structure/fans/tiny, /turf/open/floor/iron/techmaint, /area/centcom/supply) "rGZ" = ( @@ -16308,7 +16309,7 @@ }, /area/centcom/control) "sJe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/siding/wood{ @@ -16437,7 +16438,7 @@ }, /area/centcom/supply) "tRy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/iron/showroomfloor, @@ -16699,7 +16700,7 @@ /obj/structure/chair/fancy/comfy{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/carpet/green, diff --git a/_maps/shuttles/capsule/capsule_traitor.dmm b/_maps/shuttles/capsule/capsule_traitor.dmm index 7c1f225faa573..ee0620fee0c19 100644 --- a/_maps/shuttles/capsule/capsule_traitor.dmm +++ b/_maps/shuttles/capsule/capsule_traitor.dmm @@ -170,7 +170,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/structure/cable/yellow, @@ -229,7 +229,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/structure/cable/yellow, @@ -251,7 +251,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/machinery/power/port_gen/pacman, diff --git a/_maps/shuttles/emergency/emergency_asteroid.dmm b/_maps/shuttles/emergency/emergency_asteroid.dmm index b6de68951f0e1..c41965e29388f 100644 --- a/_maps/shuttles/emergency/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency/emergency_asteroid.dmm @@ -536,11 +536,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"qO" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "sV" = ( /obj/structure/toilet{ dir = 1 @@ -881,9 +876,9 @@ aa ac am ac -qO -qO -qO +VO +VO +VO ac am ac @@ -936,7 +931,7 @@ ac ac "} (5,1,1) = {" -qO +VO aF ve bJ @@ -948,7 +943,7 @@ ac bN RT bE -qO +VO "} (6,1,1) = {" xE @@ -966,7 +961,7 @@ ac ac "} (7,1,1) = {" -qO +VO ar WD aq @@ -978,7 +973,7 @@ ac Cf Ym sV -qO +VO "} (8,1,1) = {" ac @@ -1026,8 +1021,8 @@ aa aa "} (11,1,1) = {" -qO -qO +VO +VO az aJ Vz @@ -1056,8 +1051,8 @@ aa aa "} (13,1,1) = {" -qO -qO +VO +VO az aK Vz @@ -1073,7 +1068,7 @@ aa (14,1,1) = {" aa aa -qO +VO aK Vz aZ @@ -1081,14 +1076,14 @@ fh aK Vz aZ -qO +VO aa aa "} (15,1,1) = {" aa aa -qO +VO Lj Vz Vz @@ -1096,14 +1091,14 @@ dD Vz Vz Ca -qO +VO aa aa "} (16,1,1) = {" aa aa -qO +VO aK Vz aZ @@ -1111,13 +1106,13 @@ uc aK Vz aZ -qO +VO aa aa "} (17,1,1) = {" -qO -qO +VO +VO az bK Vz @@ -1146,8 +1141,8 @@ aa aa "} (19,1,1) = {" -qO -qO +VO +VO az Dx Vz @@ -1194,13 +1189,13 @@ aa ac ac ac -qO +VO JJ -qO +VO bi -qO +VO Zz -qO +VO ac ac ac @@ -1233,7 +1228,7 @@ lL uM lL bG -qO +VO "} (25,1,1) = {" ac @@ -1286,9 +1281,9 @@ aa aa ac ac -qO +VO ac -qO +VO ac ac aa diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm index e6d1845ee49e6..e511578547918 100644 --- a/_maps/shuttles/emergency/emergency_bar.dmm +++ b/_maps/shuttles/emergency/emergency_bar.dmm @@ -265,7 +265,6 @@ "bC" = ( /obj/structure/shuttle/engine/heater, /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating/airless, /area/shuttle/escape) "bE" = ( @@ -799,11 +798,6 @@ }, /turf/open/floor/iron, /area/shuttle/escape) -"Zp" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "Zq" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/holopad, @@ -831,9 +825,9 @@ LQ ab Py ab -Zp -Zp -Zp +ac +ac +ac ab kK ab @@ -892,7 +886,7 @@ bC bE "} (4,1,1) = {" -Zp +ac af am ar @@ -916,7 +910,7 @@ bC bE "} (5,1,1) = {" -Zp +ac ag an as @@ -940,7 +934,7 @@ bC bE "} (6,1,1) = {" -Zp +ac ah an at @@ -964,7 +958,7 @@ bC bE "} (7,1,1) = {" -Zp +ac ag mB Gr @@ -988,7 +982,7 @@ bC bE "} (8,1,1) = {" -Zp +ac ai ao NU @@ -1052,7 +1046,7 @@ hS Zw xh kj -Zp +ac br cb bU @@ -1065,21 +1059,21 @@ aa aa aa ab -Zp +ac ab -Zp +ac ab ab ab -Zp -Zp -Zp +ac +ac +ac ab ab ab -Zp +ac ab -Zp +ac ab aa "} diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index c31ed502c1464..5ab5c703c9c15 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -540,7 +540,6 @@ dir = 8 }, /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating/airless, /area/shuttle/escape) "xV" = ( @@ -768,7 +767,6 @@ /area/shuttle/escape) "MN" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "Nj" = ( diff --git a/_maps/shuttles/emergency/emergency_box.dmm b/_maps/shuttles/emergency/emergency_box.dmm index 4e2846ce75543..b8517d4f8694b 100644 --- a/_maps/shuttles/emergency/emergency_box.dmm +++ b/_maps/shuttles/emergency/emergency_box.dmm @@ -283,7 +283,6 @@ "bi" = ( /obj/structure/shuttle/engine/heater, /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating/airless, /area/shuttle/escape) "bj" = ( @@ -767,7 +766,6 @@ /area/shuttle/escape) "JW" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "Km" = ( diff --git a/_maps/shuttles/emergency/emergency_cere.dmm b/_maps/shuttles/emergency/emergency_cere.dmm index 71d4e0cbf0c35..2cf233eee536b 100644 --- a/_maps/shuttles/emergency/emergency_cere.dmm +++ b/_maps/shuttles/emergency/emergency_cere.dmm @@ -282,17 +282,17 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "cq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /turf/open/floor/iron/white, /area/shuttle/escape) "cr" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron/white, /area/shuttle/escape) "cs" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 9 }, /turf/open/floor/iron/white, @@ -768,7 +768,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "xv" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index eafff79977731..12461db41413b 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -455,7 +455,7 @@ pixel_y = 9 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/iron, /area/shuttle/escape) "bC" = ( @@ -491,7 +491,7 @@ }, /area/shuttle/escape) "bH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 5 }, /turf/open/floor/iron, @@ -503,7 +503,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "bK" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 10 }, /turf/open/floor/catwalk_floor/iron, @@ -567,13 +567,13 @@ /turf/open/floor/iron, /area/shuttle/escape) "bS" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 5 }, /turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "bT" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 9 }, /turf/open/floor/catwalk_floor/iron, @@ -639,7 +639,7 @@ /area/shuttle/escape) "cF" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /obj/machinery/status_display/evac/directional/south, @@ -901,7 +901,7 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "rY" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 4 }, /turf/open/floor/catwalk_floor/iron, @@ -1397,7 +1397,6 @@ /area/shuttle/escape) "Ky" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "KD" = ( @@ -1933,7 +1932,7 @@ /turf/open/floor/carpet/blue, /area/shuttle/escape) "WV" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/orange/hidden{ dir = 1 }, /turf/open/floor/catwalk_floor/iron, diff --git a/_maps/shuttles/emergency/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm index bfc0b1cf9efea..22d27481e3f66 100644 --- a/_maps/shuttles/emergency/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency/emergency_discoinferno.dmm @@ -7,7 +7,6 @@ /area/shuttle/escape) "c" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating/elevatorshaft, /area/shuttle/escape) "d" = ( diff --git a/_maps/shuttles/emergency/emergency_donut.dmm b/_maps/shuttles/emergency/emergency_donut.dmm index 5b62cf55e6e95..2ba99486d9143 100644 --- a/_maps/shuttles/emergency/emergency_donut.dmm +++ b/_maps/shuttles/emergency/emergency_donut.dmm @@ -471,11 +471,6 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/shuttle/escape) -"Dr" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "FX" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -527,7 +522,7 @@ aa aa ab uu -Dr +ac uu ab aa @@ -558,9 +553,9 @@ aC ab ak ab -Dr -Dr -Dr +ac +ac +ac ad ak ak @@ -579,8 +574,8 @@ ab (3,1,1) = {" aa ab -Dr -Dr +ac +ac ab ab ab @@ -685,7 +680,7 @@ bs bt "} (6,1,1) = {" -Dr +ac af al am @@ -721,7 +716,7 @@ bs bt "} (7,1,1) = {" -Dr +ac ag al am @@ -757,7 +752,7 @@ bs bt "} (8,1,1) = {" -Dr +ac ah al am @@ -793,7 +788,7 @@ bs bt "} (9,1,1) = {" -Dr +ac ai al am @@ -903,8 +898,8 @@ bt (12,1,1) = {" aa ab -Dr -Dr +ac +ac ab ad ax @@ -954,9 +949,9 @@ ak ak ak ad -Dr -Dr -Dr +ac +ac +ac ad ak ak @@ -987,7 +982,7 @@ aa ab ab uu -Dr +ac uu ab aa @@ -995,7 +990,7 @@ aa aa ab uu -Dr +ac uu ab aa diff --git a/_maps/shuttles/emergency/emergency_fland.dmm b/_maps/shuttles/emergency/emergency_fland.dmm index f2d2e7ba5ab57..762f5c67480b9 100644 --- a/_maps/shuttles/emergency/emergency_fland.dmm +++ b/_maps/shuttles/emergency/emergency_fland.dmm @@ -505,11 +505,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"uQ" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "uY" = ( /obj/machinery/shower{ dir = 8; @@ -1498,7 +1493,7 @@ BI rF rF Lc -uQ +Cj UY PU rF diff --git a/_maps/shuttles/emergency/emergency_goon.dmm b/_maps/shuttles/emergency/emergency_goon.dmm index e2c1dcf66128f..b6eeb78a87422 100644 --- a/_maps/shuttles/emergency/emergency_goon.dmm +++ b/_maps/shuttles/emergency/emergency_goon.dmm @@ -117,11 +117,6 @@ /obj/item/radio, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) -"C" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "D" = ( /obj/structure/chair/fancy/comfy{ dir = 4 @@ -328,7 +323,7 @@ a "} (7,1,1) = {" a -C +m s r s @@ -336,7 +331,7 @@ s s r s -C +m a "} (8,1,1) = {" @@ -393,7 +388,7 @@ d "} (12,1,1) = {" a -C +m s s s @@ -401,12 +396,12 @@ r s s s -C +m a "} (13,1,1) = {" a -C +m s s s @@ -414,7 +409,7 @@ r s s s -C +m a "} (14,1,1) = {" @@ -446,13 +441,13 @@ a (16,1,1) = {" a a -C +m y A F A L -C +m a a "} @@ -473,11 +468,11 @@ a a a a -C +m B G I -C +m a a a @@ -487,9 +482,9 @@ a a a d -C -C -C +m +m +m d a a diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 8b1be9081bdbb..fd84e1652796f 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -541,13 +541,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "bQ" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, /turf/open/floor/catwalk_floor/iron, /area/shuttle/escape) "bR" = ( @@ -758,13 +752,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"fr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/turf/open/floor/catwalk_floor/iron, -/area/shuttle/escape) "fx" = ( /obj/machinery/light{ dir = 8 @@ -774,14 +761,6 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"fH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/shuttle/escape) "gU" = ( /obj/machinery/door/airlock/command/glass{ name = "Cockpit"; @@ -798,7 +777,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/iron, /area/shuttle/escape) "ig" = ( @@ -979,17 +957,9 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"yL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/catwalk_floor/iron, -/area/shuttle/escape) "AF" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, /turf/open/floor/iron, /area/shuttle/escape) "AG" = ( @@ -1021,27 +991,13 @@ dir = 8 }, /area/shuttle/escape) -"BN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 8 - }, -/turf/open/floor/catwalk_floor/iron, -/area/shuttle/escape) "Ce" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) -"CQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump, -/turf/open/floor/catwalk_floor/iron, -/area/shuttle/escape) "DK" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/fancy/shuttle{ - dir = 4 - }, /obj/machinery/newscaster/directional/west, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/shuttle/escape) "Eg" = ( @@ -1084,11 +1040,6 @@ dir = 8 }, /area/shuttle/escape) -"Li" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "Ls" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -1270,13 +1221,6 @@ }, /turf/open/floor/grass/no_border, /area/shuttle/escape) -"Yo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/iron, -/area/shuttle/escape) "Yp" = ( /obj/item/kirbyplants{ icon_state = "plant-10" @@ -1352,21 +1296,21 @@ aa ad ad ad -Li -Li -Li +ac +ac +ac ad ad ad -Li -Li -Li +ac +ac +ac ad ad ad "} (4,1,1) = {" -Li +ac EG al aw @@ -1375,15 +1319,15 @@ aF aL aO ad -fH -be +RM +RM RM bd DK -Li +ac "} (5,1,1) = {" -Li +ac TI am aq @@ -1394,13 +1338,13 @@ AT ad AF hJ -BN -CQ -Yo +bQ +bQ +bQ bf "} (6,1,1) = {" -Li +ac Qj an ax @@ -1412,12 +1356,12 @@ ad Ns Ce bQ -yL -fr +bQ +bQ bf "} (7,1,1) = {" -Li +ac Rg ao bZ @@ -1431,7 +1375,7 @@ ad ZQ by by -Li +ac "} (8,1,1) = {" ad @@ -1468,7 +1412,7 @@ bD ad "} (10,1,1) = {" -Li +ac cO bY LY @@ -1482,7 +1426,7 @@ cl df bU bE -Li +ac "} (11,1,1) = {" ad @@ -1493,13 +1437,13 @@ aE aT ar bN -Li +ac bi nd SV bU bF -Li +ac "} (12,1,1) = {" rl @@ -1561,16 +1505,16 @@ ph aT ar bN -Li +ac sb bk Vs bl bI -Li +ac "} (16,1,1) = {" -Li +ac aT bV aP @@ -1584,10 +1528,10 @@ bl ve jb bJ -Li +ac "} (17,1,1) = {" -Li +ac aT bV bN @@ -1595,7 +1539,7 @@ MO aT ar bN -Li +ac cW mV wj @@ -1604,7 +1548,7 @@ bK ad "} (18,1,1) = {" -Li +ac aT bV bN @@ -1612,7 +1556,7 @@ bL aT ar bN -Li +ac bj wu bl @@ -1686,7 +1630,7 @@ bw as be ca -Li +ac "} (23,1,1) = {" ad @@ -1703,7 +1647,7 @@ be re be bP -Li +ac "} (24,1,1) = {" ad @@ -1725,17 +1669,17 @@ ad (25,1,1) = {" ad ad -Li -Li +ac +ac ad -Li -Li +ac +ac ad ad ad -Li -Li -Li +ac +ac +ac ad ad "} diff --git a/_maps/shuttles/emergency/emergency_mini.dmm b/_maps/shuttles/emergency/emergency_mini.dmm index 8a1efe0c68b45..462c76d7d20fc 100644 --- a/_maps/shuttles/emergency/emergency_mini.dmm +++ b/_maps/shuttles/emergency/emergency_mini.dmm @@ -243,11 +243,6 @@ /obj/item/crowbar, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) -"U" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "W" = ( /obj/structure/table, /obj/item/clothing/suit/apron/surgical, @@ -283,9 +278,9 @@ b b b b -U -U -U +n +n +n b b b @@ -341,7 +336,7 @@ b K K Q -U +n "} (4,1,1) = {" c @@ -364,7 +359,7 @@ H t f R -U +n "} (5,1,1) = {" c @@ -387,7 +382,7 @@ Y f f S -U +n "} (6,1,1) = {" c @@ -410,7 +405,7 @@ b L f R -U +n "} (7,1,1) = {" c @@ -433,7 +428,7 @@ b M M T -U +n "} (8,1,1) = {" b @@ -468,7 +463,7 @@ b w b b -U +n b b u diff --git a/_maps/shuttles/emergency/emergency_omega.dmm b/_maps/shuttles/emergency/emergency_omega.dmm index 0f84057d8b5ad..9ef6f5d3d5a85 100644 --- a/_maps/shuttles/emergency/emergency_omega.dmm +++ b/_maps/shuttles/emergency/emergency_omega.dmm @@ -547,12 +547,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/escape) -"Dr" = ( -/obj/structure/window/shuttle, -/obj/structure/grille, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "Eg" = ( /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Infirmary" @@ -745,9 +739,9 @@ Ls ac Mg aa -Dr -Dr -Dr +ab +ab +ab aa wN ac @@ -780,7 +774,7 @@ br bv "} (3,1,1) = {" -Dr +ab ae al al @@ -796,12 +790,12 @@ Ui aW be bk -Dr +ab bs bv "} (4,1,1) = {" -Dr +ab ae al al @@ -817,7 +811,7 @@ Ui aX bf bl -Dr +ab bt bv "} @@ -885,7 +879,7 @@ bt bv "} (8,1,1) = {" -Dr +ab BS LT Bj @@ -901,12 +895,12 @@ Eg Lt Lt YJ -Dr +ab bt bv "} (9,1,1) = {" -Dr +ab Sa Bj Pn @@ -922,12 +916,12 @@ Eg Lt Lt Tw -Dr +ab bt bv "} (10,1,1) = {" -Dr +ab NX cC Pw @@ -949,16 +943,16 @@ bv "} (11,1,1) = {" aa -Dr -Dr +ab +ab aa ac aa -Dr -Dr -Dr -Dr -Dr +ab +ab +ab +ab +ab aa ac aa diff --git a/_maps/shuttles/emergency/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm index b311627ea43e7..8fc2235e4bc8c 100644 --- a/_maps/shuttles/emergency/emergency_pubby.dmm +++ b/_maps/shuttles/emergency/emergency_pubby.dmm @@ -324,7 +324,6 @@ "kK" = ( /obj/structure/window/plastitanium, /obj/structure/grille, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "lf" = ( @@ -369,7 +368,6 @@ /area/shuttle/escape) "ub" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "vo" = ( diff --git a/_maps/shuttles/emergency/emergency_ragecage.dmm b/_maps/shuttles/emergency/emergency_ragecage.dmm index c4f33d51f1fc7..725455ee6429f 100644 --- a/_maps/shuttles/emergency/emergency_ragecage.dmm +++ b/_maps/shuttles/emergency/emergency_ragecage.dmm @@ -122,7 +122,6 @@ /area/shuttle/escape) "iY" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "ji" = ( @@ -554,7 +553,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/door/airlock/alarmlock, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plating, /area/shuttle/escape) "MX" = ( diff --git a/_maps/shuttles/emergency/emergency_raven.dmm b/_maps/shuttles/emergency/emergency_raven.dmm index 03c4a9fc77f63..c681c3c4719e4 100644 --- a/_maps/shuttles/emergency/emergency_raven.dmm +++ b/_maps/shuttles/emergency/emergency_raven.dmm @@ -550,7 +550,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -992,7 +992,6 @@ id = "escape_cockpit_windows"; name = "Cockpit Blast Door" }, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "dO" = ( @@ -1195,7 +1194,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1205,7 +1204,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1257,7 +1256,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /turf/open/floor/plating, @@ -1271,7 +1270,7 @@ /obj/machinery/door/airlock/engineering{ name = "Emergency Shutle Engineering" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/shuttle/escape) @@ -1298,7 +1297,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1325,7 +1324,7 @@ /obj/machinery/door/airlock/external{ name = "Emegency Shuttle External Airlock" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1341,7 +1340,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "qd" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -1354,23 +1353,9 @@ dir = 8 }, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/dark, /area/shuttle/escape) -"rD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 9 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "sH" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 10 @@ -1392,24 +1377,11 @@ /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Seating" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/escape) -"tP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 6 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "tX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -1435,19 +1407,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/escape) -"vr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 5 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "vD" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -1459,7 +1418,7 @@ name = "Station Intercom (General)"; pixel_y = 22 }, -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /turf/open/floor/plating, /area/shuttle/escape) "vE" = ( @@ -1497,18 +1456,18 @@ "xF" = ( /obj/machinery/door/airlock/external, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/escape) "xL" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/escape) "ye" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1521,7 +1480,7 @@ dir = 8 }, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /turf/open/floor/iron/dark, @@ -1571,7 +1530,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -1587,7 +1546,7 @@ /area/shuttle/escape) "AX" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1613,7 +1572,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1623,12 +1582,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/shuttle/escape) -"DU" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "Et" = ( /obj/structure/window/reinforced{ dir = 8 @@ -1637,14 +1590,14 @@ dir = 4 }, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /turf/open/floor/iron/dark, /area/shuttle/escape) "ED" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -1704,7 +1657,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -1717,7 +1670,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1727,7 +1680,7 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -1756,7 +1709,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1804,24 +1757,11 @@ /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/escape) -"NQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 10 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plating, -/area/shuttle/escape) "Ot" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1835,7 +1775,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "PE" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 5 }, /turf/open/floor/plating, @@ -1864,7 +1804,7 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1875,7 +1815,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -1888,7 +1828,7 @@ dir = 4 }, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 6 }, /turf/open/floor/iron/dark, @@ -1907,7 +1847,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden, /turf/open/floor/plating, /area/shuttle/escape) "RS" = ( @@ -1931,7 +1871,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1966,7 +1906,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -1976,7 +1916,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Seating" }, -/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -1985,7 +1925,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -2076,7 +2016,7 @@ aa aa aa aH -DU +br ax ax bU @@ -2085,7 +2025,7 @@ Mk kI cE ax -DU +br ax cT Ic @@ -2116,13 +2056,13 @@ ax bV Xx zx -rD +QD ax ax aj ax ax -NQ +Xx zx ED du @@ -2660,13 +2600,13 @@ ax cb Jn Vm -vr +kI ax ax ao ax ax -tP +Ic Vm kI dz @@ -2688,7 +2628,7 @@ aa aa aa aN -DU +br ax ax cc @@ -2697,7 +2637,7 @@ PJ ED cE ax -DU +br ax cE Xx diff --git a/_maps/shuttles/emergency/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm index a9f91777a46a4..620f6e1d580f2 100644 --- a/_maps/shuttles/emergency/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency/emergency_russiafightpit.dmm @@ -541,11 +541,6 @@ /obj/item/clothing/gloves/fingerless, /turf/open/floor/iron, /area/shuttle/escape) -"sP" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "wq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/optable, @@ -616,9 +611,9 @@ hP ab Vh ad -sP -sP -sP +ac +ac +ac ad Ge ad @@ -725,7 +720,7 @@ bK bL "} (6,1,1) = {" -sP +ac ae aj ao @@ -749,7 +744,7 @@ bK bL "} (7,1,1) = {" -sP +ac af ak ak @@ -773,7 +768,7 @@ bK bL "} (8,1,1) = {" -sP +ac ag ak ap @@ -797,7 +792,7 @@ bK bL "} (9,1,1) = {" -sP +ac af al aq @@ -821,7 +816,7 @@ bK bL "} (10,1,1) = {" -sP +ac ah ak aq @@ -952,13 +947,13 @@ aE aE aE ad -sP -sP -sP +ac +ac +ac ad ad ad -sP +ac ad aa aa diff --git a/_maps/shuttles/emergency/emergency_scrapheap.dmm b/_maps/shuttles/emergency/emergency_scrapheap.dmm index 543ab10afe26c..559e340b816b8 100644 --- a/_maps/shuttles/emergency/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency/emergency_scrapheap.dmm @@ -439,11 +439,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/freezer, /area/shuttle/escape) -"Uc" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) (1,1,1) = {" aa @@ -457,9 +452,9 @@ gl ab jr ab -Uc -Uc -Uc +ac +ac +ac ab mN ab @@ -618,7 +613,7 @@ ac ah al aa -Uc +ac ac aB bo @@ -666,8 +661,8 @@ aa aa aa aa -Uc -Uc +ac +ac aB aH aw diff --git a/_maps/shuttles/emergency/emergency_supermatter.dmm b/_maps/shuttles/emergency/emergency_supermatter.dmm index 5bb9ea80985a3..9a55fc3f7c35e 100644 --- a/_maps/shuttles/emergency/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency/emergency_supermatter.dmm @@ -283,11 +283,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/shuttle/escape) -"lT" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "my" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -367,10 +362,10 @@ aa (2,1,1) = {" aw ae -lT +ad ac ae -lT +ad aw ai aD @@ -413,7 +408,7 @@ bc be "} (4,1,1) = {" -lT +ad ah ai al @@ -437,7 +432,7 @@ aa aa "} (5,1,1) = {" -lT +ad ag aj am @@ -461,7 +456,7 @@ aU aX "} (6,1,1) = {" -lT +ad ag aj an @@ -485,7 +480,7 @@ bd aY "} (7,1,1) = {" -lT +ad ag aj ao @@ -509,7 +504,7 @@ aW aZ "} (8,1,1) = {" -lT +ad ah ai ap @@ -559,10 +554,10 @@ be (10,1,1) = {" aw ae -lT +ad ac ae -lT +ad aw ai aE diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index a325822887e5f..0ce1243062759 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -11,7 +11,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/palebush, -/obj/machinery/door/firedoor/window, /turf/open/floor/grass/no_border, /area/shuttle/escape) "bm" = ( @@ -55,15 +54,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) -"dI" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/grass/no_border, -/area/shuttle/escape) "ec" = ( /obj/machinery/light{ dir = 8 @@ -252,7 +242,6 @@ /area/shuttle/escape) "sT" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "tn" = ( @@ -291,7 +280,6 @@ /obj/effect/spawner/structure/window/shuttle, /obj/structure/grille, /obj/structure/shuttle/engine/heater, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "xB" = ( @@ -329,7 +317,6 @@ /area/shuttle/escape) "xD" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, /obj/structure/curtain/directional{ dir = 4 }, @@ -559,7 +546,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/door/firedoor/window, /turf/open/floor/grass/no_border, /area/shuttle/escape) "Nx" = ( @@ -635,7 +621,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, -/obj/machinery/door/firedoor/window, /turf/open/floor/grass/no_border, /area/shuttle/escape) "Sm" = ( @@ -718,7 +703,7 @@ yG yG Nt aj -dI +kF vi Vn xX diff --git a/_maps/shuttles/emergency/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm index cda35866266b3..32d35c26b6d59 100644 --- a/_maps/shuttles/emergency/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency/emergency_wabbajack.dmm @@ -289,7 +289,6 @@ "ft" = ( /obj/structure/grille, /obj/structure/window/shuttle/tinted, -/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/shuttle/escape) "ji" = ( @@ -404,11 +403,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"RB" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/shuttle/escape) "Uk" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -434,9 +428,9 @@ AO ab JM ab -RB -RB -RB +as +as +as ab oh ab @@ -668,19 +662,19 @@ aa aa aa ab -RB +as ab -RB +as ab ab ab -RB -RB -RB +as +as +as ab ab ab -RB +as ab ab ab diff --git a/_maps/shuttles/exploration/exploration_corg.dmm b/_maps/shuttles/exploration/exploration_corg.dmm index d258595268095..f07fa5c6c5f5b 100644 --- a/_maps/shuttles/exploration/exploration_corg.dmm +++ b/_maps/shuttles/exploration/exploration_corg.dmm @@ -41,21 +41,21 @@ /area/shuttle/exploration) "bS" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/bridge_pipe/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "ce" = ( /obj/machinery/door/airlock/shuttle, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "cr" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "cG" = ( @@ -72,7 +72,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "dv" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -83,7 +83,7 @@ /area/shuttle/exploration) "dN" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -115,14 +115,14 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "fy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "fO" = ( /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "fU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/mineral/titanium, @@ -131,7 +131,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/exploration) "gM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -145,17 +145,17 @@ /turf/open/floor/plating, /area/shuttle/exploration) "gW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "hc" = ( /obj/machinery/camera/directional/east{ name = "Exploration Shuttle" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/machinery/light{ @@ -177,7 +177,7 @@ /turf/open/floor/plating, /area/shuttle/exploration) "hW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -218,7 +218,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "jS" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -262,7 +262,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "lg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/mineral/titanium, @@ -282,7 +282,7 @@ /area/shuttle/exploration) "mk" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/mineral/titanium, @@ -293,7 +293,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "mr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/machinery/light{ @@ -313,7 +313,7 @@ /area/shuttle/exploration) "mR" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /obj/effect/turf_decal/delivery, @@ -329,14 +329,14 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "nF" = ( -/obj/machinery/atmospherics/pipe/manifold/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "nK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -351,7 +351,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "om" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -360,7 +360,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "pd" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/caution, @@ -380,7 +380,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "qJ" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/structure/extinguisher_cabinet{ @@ -399,7 +399,7 @@ /area/shuttle/exploration) "sh" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/shuttle/exploration) "sD" = ( @@ -410,7 +410,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "sO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -419,23 +419,21 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "sY" = ( -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 8 }, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -24 - }, /obj/machinery/light{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "te" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium, @@ -448,8 +446,8 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "tD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/caution{ @@ -469,14 +467,14 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "up" = ( -/obj/machinery/atmospherics/pipe/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "uQ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -495,20 +493,20 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "vx" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "wc" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "wo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -516,7 +514,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "xl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 5 }, /turf/open/floor/mineral/titanium, @@ -525,7 +523,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/exploration) "ym" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -543,7 +541,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "zN" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -553,7 +551,7 @@ /area/shuttle/exploration) "Ac" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /obj/effect/turf_decal/delivery, @@ -571,14 +569,14 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/exploration) "Az" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "AN" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/effect/turf_decal/delivery, @@ -604,7 +602,7 @@ /turf/open/floor/plating, /area/shuttle/exploration) "Cc" = ( -/obj/machinery/atmospherics/pipe/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -615,7 +613,7 @@ /area/shuttle/exploration) "Cu" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -624,7 +622,7 @@ /area/shuttle/exploration) "CU" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/mineral/titanium, @@ -633,7 +631,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "Fr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 8 }, /turf/open/floor/mineral/titanium, @@ -667,7 +665,7 @@ /turf/open/floor/mineral/titanium/purple, /area/shuttle/exploration) "HG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -679,7 +677,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "JG" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -696,13 +694,13 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "JV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Kc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner, @@ -714,7 +712,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "Lc" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -723,11 +721,11 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Ls" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/mineral/titanium/purple, /area/shuttle/exploration) "LA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /obj/machinery/light{ @@ -742,14 +740,14 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "My" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/light{ dir = 8 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "MF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/effect/turf_decal/stripes/corner{ @@ -758,14 +756,14 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Nl" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "NO" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 10 }, /obj/effect/turf_decal/delivery, @@ -773,7 +771,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "NZ" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -784,7 +782,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Of" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -807,7 +805,7 @@ /turf/open/floor/engine, /area/shuttle/exploration) "QT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -815,8 +813,14 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) +"Sd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/exploration) "SG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/item/beacon, @@ -832,7 +836,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, @@ -847,7 +851,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "TU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/mineral/titanium, @@ -872,7 +876,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "VA" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -884,7 +888,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "VO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/mineral/plastitanium, @@ -896,14 +900,14 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "Wd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Wh" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -926,7 +930,7 @@ /area/shuttle/exploration) "XG" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -957,13 +961,13 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "YR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible{ + dir = 4 + }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "ZB" = ( @@ -1189,7 +1193,7 @@ ZM jB aP nF -wc +Sd wc fO te diff --git a/_maps/shuttles/exploration/exploration_delta.dmm b/_maps/shuttles/exploration/exploration_delta.dmm index 23b7e2567d416..e654001e789fd 100644 --- a/_maps/shuttles/exploration/exploration_delta.dmm +++ b/_maps/shuttles/exploration/exploration_delta.dmm @@ -1,14 +1,14 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aR" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/template_noop, /area/shuttle/exploration) "cg" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/chair/fancy/shuttle, @@ -24,7 +24,7 @@ frequency = 1453; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/mineral/titanium, @@ -33,14 +33,14 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/exploration) "fr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/exploration) "fF" = ( /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -62,7 +62,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/mineral/titanium, @@ -89,7 +89,7 @@ minbodytemp = 2.7; name = "Tom" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "ll" = ( @@ -122,15 +122,15 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "qa" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4; - initialize_directions = 4 +/obj/machinery/atmospherics/components/tank/air{ + dir = 3; + initialize_directions = 3 }, /obj/machinery/light/small, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "qi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -183,10 +183,10 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "tq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/hidden{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "ts" = ( @@ -241,16 +241,16 @@ /area/shuttle/exploration) "Dl" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/shuttle/exploration) "DM" = ( /obj/machinery/door/airlock/shuttle, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "GH" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/turf_decal/delivery, @@ -271,7 +271,7 @@ width = 16 }, /obj/machinery/door/airlock/external/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -280,16 +280,16 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "In" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "IP" = ( -/obj/machinery/atmospherics/pipe/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/turf_decal/delivery, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "IQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/structure/chair/fancy/shuttle, @@ -313,7 +313,7 @@ /area/shuttle/exploration) "Nc" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Nx" = ( @@ -339,7 +339,6 @@ /area/shuttle/exploration) "OE" = ( /obj/structure/closet/emcloset/anchored, -/obj/machinery/advanced_airlock_controller/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "OU" = ( @@ -352,17 +351,17 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "PA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Qb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/exploration) "Qy" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 6 }, /obj/effect/turf_decal/bot, @@ -393,7 +392,7 @@ /area/template_noop) "SA" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/mineral/titanium, @@ -405,14 +404,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Vl" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/exploration) "Xj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -431,7 +430,7 @@ /turf/open/floor/plating, /area/shuttle/exploration) "ZX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden{ dir = 8 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm index c38e3748823f2..663f113fdfcd0 100644 --- a/_maps/shuttles/exploration/exploration_fland.dmm +++ b/_maps/shuttles/exploration/exploration_fland.dmm @@ -88,7 +88,7 @@ /turf/open/floor/iron/grid/steel, /area/shuttle/exploration) "ds" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -114,7 +114,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "dT" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/turf_decal/box, @@ -224,7 +224,7 @@ /turf/open/floor/iron/grid/steel, /area/shuttle/exploration) "hJ" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/turf_decal/box, @@ -423,7 +423,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "sy" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -464,7 +464,7 @@ /turf/open/floor/iron/grid/steel, /area/shuttle/exploration) "uE" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/turf_decal/box, @@ -610,7 +610,7 @@ /area/shuttle/exploration) "BT" = ( /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /turf/open/floor/iron/techmaint, @@ -745,7 +745,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/machinery/light/small, /turf/open/floor/iron/techmaint, /area/shuttle/exploration) @@ -1039,7 +1039,7 @@ /obj/item/radio/headset/headset_exploration, /obj/item/radio/headset/headset_exploration, /obj/item/gps/mining, -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/turf_decal/box, @@ -1115,7 +1115,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/exploration/exploration_kilo.dmm b/_maps/shuttles/exploration/exploration_kilo.dmm index 9f206773e2cf3..690d3ff61f0a9 100644 --- a/_maps/shuttles/exploration/exploration_kilo.dmm +++ b/_maps/shuttles/exploration/exploration_kilo.dmm @@ -15,7 +15,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "dt" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/turf_decal/tile/brown/opposingcorners, @@ -312,7 +312,7 @@ /area/shuttle/exploration) "Uu" = ( /obj/machinery/power/port_gen/pacman, -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/structure/cable/yellow, diff --git a/_maps/shuttles/exploration/exploration_rad.dmm b/_maps/shuttles/exploration/exploration_rad.dmm index 70d4e205ba83b..2613a01870cfd 100644 --- a/_maps/shuttles/exploration/exploration_rad.dmm +++ b/_maps/shuttles/exploration/exploration_rad.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "am" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/effect/decal/cleanable/dirt/dust, @@ -21,7 +21,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "aW" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -47,9 +47,6 @@ name = "Exploration Shuttle Shutters"; pixel_y = 24 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/structure/fans/tiny, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) @@ -82,7 +79,7 @@ /turf/open/floor/iron/techmaint, /area/shuttle/exploration) "eN" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, @@ -105,7 +102,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/mineral/titanium, @@ -114,7 +111,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/exploration) "gt" = ( -/obj/machinery/atmospherics/pipe/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/techmaint, /area/shuttle/exploration) @@ -137,7 +134,7 @@ pixel_x = -16; pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/mineral/titanium, @@ -164,7 +161,6 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "rT" = ( -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/shuttle/glass{ autoclose = 0.1 }, @@ -176,7 +172,6 @@ id = "ExploIFuckedUp"; name = "Engine Room Vent" }, -/obj/structure/fans/tiny, /turf/open/floor/iron/techmaint, /area/shuttle/exploration) "tu" = ( @@ -184,7 +179,7 @@ /area/shuttle/exploration) "tG" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/mineral/titanium, @@ -316,10 +311,9 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "Hc" = ( -/obj/machinery/firealarm/directional/south, /obj/machinery/light, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1; initialize_directions = 1 }, @@ -337,7 +331,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "IS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium, @@ -408,7 +402,7 @@ /obj/structure/table, /obj/machinery/recharger, /obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/mineral/titanium, @@ -417,7 +411,6 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/exploration) "QO" = ( -/obj/machinery/door/firedoor/border_only, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -457,7 +450,7 @@ /area/shuttle/exploration) "Uf" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/plating, /area/shuttle/exploration) "UF" = ( @@ -477,15 +470,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/structure/fans/tiny, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "YV" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -500,7 +490,7 @@ pixel_x = 9; pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) diff --git a/_maps/shuttles/exploration/exploration_shuttle.dmm b/_maps/shuttles/exploration/exploration_shuttle.dmm index 035e00e75ea92..a149eec132fe3 100644 --- a/_maps/shuttles/exploration/exploration_shuttle.dmm +++ b/_maps/shuttles/exploration/exploration_shuttle.dmm @@ -46,20 +46,20 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/exploration) "e" = ( /obj/machinery/light/floor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/mineral/plastitanium, @@ -79,7 +79,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "i" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/machinery/power/port_gen/pacman, @@ -93,7 +93,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "j" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/mineral/titanium, @@ -127,10 +127,10 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "o" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/mineral/titanium, @@ -204,10 +204,10 @@ }, /obj/machinery/door/airlock/shuttle, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/mineral/plastitanium, @@ -216,10 +216,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/mineral/titanium, @@ -234,10 +234,10 @@ minbodytemp = 2.7; name = "Tom" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "D" = ( @@ -360,16 +360,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "T" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/structure/closet/crate/science, @@ -392,7 +392,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "V" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/structure/closet/crate, diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm index b59efb7fe7381..23d237ec05019 100644 --- a/_maps/shuttles/hunter/hunter_bounty.dmm +++ b/_maps/shuttles/hunter/hunter_bounty.dmm @@ -25,7 +25,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/plating, /area/shuttle/hunter) "aN" = ( @@ -37,7 +37,7 @@ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/hidden{ dir = 1 }, /turf/open/floor/iron/tech, @@ -124,7 +124,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/north, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -231,7 +231,7 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/hidden, /turf/open/floor/plating{ burnt = 1 }, @@ -279,7 +279,7 @@ dir = 5 }, /obj/item/trash/candy, -/obj/machinery/atmospherics/pipe/manifold/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/hidden{ dir = 8 }, /turf/open/floor/iron/tech, @@ -351,7 +351,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/plating{ broken = 1 }, @@ -364,7 +364,7 @@ /obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/iron/tech, @@ -386,7 +386,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/iron/tech, /area/shuttle/hunter) "qj" = ( @@ -403,7 +403,7 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -445,7 +445,7 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold4w/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden, /turf/open/floor/plating, /area/shuttle/hunter) "rb" = ( @@ -542,7 +542,7 @@ dir = 8 }, /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/iron/tech, @@ -553,7 +553,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 10 }, /turf/open/floor/plating{ @@ -630,7 +630,7 @@ dir = 8 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/plating/rust, @@ -640,7 +640,7 @@ /obj/structure/sign/poster/contraband/missing_gloves{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -651,7 +651,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -691,7 +691,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/plating, /area/shuttle/hunter) "GG" = ( @@ -726,7 +726,7 @@ "IB" = ( /obj/structure/lattice/catwalk/over, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -935,7 +935,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 9 }, /turf/open/floor/iron/tech, @@ -951,7 +951,7 @@ "TB" = ( /obj/structure/lattice/catwalk/over, /obj/item/trash/semki, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/plating/rust, @@ -1009,7 +1009,7 @@ /obj/item/clothing/mask/gas{ pixel_x = -4 }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/iron/tech, diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm index 3ee9fa8e724bc..5b9cd4bf430a3 100644 --- a/_maps/shuttles/hunter/hunter_russian.dmm +++ b/_maps/shuttles/hunter/hunter_russian.dmm @@ -58,7 +58,7 @@ /turf/open/floor/iron/tech/grid, /area/shuttle/hunter) "fZ" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/structure/girder, /obj/effect/decal/cleanable/greenglow, /obj/effect/mapping_helpers/tile_breaker, @@ -137,7 +137,7 @@ /turf/open/floor/iron/techmaint, /area/shuttle/hunter) "ly" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 6 }, /obj/machinery/portable_atmospherics/scrubber, @@ -185,7 +185,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/hunter) "nu" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 }, /obj/effect/decal/cleanable/oil{ @@ -226,7 +226,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/hunter) "pn" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -546,7 +546,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/hunter) "AX" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, @@ -648,10 +648,10 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/hunter) "FR" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, -/obj/machinery/pipedispenser, +/obj/machinery/pipe_dispenser, /turf/open/floor/mineral/plastitanium, /area/shuttle/hunter) "Hk" = ( @@ -711,7 +711,7 @@ /turf/open/floor/wood, /area/shuttle/hunter) "Kh" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/item/storage/toolbox/electrical, /obj/item/storage/belt/utility/full/engi, /obj/item/multitool{ @@ -726,7 +726,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/hunter) "KA" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 }, /obj/structure/cable/yellow{ @@ -790,7 +790,7 @@ /turf/open/floor/iron/dark, /area/shuttle/hunter) "MC" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 }, /obj/structure/rack, @@ -838,7 +838,7 @@ /turf/open/floor/iron/tech/grid, /area/shuttle/hunter) "Pz" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/structure/railing{ dir = 1 }, diff --git a/_maps/shuttles/hunter/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm index 69ec7c2276081..6afb3fdab85ed 100644 --- a/_maps/shuttles/hunter/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter/hunter_space_cop.dmm @@ -267,7 +267,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 9 }, /turf/open/floor/plating/rust, @@ -420,7 +420,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/plating, /area/shuttle/hunter) "kT" = ( @@ -452,7 +452,7 @@ pixel_x = -7; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 8 }, /turf/open/floor/engine, @@ -462,7 +462,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 10 }, /turf/open/floor/plating, @@ -559,7 +559,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 10 }, /turf/open/floor/iron/tech/grid, @@ -604,7 +604,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/atmospherics/pipe/manifold4w/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden, /turf/open/floor/engine, /area/shuttle/hunter) "pY" = ( @@ -626,7 +626,7 @@ pixel_x = -6; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden{ dir = 9 }, /turf/open/floor/iron/techmaint, @@ -954,7 +954,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/iron/techmaint, /area/shuttle/hunter) "Gl" = ( @@ -1022,7 +1022,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/iron/stairs, /area/shuttle/hunter) "Jh" = ( @@ -1226,7 +1226,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/greenglow, -/obj/machinery/atmospherics/pipe/manifold4w/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden, /turf/open/floor/engine, /area/shuttle/hunter) "TA" = ( @@ -1243,7 +1243,7 @@ pixel_x = -8; pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/manifold/purple/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/purple/hidden{ dir = 1 }, /turf/open/floor/engine, @@ -1305,7 +1305,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden, /turf/open/floor/plating, /area/shuttle/hunter) "Wt" = ( diff --git a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm index e7f4ee622daeb..3d72f91aabd00 100644 --- a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm @@ -235,7 +235,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -261,10 +261,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/bridge) @@ -282,7 +280,7 @@ name = "Infiltrator Bridge"; req_access_txt = "150" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -390,7 +388,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -456,10 +454,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/hallway) "aU" = ( @@ -537,7 +533,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -557,7 +553,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -589,7 +585,7 @@ /area/shuttle/syndicate/medical) "be" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -612,7 +608,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -622,7 +618,7 @@ /area/shuttle/syndicate/airlock) "bh" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/poddoor/shutters{ id = "infiltrator_medbay"; name = "Infiltrator Medical Bay" @@ -639,7 +635,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/mineral/plastitanium/red, @@ -651,7 +647,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/mineral/plastitanium/red, @@ -678,7 +674,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -737,7 +733,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/medical) "bs" = ( @@ -770,7 +766,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -789,7 +785,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -807,7 +803,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/medical) "bz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/structure/cable/yellow{ @@ -835,7 +831,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -890,7 +886,7 @@ "bK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/mineral/plastitanium/red, @@ -904,7 +900,7 @@ /area/shuttle/syndicate/medical) "bM" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/mineral/plastitanium/red, @@ -914,7 +910,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1012,7 +1008,7 @@ name = "Surgery Chamber"; req_access_txt = "150" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/medical) "bW" = ( @@ -1040,7 +1036,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable/yellow{ @@ -1059,7 +1055,7 @@ /area/shuttle/syndicate/armory) "bZ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/external{ @@ -1086,7 +1082,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/mineral/plastitanium/red, @@ -1095,7 +1091,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -1128,10 +1124,8 @@ "cg" = ( /obj/machinery/suit_storage_unit/syndicate, /obj/effect/turf_decal/box, -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/pod/dark, /area/shuttle/syndicate/eva) "ch" = ( @@ -1192,7 +1186,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1211,7 +1205,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/light{ dir = 4 }, @@ -1261,7 +1255,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -1302,10 +1296,8 @@ pixel_x = -4; pixel_y = -4 }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/syndicate/medical) @@ -1544,7 +1536,7 @@ /area/shuttle/syndicate/airlock) "dd" = ( /obj/effect/turf_decal/box/corners, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1560,7 +1552,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1583,7 +1575,7 @@ req_access_txt = "150" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1604,10 +1596,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -1635,10 +1625,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/airalarm/syndicate{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -1650,10 +1638,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/airlock) "dm" = ( @@ -1670,7 +1656,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/light{ dir = 8 }, @@ -1682,7 +1668,7 @@ }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1693,10 +1679,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/airlock) "dq" = ( @@ -1711,7 +1695,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1724,7 +1708,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1739,7 +1723,7 @@ }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/airlock) "du" = ( @@ -1749,7 +1733,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -1766,7 +1750,7 @@ /area/shuttle/syndicate/airlock) "dw" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1792,7 +1776,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1827,7 +1811,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1847,7 +1831,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1864,7 +1848,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/hallway) @@ -1938,7 +1922,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2015,7 +1999,7 @@ "dN" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -2056,7 +2040,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/sign/departments/engineering{ pixel_x = 32; pixel_y = -32 @@ -2072,10 +2056,8 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/turf_decal/stripes/line, /turf/open/floor/pod/dark, /area/shuttle/syndicate/medical) @@ -2111,7 +2093,7 @@ /area/shuttle/syndicate/armory) "dX" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 }, /turf/open/floor/mineral/plastitanium, @@ -2121,7 +2103,7 @@ dir = 8 }, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -2157,7 +2139,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/armory) "eb" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/effect/turf_decal/bot, @@ -2176,7 +2158,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -2220,7 +2202,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -2234,7 +2216,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/structure/cable/yellow{ @@ -2247,7 +2229,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/structure/cable/yellow{ @@ -2295,7 +2277,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -2311,7 +2293,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -2327,7 +2309,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/structure/window/reinforced{ @@ -2361,10 +2343,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/pod/dark, /area/shuttle/syndicate/armory) "ep" = ( @@ -2415,7 +2395,7 @@ /area/shuttle/syndicate/armory) "et" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 8 }, /turf/open/floor/mineral/plastitanium, diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm index 9a11216e64085..39f35fe0e531e 100644 --- a/_maps/shuttles/pirate/pirate_default.dmm +++ b/_maps/shuttles/pirate/pirate_default.dmm @@ -22,7 +22,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/piratepad, /obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/iron/dark, @@ -49,7 +49,7 @@ /obj/effect/decal/fakelattice{ icon_state = "lattice-23" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/shuttle/pirate) "cO" = ( @@ -95,7 +95,7 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "eO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -105,7 +105,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/pod/dark, @@ -153,14 +153,14 @@ pixel_x = -10; pixel_y = 18 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/structure/punching_bag, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/iron/techmaint, @@ -186,7 +186,7 @@ /area/shuttle/pirate) "he" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/structure/cable/yellow{ @@ -195,7 +195,7 @@ /obj/effect/decal/fakelattice{ icon_state = "lattice-29" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating{ @@ -265,10 +265,8 @@ pixel_y = -32 }, /obj/machinery/light, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/wood/broken, /area/shuttle/pirate) "jT" = ( @@ -337,7 +335,7 @@ /area/shuttle/pirate) "lT" = ( /obj/effect/mapping_helpers/tile_breaker, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/structure/cable/yellow{ @@ -346,7 +344,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /turf/open/floor/pod/light, @@ -371,7 +369,7 @@ pixel_x = -6; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/pod/light, @@ -415,7 +413,7 @@ /turf/open/floor/grass/no_border, /area/shuttle/pirate) "mV" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste/layer4{ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer4{ dir = 4 }, /turf/open/floor/plating/airless, @@ -536,7 +534,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/pod/light, /area/shuttle/pirate) "pH" = ( @@ -639,14 +637,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/pod/light, /area/shuttle/pirate) "rI" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -657,7 +655,7 @@ name = "Engineering"; req_access_txt = "180" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -749,13 +747,13 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod/dark, @@ -809,7 +807,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/pod/light, @@ -821,10 +819,8 @@ /obj/effect/decal/cleanable/blood/gibs/body{ pixel_y = -13 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -832,7 +828,7 @@ /turf/open/floor/iron/grid/steel, /area/shuttle/pirate) "uG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -845,7 +841,7 @@ name = "Armoury"; req_access_txt = "180" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -910,7 +906,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/pirate) "zL" = ( @@ -970,7 +966,7 @@ pixel_y = 11; pixel_x = -18 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable/yellow{ @@ -986,7 +982,7 @@ pixel_x = 6; pixel_y = -11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/plating{ @@ -1068,7 +1064,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/pod/dark, @@ -1080,14 +1076,14 @@ /obj/structure/sink/kitchen{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/mapping_helpers/tile_breaker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/iron/techmaint, @@ -1134,7 +1130,7 @@ /area/shuttle/pirate) "Ew" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1143,7 +1139,7 @@ /obj/effect/decal/fakelattice{ icon_state = "lattice-46" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating{ @@ -1257,19 +1253,19 @@ /area/shuttle/pirate) "Gh" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /turf/open/floor/wood, /area/shuttle/pirate) "Gp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod/light, @@ -1278,7 +1274,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/pirate) "Gz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1341,7 +1337,7 @@ /turf/open/floor/pod, /area/shuttle/pirate) "Ir" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/window/plastitanium, @@ -1352,7 +1348,7 @@ /turf/open/floor/plating, /area/shuttle/pirate) "II" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/light, /area/shuttle/pirate) @@ -1380,7 +1376,7 @@ /turf/open/floor/iron/tech, /area/shuttle/pirate) "Jc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1392,7 +1388,7 @@ req_access_txt = "180" }, /obj/effect/decal/cleanable/greenglow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/plating/rust, /area/shuttle/pirate) @@ -1401,7 +1397,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/pirate) "Jy" = ( @@ -1420,11 +1416,11 @@ /turf/open/floor/iron/tech, /area/shuttle/pirate) "JR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/pod/light, /area/shuttle/pirate) "Kv" = ( @@ -1432,9 +1428,8 @@ dir = 8 }, /obj/machinery/shuttle_scrambler, -/obj/machinery/airalarm/all_access{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, @@ -1534,7 +1529,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/mapping_helpers/tile_breaker, @@ -1554,14 +1549,14 @@ pixel_x = 5 }, /obj/effect/turf_decal/weather/dirt/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod/dark, @@ -1611,11 +1606,11 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod, @@ -1755,7 +1750,7 @@ }, /obj/effect/mapping_helpers/tile_breaker, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/techmaint, /area/shuttle/pirate) "RZ" = ( @@ -1783,10 +1778,8 @@ pixel_y = -9; pixel_x = 3 }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/fakelattice{ icon_state = "lattice-223" }, @@ -1798,7 +1791,7 @@ name = "Cargo"; req_access_txt = "180" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/pod, /area/shuttle/pirate) @@ -1822,10 +1815,8 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/tech, /area/shuttle/pirate) "SS" = ( @@ -1864,23 +1855,21 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate) "Tl" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/pod/dark, /area/shuttle/pirate) "Tu" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1890,7 +1879,7 @@ dir = 1 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/pod/dark, /area/shuttle/pirate) "TO" = ( @@ -1906,7 +1895,7 @@ /turf/open/floor/plating, /area/shuttle/pirate) "Us" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1920,7 +1909,7 @@ name = "Bridge"; req_access_txt = "180" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/door/firedoor, @@ -1945,7 +1934,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/shuttle/pirate) "UQ" = ( @@ -1975,20 +1964,20 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/shuttle/pirate) "Ve" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -2032,7 +2021,7 @@ /turf/open/floor/iron/tech, /area/shuttle/pirate) "VV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/hatch{ name = "Cargo"; @@ -2067,7 +2056,7 @@ }, /area/shuttle/pirate) "Wb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/stripes/line{ @@ -2159,11 +2148,11 @@ "WJ" = ( /obj/effect/mapping_helpers/tile_breaker, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/pod/light, @@ -2175,7 +2164,7 @@ pixel_x = -2 }, /obj/effect/turf_decal/weather/dirt/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/structure/cable/yellow{ @@ -2187,7 +2176,7 @@ /obj/effect/decal/fakelattice{ icon_state = "lattice-74" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /turf/open/floor/plating{ @@ -2254,7 +2243,7 @@ /area/shuttle/pirate) "Zi" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/wood, @@ -2273,7 +2262,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/pod/light, /area/shuttle/pirate) "ZY" = ( @@ -2281,7 +2270,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron/dark, diff --git a/_maps/shuttles/ruin/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm index 0ae753093f51c..07c893a0359df 100644 --- a/_maps/shuttles/ruin/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin/ruin_caravan_victim.dmm @@ -9,7 +9,7 @@ /area/shuttle/caravan/freighter1) "aM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron{ initial_gas_mix = "TEMP=2.7" @@ -19,7 +19,7 @@ /obj/machinery/door/airlock{ name = "Crew Quarters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -37,7 +37,7 @@ name = "Crew Cabins" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -59,14 +59,14 @@ /area/shuttle/caravan/freighter1) "ct" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "cx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -93,7 +93,7 @@ "dL" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -108,12 +108,12 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "eo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/decal/cleanable/blood, @@ -140,7 +140,7 @@ /area/shuttle/caravan/freighter1) "fk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/machinery/meter, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) @@ -163,17 +163,15 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "if" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /mob/living/simple_animal/hostile/syndicate/ranged/smg/space, @@ -213,7 +211,7 @@ name = "Cabin 1" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) @@ -283,7 +281,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "mt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/iron/dark/airless, @@ -298,7 +296,7 @@ /area/shuttle/caravan/freighter1) "oj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating/airless, @@ -312,11 +310,9 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "ps" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/airless{ broken = 1 }, @@ -342,7 +338,7 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "rF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -359,10 +355,8 @@ /turf/open/floor/plating, /area/shuttle/caravan/freighter1) "so" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -373,7 +367,7 @@ id_tag = "caravantrade1_cabin2"; name = "Cabin 2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) @@ -475,7 +469,7 @@ /area/shuttle/caravan/freighter1) "zd" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -489,7 +483,7 @@ /area/shuttle/caravan/freighter1) "Bu" = ( /obj/item/stack/sheet/mineral/titanium, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron/airless{ @@ -508,7 +502,7 @@ /area/shuttle/caravan/freighter1) "BN" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/engineering{ @@ -517,7 +511,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "CU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/airless{ @@ -617,10 +611,8 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) @@ -628,20 +620,20 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "Hv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "HL" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/command{ @@ -770,7 +762,7 @@ /area/shuttle/caravan/freighter1) "LX" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/door_assembly/door_assembly_min{ anchored = 1; density = 0; @@ -782,7 +774,7 @@ "Mb" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/airless, @@ -802,11 +794,9 @@ }, /area/shuttle/caravan/freighter1) "Ms" = ( -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron/airless, @@ -822,10 +812,8 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/button/door{ id = "caravantrade1_cabin2"; name = "Cabin Bolt Control"; @@ -863,7 +851,7 @@ /turf/open/floor/iron/dark/airless, /area/shuttle/caravan/freighter1) "Qk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -882,7 +870,7 @@ start_charge = 0 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "QY" = ( @@ -947,10 +935,8 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/button/door{ id = "caravantrade1_cabin1"; name = "Cabin Bolt Control"; @@ -967,7 +953,7 @@ /area/shuttle/caravan/freighter1) "VN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -975,18 +961,16 @@ /area/shuttle/caravan/freighter1) "VT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/airless, /area/shuttle/caravan/freighter1) "WU" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/mob_spawn/human/corpse/cargo_tech, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm index cddb5cd3f86d1..c49a19c6cdb0c 100644 --- a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm @@ -22,7 +22,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "bH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -50,7 +50,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -66,7 +66,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/caravan/pirate) "fh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -74,10 +74,8 @@ "fS" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -121,7 +119,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "gO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -139,7 +137,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/shuttle/caravan/pirate) "hT" = ( @@ -151,7 +149,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "ik" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -175,7 +173,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/pirate) "kl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron/white/side{ @@ -195,7 +193,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "kY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/machinery/meter, @@ -222,7 +220,7 @@ /turf/open/floor/iron/white, /area/shuttle/caravan/pirate) "na" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -233,7 +231,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /turf/open/floor/iron/white/side{ @@ -257,7 +255,7 @@ }, /area/shuttle/caravan/pirate) "oA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -298,7 +296,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/caravan/pirate) "py" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -376,7 +374,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "rD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) @@ -385,7 +383,7 @@ /turf/open/floor/iron, /area/shuttle/caravan/pirate) "th" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -417,7 +415,7 @@ /turf/open/floor/iron/white, /area/shuttle/caravan/pirate) "vd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -435,7 +433,7 @@ }, /area/shuttle/caravan/pirate) "vO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -445,7 +443,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/shuttle/caravan/pirate) "wL" = ( @@ -457,7 +455,7 @@ pixel_y = 25; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -472,7 +470,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "xB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -515,7 +513,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "Av" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -530,7 +528,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/caravan/pirate) "Bc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -573,11 +571,9 @@ pixel_x = -24; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, /area/shuttle/caravan/pirate) "DN" = ( @@ -587,10 +583,8 @@ /area/shuttle/caravan/pirate) "DY" = ( /obj/structure/closet/crate/secure/loot, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "EE" = ( @@ -643,12 +637,12 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "Gh" = ( -/obj/machinery/atmospherics/components/unary/tank/air, +/obj/machinery/atmospherics/components/tank/air, /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/shuttle/caravan/pirate) "Gy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -673,7 +667,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/pirate) "HO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -684,7 +678,7 @@ /turf/open/floor/iron, /area/shuttle/caravan/pirate) "Ih" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -696,7 +690,7 @@ /turf/open/floor/iron/white, /area/shuttle/caravan/pirate) "Ja" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -707,10 +701,8 @@ /area/template_noop) "JA" = ( /obj/structure/table, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/ammo_box/a40mm, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -720,10 +712,8 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/white, /area/shuttle/caravan/pirate) "Ku" = ( @@ -795,7 +785,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "Rq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -834,7 +824,7 @@ /turf/open/floor/plating, /area/shuttle/caravan/pirate) "SF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark/side{ @@ -851,7 +841,7 @@ /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "SR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/machinery/firealarm{ @@ -878,7 +868,7 @@ pixel_y = -25; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -907,13 +897,13 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/caravan/pirate) "Yw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark, /area/shuttle/caravan/pirate) "Zo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating, diff --git a/_maps/shuttles/ruin/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin/ruin_syndicate_dropship.dmm index 2ce9a79c46593..74eb7a91c5957 100644 --- a/_maps/shuttles/ruin/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin/ruin_syndicate_dropship.dmm @@ -1,9 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) @@ -303,10 +301,8 @@ /area/shuttle/caravan/syndicate3) "EO" = ( /obj/structure/chair/fancy/shuttle, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/caravan/syndicate3) @@ -325,10 +321,8 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/caravan/syndicate3) "Gx" = ( -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron/dark, /area/shuttle/caravan/syndicate3) "HJ" = ( diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm index 2ef18aed15c47..ccca484a8b74a 100644 --- a/_maps/shuttles/whiteship/whiteship_box.dmm +++ b/_maps/shuttles/whiteship/whiteship_box.dmm @@ -82,7 +82,7 @@ /area/shuttle/abandoned/engine) "av" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/structure/cable/yellow{ @@ -99,7 +99,7 @@ name = "Surgery" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -118,7 +118,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -132,7 +132,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -158,7 +158,7 @@ /area/shuttle/abandoned/engine) "aH" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/structure/cable/yellow{ @@ -171,7 +171,7 @@ /area/shuttle/abandoned/medbay) "aI" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/structure/cable/yellow{ @@ -216,7 +216,7 @@ /area/shuttle/abandoned/crew) "aP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/yellow{ @@ -241,7 +241,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_thermomachine, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -255,28 +255,26 @@ /obj/item/storage/bag/trash{ pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "aV" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/light/small/built, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "aW" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "aX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -287,7 +285,7 @@ /area/shuttle/abandoned/engine) "aY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -355,7 +353,7 @@ /area/shuttle/abandoned/engine) "bl" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -363,14 +361,14 @@ "bm" = ( /obj/machinery/door/airlock/external, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bn" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -388,7 +386,7 @@ /area/shuttle/abandoned/engine) "bq" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/turf_decal/bot, @@ -400,7 +398,7 @@ name = "Surgery" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -409,7 +407,7 @@ "bs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -419,7 +417,7 @@ "bu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/machinery/cryo_cell, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -431,7 +429,7 @@ name = "Break Room" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -444,7 +442,7 @@ /area/shuttle/abandoned/engine) "bz" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -466,7 +464,7 @@ /area/shuttle/abandoned/medbay) "bC" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -476,7 +474,7 @@ /area/shuttle/abandoned/medbay) "bD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -484,7 +482,7 @@ /area/shuttle/abandoned/medbay) "bE" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -511,10 +509,8 @@ /obj/structure/closet/firecloset{ anchored = 1 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -527,7 +523,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -573,7 +569,7 @@ /area/shuttle/abandoned/medbay) "bN" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/yellow{ @@ -584,7 +580,7 @@ /area/shuttle/abandoned/medbay) "bO" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -594,7 +590,7 @@ "bP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ @@ -604,7 +600,7 @@ /area/shuttle/abandoned/medbay) "bQ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -619,7 +615,7 @@ /area/shuttle/abandoned/medbay) "bS" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, /obj/effect/decal/cleanable/blood/old, @@ -635,13 +631,13 @@ /area/shuttle/abandoned/medbay) "bT" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "bU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 }, /obj/structure/cable/yellow{ @@ -677,7 +673,7 @@ name = "Bridge" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -714,7 +710,7 @@ /area/shuttle/abandoned/engine) "cd" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/yellow{ @@ -810,7 +806,7 @@ /obj/machinery/light/small/built{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -870,7 +866,7 @@ /area/shuttle/abandoned/engine) "cr" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable{ @@ -891,7 +887,7 @@ /area/shuttle/abandoned/engine) "ct" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/machinery/power/apc{ @@ -924,7 +920,7 @@ name = "Recovery Room" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -936,7 +932,7 @@ name = "Medical Storage" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -951,7 +947,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/bot, /obj/item/wrench, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable, @@ -962,7 +958,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, /obj/item/weldingtool/largetank, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "cB" = ( @@ -970,7 +966,7 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -986,14 +982,14 @@ /obj/machinery/door/airlock/engineering{ name = "Engineering" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "cD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1106,7 +1102,7 @@ /area/shuttle/abandoned/engine) "cN" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable/yellow{ @@ -1118,7 +1114,7 @@ /area/shuttle/abandoned/medbay) "cO" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/yellow{ @@ -1186,7 +1182,7 @@ /area/shuttle/abandoned/medbay) "cV" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1242,7 +1238,7 @@ "cZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/freezer/blood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /obj/structure/cable/yellow{ @@ -1254,7 +1250,7 @@ /area/shuttle/abandoned/medbay) "da" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1264,7 +1260,7 @@ /area/shuttle/abandoned/medbay) "db" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1283,7 +1279,7 @@ /area/shuttle/abandoned/medbay) "dc" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1294,7 +1290,7 @@ /area/shuttle/abandoned/medbay) "dd" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1304,7 +1300,7 @@ /area/shuttle/abandoned/medbay) "de" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1321,7 +1317,7 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1332,7 +1328,7 @@ "dg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1352,7 +1348,7 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1364,7 +1360,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 9 }, /obj/structure/cable/yellow{ @@ -1481,10 +1477,8 @@ /obj/machinery/light/small/built{ dir = 8 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -1515,10 +1509,8 @@ /obj/machinery/vending/medical{ req_access = null }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/white, /area/shuttle/abandoned/medbay) "el" = ( @@ -1583,10 +1575,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/light/small/built{ dir = 1 }, @@ -1618,10 +1608,8 @@ /obj/structure/closet/secure_closet/medical2{ anchored = 1 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/white/side{ dir = 5 }, @@ -1657,10 +1645,8 @@ /obj/item/pen{ pixel_x = 4 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/flashlight/pen{ pixel_x = -6; pixel_y = -2 @@ -1674,7 +1660,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1706,7 +1692,7 @@ /area/shuttle/abandoned/crew) "ra" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1729,10 +1715,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) @@ -1765,10 +1749,8 @@ dir = 1 }, /obj/structure/bed, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/bedsheet, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1776,7 +1758,7 @@ /area/shuttle/abandoned/crew) "uP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/yellow{ @@ -1829,7 +1811,7 @@ /area/shuttle/abandoned/crew) "xG" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -1879,7 +1861,7 @@ /area/shuttle/abandoned/engine) "Oi" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -1893,10 +1875,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/bin, /obj/item/trash/pistachios, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/trash/can, /obj/item/light/bulb/broken, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -1932,15 +1912,13 @@ pixel_x = -6; pixel_y = 6 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 4 }, /obj/item/clothing/suit/apron/surgical, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /obj/structure/cable/yellow{ @@ -1952,7 +1930,7 @@ /area/shuttle/abandoned/medbay) "Vy" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/airlock{ name = "Cabin 2" }, @@ -1968,7 +1946,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -1979,7 +1957,7 @@ /area/shuttle/abandoned/crew) "WR" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/machinery/door/airlock{ name = "Cabin 1" }, @@ -2037,16 +2015,14 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, diff --git a/_maps/shuttles/whiteship/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm index c5c8bbb01805d..3789ec67b2098 100644 --- a/_maps/shuttles/whiteship/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship/whiteship_delta.dmm @@ -158,7 +158,7 @@ /obj/machinery/door/airlock{ name = "Cabin 2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/shuttle/abandoned/crew) "aF" = ( @@ -166,7 +166,7 @@ /obj/machinery/door/airlock{ name = "Cabin 1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/wood, /area/shuttle/abandoned/crew) "aG" = ( @@ -188,7 +188,7 @@ /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -217,7 +217,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating, @@ -234,7 +234,7 @@ name = "E.V.A Access" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -250,7 +250,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark{ @@ -265,7 +265,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark, @@ -281,7 +281,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron/dark, @@ -312,14 +312,12 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -357,7 +355,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Crew Quarters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/shuttle/abandoned/crew) "br" = ( @@ -404,7 +402,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "bB" = ( @@ -419,7 +417,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "bD" = ( @@ -484,7 +482,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -495,7 +493,7 @@ icon_state = "1-2" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -512,7 +510,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "bT" = ( @@ -529,7 +527,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/plating, @@ -539,7 +537,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "bY" = ( @@ -572,7 +570,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "cf" = ( @@ -584,7 +582,7 @@ icon_state = "2-8" }, /obj/item/gun/energy/laser/retro, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /mob/living/simple_animal/hostile/poison/giant_spider/netcaster{ @@ -614,7 +612,7 @@ icon_state = "1-2" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -652,7 +650,7 @@ pixel_x = 24; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "co" = ( @@ -703,7 +701,7 @@ pixel_x = -24; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "cw" = ( @@ -746,7 +744,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/oil, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "cD" = ( @@ -813,15 +811,13 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plating, @@ -854,7 +850,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "cU" = ( @@ -906,7 +902,7 @@ icon_state = "1-4" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plating, @@ -916,7 +912,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -929,7 +925,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, @@ -942,7 +938,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "dg" = ( @@ -951,7 +947,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "dh" = ( @@ -962,7 +958,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -987,7 +983,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -999,7 +995,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/iron/white/side{ @@ -1017,7 +1013,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -1030,7 +1026,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -1046,7 +1042,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark, @@ -1057,7 +1053,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron/dark, @@ -1072,7 +1068,7 @@ icon_state = "4-8" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/abandoned/medbay) "dq" = ( @@ -1087,7 +1083,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1103,14 +1099,14 @@ /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, /area/shuttle/abandoned/cargo) "ds" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1121,7 +1117,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /turf/open/floor/iron, @@ -1284,10 +1280,8 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/white, /area/shuttle/abandoned/medbay) "dP" = ( @@ -1395,7 +1389,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -1436,7 +1430,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -1454,10 +1448,8 @@ pixel_y = 3 }, /obj/item/radio/off, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron/dark, /area/shuttle/abandoned/medbay) @@ -1519,7 +1511,7 @@ /obj/machinery/light/small/built{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -1538,7 +1530,7 @@ icon_state = "1-2" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/shuttle/abandoned/crew) @@ -1583,16 +1575,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -1612,7 +1602,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -1635,7 +1625,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) "ou" = ( @@ -1646,10 +1636,8 @@ /obj/structure/bed, /obj/item/bedsheet/centcom, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/wood, /area/shuttle/abandoned/crew) "oT" = ( @@ -1756,13 +1744,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/shuttle/abandoned/crew) "zg" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1773,7 +1761,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1793,10 +1781,8 @@ /obj/item/megaphone, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -1807,7 +1793,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -1861,7 +1847,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -1884,7 +1870,7 @@ pixel_y = 24; req_access = null }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -1897,10 +1883,8 @@ /obj/machinery/light/small/built{ dir = 4 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/spider/stickyweb, /turf/open/floor/iron/white/side, /area/shuttle/abandoned/medbay) @@ -1939,10 +1923,8 @@ /obj/item/extinguisher, /obj/item/extinguisher, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/box/white/corners{ dir = 4 }, @@ -1987,10 +1969,8 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/wood, /area/shuttle/abandoned/crew) "GA" = ( @@ -2002,10 +1982,8 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -2093,7 +2071,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -2110,10 +2088,8 @@ /turf/open/floor/iron, /area/shuttle/abandoned/bar) "NM" = ( -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/secure_closet/freezer{ locked = 0; @@ -2169,7 +2145,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -2185,7 +2161,7 @@ icon_state = "1-2" }, /obj/structure/spider/stickyweb, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -2289,14 +2265,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/light/small/built{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/shuttle/abandoned/crew) diff --git a/_maps/shuttles/whiteship/whiteship_fland.dmm b/_maps/shuttles/whiteship/whiteship_fland.dmm index df654c7126440..5b38ccfb52348 100644 --- a/_maps/shuttles/whiteship/whiteship_fland.dmm +++ b/_maps/shuttles/whiteship/whiteship_fland.dmm @@ -20,7 +20,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -122,10 +122,8 @@ pixel_x = -6; pixel_y = 6 }, -/obj/machinery/airalarm/all_access{ - pixel_y = 22; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 4 }, @@ -183,12 +181,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /obj/machinery/door/firedoor, /turf/open/floor/pod/dark, /area/shuttle/abandoned) "il" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/grass, /area/shuttle/abandoned) "iM" = ( @@ -241,7 +239,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /obj/machinery/door/firedoor, @@ -256,7 +254,7 @@ /area/shuttle/abandoned) "la" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, @@ -300,7 +298,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "nV" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 6 }, /turf/open/floor/grass, @@ -368,7 +366,7 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /turf/open/floor/mineral/titanium/blue, @@ -379,7 +377,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /obj/structure/cable{ @@ -389,7 +387,7 @@ /area/shuttle/abandoned) "rR" = ( /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 9 }, /turf/open/floor/plating, @@ -405,13 +403,13 @@ /obj/machinery/door/airlock/titanium{ name = "Sleeping Cabin" }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /obj/machinery/door/firedoor, /turf/open/floor/pod/dark, /area/shuttle/abandoned) "vc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 5 }, /obj/machinery/firealarm{ @@ -422,7 +420,7 @@ /area/shuttle/abandoned) "vd" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "vf" = ( @@ -430,26 +428,26 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 1 }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "vL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "wF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) "xr" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, @@ -483,7 +481,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/pod/dark, @@ -491,10 +489,8 @@ "zB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "Ab" = ( @@ -533,7 +529,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "Eb" = ( -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -577,11 +573,11 @@ /area/shuttle/abandoned) "HL" = ( /obj/structure/glowshroom/single, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden, /turf/open/floor/grass, /area/shuttle/abandoned) "Ig" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/grass, @@ -608,7 +604,7 @@ /area/shuttle/abandoned) "Jz" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 8 }, /obj/machinery/firealarm{ @@ -651,7 +647,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 }, /obj/docking_port/mobile{ @@ -692,16 +688,14 @@ /turf/open/floor/iron/freezer, /area/shuttle/abandoned) "QS" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned) "Ri" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 22 - }, -/obj/machinery/atmospherics/pipe/manifold/dark/hidden{ +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/manifold/dark/hidden{ dir = 4 }, /turf/open/floor/mineral/titanium/yellow, @@ -712,7 +706,7 @@ /turf/open/floor/monotile/steel, /area/shuttle/abandoned) "RH" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /obj/structure/cable/yellow{ @@ -730,10 +724,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "Tq" = ( @@ -763,24 +755,21 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/advanced_airlock_controller/directional/north, /turf/open/floor/pod/dark, /area/shuttle/abandoned) "Uo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, /obj/effect/turf_decal/bot, /turf/open/floor/pod/dark, /area/shuttle/abandoned) "Us" = ( -/obj/machinery/airalarm/all_access{ - pixel_y = 22; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden{ +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 4 }, /turf/open/floor/grass, @@ -803,7 +792,7 @@ /turf/open/floor/grass, /area/shuttle/abandoned) "Yf" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) "YG" = ( @@ -816,7 +805,7 @@ /obj/machinery/door/airlock/titanium/glass{ name = "Botany Lab" }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /obj/machinery/door/firedoor, /turf/open/floor/pod/dark, /area/shuttle/abandoned) diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm index e21f7a117b35c..55507e8741b48 100644 --- a/_maps/shuttles/whiteship/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship/whiteship_meta.dmm @@ -156,8 +156,7 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/advanced_airlock_controller/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/shuttle/abandoned/crew) "ax" = ( @@ -180,7 +179,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -188,7 +187,7 @@ "aA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, @@ -199,7 +198,7 @@ anchored = 1 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -209,7 +208,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{ dir = 1 }, /turf/open/floor/plating, @@ -262,8 +261,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/shuttle/abandoned/crew) "aL" = ( @@ -286,7 +285,7 @@ /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/blood, /obj/effect/decal/remains/human, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 6 }, /turf/open/floor/plating, @@ -319,7 +318,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/airlock/external, @@ -339,7 +338,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /obj/effect/turf_decal/bot, @@ -351,7 +350,7 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/table, @@ -367,13 +366,11 @@ /area/shuttle/abandoned/engine) "bi" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/light/small/built, /obj/effect/decal/cleanable/blood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -384,7 +381,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plating, @@ -449,7 +446,7 @@ /obj/machinery/door/airlock/engineering{ name = "Engineering" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/door/firedoor, @@ -487,10 +484,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "bD" = ( @@ -526,7 +521,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron/dark, @@ -613,10 +608,8 @@ /area/shuttle/abandoned/bar) "cc" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -654,10 +647,8 @@ /area/shuttle/abandoned/bridge) "ce" = ( /obj/structure/table, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt/dust, /obj/item/folder/blue{ pixel_x = 6; @@ -692,10 +683,9 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/advanced_airlock_controller/directional/south, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "cj" = ( @@ -707,10 +697,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plating, @@ -727,10 +717,10 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -866,10 +856,8 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -895,10 +883,8 @@ /area/shuttle/abandoned/cargo) "cU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/processor, /obj/effect/decal/cleanable/dirt, @@ -944,10 +930,8 @@ /area/shuttle/abandoned/engine) "cZ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/machinery/light/small/built{ dir = 1 }, @@ -1062,10 +1046,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, @@ -1076,10 +1060,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -1087,10 +1071,10 @@ /area/shuttle/abandoned/engine) "dB" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -1098,10 +1082,10 @@ "dC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/shuttle/abandoned/bar) "dD" = ( @@ -1109,10 +1093,10 @@ /obj/machinery/door/airlock/glass{ name = "Hydroponics" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -1120,10 +1104,10 @@ /area/shuttle/abandoned/bar) "dE" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /turf/open/floor/iron, @@ -1200,8 +1184,8 @@ /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/shuttle/abandoned/bar) "dQ" = ( @@ -1324,8 +1308,7 @@ dir = 8 }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2, -/obj/machinery/advanced_airlock_controller/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/shuttle/abandoned/bar) "ed" = ( @@ -1417,15 +1400,13 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/stripes/white/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1437,10 +1418,10 @@ /mob/living/simple_animal/hostile/syndicate/melee{ environment_smash = 0 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1502,7 +1483,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1513,17 +1494,17 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "gK" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1534,10 +1515,10 @@ }, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1557,10 +1538,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -1580,7 +1561,7 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1591,8 +1572,8 @@ /mob/living/simple_animal/hostile/syndicate/melee{ environment_smash = 0 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1614,8 +1595,8 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1626,8 +1607,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1641,10 +1622,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1658,8 +1639,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/crew) @@ -1687,7 +1668,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1711,10 +1692,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1769,8 +1750,8 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1779,8 +1760,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood, /obj/effect/decal/remains/human, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1789,10 +1770,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1829,8 +1810,8 @@ /obj/machinery/door/airlock/engineering{ name = "Engineering" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -1840,7 +1821,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral{ @@ -1865,10 +1846,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1925,19 +1906,17 @@ "vC" = ( /obj/machinery/light/small/built, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/white/line, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1974,10 +1953,10 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1992,10 +1971,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2016,10 +1995,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -2032,10 +2011,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2049,8 +2028,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/shuttle/abandoned/bar) @@ -2060,8 +2039,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "BV" = ( @@ -2070,17 +2049,17 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "Cq" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -2089,8 +2068,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/engine) @@ -2099,10 +2078,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -2118,10 +2097,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2132,8 +2111,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/shuttle/abandoned/crew) @@ -2143,10 +2122,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -2227,10 +2206,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2328,10 +2307,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2371,8 +2350,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2386,8 +2365,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -2400,10 +2379,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2419,10 +2398,8 @@ "MW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/hydroponics/constructable, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, @@ -2463,18 +2440,16 @@ /area/shuttle/abandoned/crew) "Oh" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -2557,10 +2532,10 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2603,10 +2578,10 @@ /obj/machinery/door/airlock/glass{ name = "Kitchen" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -2621,10 +2596,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/door/firedoor, @@ -2633,10 +2608,8 @@ /area/shuttle/abandoned/crew) "TL" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2702,10 +2675,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -2721,10 +2694,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/door/firedoor, @@ -2757,10 +2730,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/all_access{ - pixel_y = 24; - dir = 1 - }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, @@ -2770,10 +2741,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -2785,10 +2756,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, diff --git a/auxtools/auxmos.dll b/auxtools/auxmos.dll deleted file mode 100644 index c7ec63323129f..0000000000000 Binary files a/auxtools/auxmos.dll and /dev/null differ diff --git a/beestation.dme b/beestation.dme index 258973f338356..fef444dac67fa 100644 --- a/beestation.dme +++ b/beestation.dme @@ -19,6 +19,7 @@ #include "code\_compile_options.dm" #include "code\_debugger.dm" #include "code\world.dm" +#include "code\__DEFINES\_atoms.dm" #include "code\__DEFINES\_click.dm" #include "code\__DEFINES\_globals.dm" #include "code\__DEFINES\_helpers.dm" @@ -34,6 +35,7 @@ #include "code\__DEFINES\ai.dm" #include "code\__DEFINES\airlock.dm" #include "code\__DEFINES\alarm.dm" +#include "code\__DEFINES\alerts.dm" #include "code\__DEFINES\announcements.dm" #include "code\__DEFINES\anomalies.dm" #include "code\__DEFINES\antagonists.dm" @@ -44,7 +46,6 @@ #include "code\__DEFINES\assemblies.dm" #include "code\__DEFINES\assets.dm" #include "code\__DEFINES\async.dm" -#include "code\__DEFINES\atmospherics.dm" #include "code\__DEFINES\atom_hud.dm" #include "code\__DEFINES\balloon_alert.dm" #include "code\__DEFINES\bans.dm" @@ -86,6 +87,7 @@ #include "code\__DEFINES\exports.dm" #include "code\__DEFINES\fastdmm2.dm" #include "code\__DEFINES\fields.dm" +#include "code\__DEFINES\firealarm.dm" #include "code\__DEFINES\flags.dm" #include "code\__DEFINES\fonts.dm" #include "code\__DEFINES\food.dm" @@ -123,6 +125,7 @@ #include "code\__DEFINES\medical.dm" #include "code\__DEFINES\melee.dm" #include "code\__DEFINES\mentor.dm" +#include "code\__DEFINES\mergers.dm" #include "code\__DEFINES\metacoin.dm" #include "code\__DEFINES\mineral.dm" #include "code\__DEFINES\mobfactions.dm" @@ -205,6 +208,13 @@ #include "code\__DEFINES\xenoartifact_materials.dm" #include "code\__DEFINES\xenobiology.dm" #include "code\__DEFINES\zmimic.dm" +#include "code\__DEFINES\atmospherics\atmos_core.dm" +#include "code\__DEFINES\atmospherics\atmos_gasses.dm" +#include "code\__DEFINES\atmospherics\atmos_helpers.dm" +#include "code\__DEFINES\atmospherics\atmos_identifiers.dm" +#include "code\__DEFINES\atmospherics\atmos_mapping_helpers.dm" +#include "code\__DEFINES\atmospherics\atmos_mob_interaction.dm" +#include "code\__DEFINES\atmospherics\atmos_piping.dm" #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" @@ -261,6 +271,7 @@ #include "code\__HELPERS\admin.dm" #include "code\__HELPERS\announcements.dm" #include "code\__HELPERS\areas.dm" +#include "code\__HELPERS\atmospherics.dm" #include "code\__HELPERS\atoms.dm" #include "code\__HELPERS\bitflag_list.dm" #include "code\__HELPERS\chat.dm" @@ -290,6 +301,7 @@ #include "code\__HELPERS\names.dm" #include "code\__HELPERS\path.dm" #include "code\__HELPERS\patrons.dm" +#include "code\__HELPERS\piping_colors_lists.dm" #include "code\__HELPERS\position_point_vector.dm" #include "code\__HELPERS\priority_announce.dm" #include "code\__HELPERS\pronouns.dm" @@ -339,7 +351,9 @@ #include "code\_globalvars\lists\achievements.dm" #include "code\_globalvars\lists\admin.dm" #include "code\_globalvars\lists\ambience.dm" +#include "code\_globalvars\lists\canisters.dm" #include "code\_globalvars\lists\client.dm" +#include "code\_globalvars\lists\color.dm" #include "code\_globalvars\lists\flavor_misc.dm" #include "code\_globalvars\lists\icons.dm" #include "code\_globalvars\lists\keybindings.dm" @@ -423,7 +437,6 @@ #include "code\controllers\configuration\entries\resources.dm" #include "code\controllers\subsystem\achievements.dm" #include "code\controllers\subsystem\acid.dm" -#include "code\controllers\subsystem\adjacent_air.dm" #include "code\controllers\subsystem\air.dm" #include "code\controllers\subsystem\ambience.dm" #include "code\controllers\subsystem\area_contents.dm" @@ -435,7 +448,6 @@ #include "code\controllers\subsystem\autotransfer.dm" #include "code\controllers\subsystem\ban_cache.dm" #include "code\controllers\subsystem\blackbox.dm" -#include "code\controllers\subsystem\callback.dm" #include "code\controllers\subsystem\chat.dm" #include "code\controllers\subsystem\circuit_component.dm" #include "code\controllers\subsystem\combat_logging.dm" @@ -673,6 +685,7 @@ #include "code\datums\components\explodable.dm" #include "code\datums\components\force_move.dm" #include "code\datums\components\forensics.dm" +#include "code\datums\components\gas_leaker.dm" #include "code\datums\components\gps.dm" #include "code\datums\components\grillable.dm" #include "code\datums\components\haircolor_clothes.dm" @@ -857,6 +870,7 @@ #include "code\datums\elements\_element.dm" #include "code\datums\elements\art.dm" #include "code\datums\elements\atmos_requirements.dm" +#include "code\datums\elements\atmos_sensitive.dm" #include "code\datums\elements\basic_body_temp_sensitive.dm" #include "code\datums\elements\bed_tucking.dm" #include "code\datums\elements\bsa_blocker.dm" @@ -893,6 +907,7 @@ #include "code\datums\elements\undertile.dm" #include "code\datums\elements\update_icon_blocker.dm" #include "code\datums\elements\update_icon_updates_onmob.dm" +#include "code\datums\elements\volatile_gas_storage.dm" #include "code\datums\elements\weather_listener.dm" #include "code\datums\elements\decals\blood.dm" #include "code\datums\elements\food\dunkable.dm" @@ -958,6 +973,7 @@ #include "code\datums\materials\alloys.dm" #include "code\datums\materials\basemats.dm" #include "code\datums\materials\meat.dm" +#include "code\datums\mergers\_merger.dm" #include "code\datums\mocking\client.dm" #include "code\datums\mood_events\drink_events.dm" #include "code\datums\mood_events\drug_events.dm" @@ -1021,7 +1037,6 @@ #include "code\datums\wires\_wires.dm" #include "code\datums\wires\airalarm.dm" #include "code\datums\wires\airlock.dm" -#include "code\datums\wires\airlock_cycle.dm" #include "code\datums\wires\apc.dm" #include "code\datums\wires\autolathe.dm" #include "code\datums\wires\dna_scanner.dm" @@ -1134,7 +1149,6 @@ #include "code\game\machinery\_machinery.dm" #include "code\game\machinery\ai_slipper.dm" #include "code\game\machinery\airlock_control.dm" -#include "code\game\machinery\airlock_cycle_control.dm" #include "code\game\machinery\announcement_system.dm" #include "code\game\machinery\aug_manipulator.dm" #include "code\game\machinery\bank_machine.dm" @@ -1202,7 +1216,6 @@ #include "code\game\machinery\computer\arcade.dm" #include "code\game\machinery\computer\arena.dm" #include "code\game\machinery\computer\atmos_alert.dm" -#include "code\game\machinery\computer\atmos_control.dm" #include "code\game\machinery\computer\buildandrepair.dm" #include "code\game\machinery\computer\camera.dm" #include "code\game\machinery\computer\camera_advanced.dm" @@ -1219,6 +1232,13 @@ #include "code\game\machinery\computer\station_alert.dm" #include "code\game\machinery\computer\teleporter.dm" #include "code\game\machinery\computer\warrant.dm" +#include "code\game\machinery\computer\atmos_computers\_air_sensor.dm" +#include "code\game\machinery\computer\atmos_computers\_atmos_control.dm" +#include "code\game\machinery\computer\atmos_computers\air_sensors.dm" +#include "code\game\machinery\computer\atmos_computers\atmos_controls.dm" +#include "code\game\machinery\computer\atmos_computers\inlets.dm" +#include "code\game\machinery\computer\atmos_computers\meters.dm" +#include "code\game\machinery\computer\atmos_computers\outlets.dm" #include "code\game\machinery\computer\prisoner\_prisoner.dm" #include "code\game\machinery\computer\prisoner\gulag_teleporter.dm" #include "code\game\machinery\computer\prisoner\management.dm" @@ -1228,7 +1248,6 @@ #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_electronics.dm" #include "code\game\machinery\doors\airlock_types.dm" -#include "code\game\machinery\doors\alarmlock.dm" #include "code\game\machinery\doors\brigdoors.dm" #include "code\game\machinery\doors\door.dm" #include "code\game\machinery\doors\firedoor.dm" @@ -1238,8 +1257,6 @@ #include "code\game\machinery\doors\windowdoor.dm" #include "code\game\machinery\embedded_controller\access_controller.dm" #include "code\game\machinery\embedded_controller\airlock_controller.dm" -#include "code\game\machinery\embedded_controller\embedded_controller_base.dm" -#include "code\game\machinery\embedded_controller\simple_vent_controller.dm" #include "code\game\machinery\fabricators\autolathe.dm" #include "code\game\machinery\fabricators\exosuit_fab.dm" #include "code\game\machinery\fabricators\modular_fabricator.dm" @@ -1861,6 +1878,7 @@ #include "code\modules\admin\verbs\deadsay.dm" #include "code\modules\admin\verbs\debug.dm" #include "code\modules\admin\verbs\diagnostics.dm" +#include "code\modules\admin\verbs\fix_air.dm" #include "code\modules\admin\verbs\forcecryo.dm" #include "code\modules\admin\verbs\fps.dm" #include "code\modules\admin\verbs\getlogs.dm" @@ -2213,20 +2231,25 @@ #include "code\modules\asset_cache\spritesheet\batched\universal_icon.dm" #include "code\modules\asset_cache\transports\asset_transport.dm" #include "code\modules\asset_cache\transports\webroot_transport.dm" -#include "code\modules\atmospherics\auxgm\breathing_classes.dm" -#include "code\modules\atmospherics\auxgm\gas_types.dm" #include "code\modules\atmospherics\environmental\LINDA_fire.dm" #include "code\modules\atmospherics\environmental\LINDA_system.dm" #include "code\modules\atmospherics\environmental\LINDA_turf_tile.dm" -#include "code\modules\atmospherics\gasmixtures\auxgm.dm" +#include "code\modules\atmospherics\gasmixtures\breathing_classes.dm" #include "code\modules\atmospherics\gasmixtures\gas_mixture.dm" +#include "code\modules\atmospherics\gasmixtures\gas_types.dm" #include "code\modules\atmospherics\gasmixtures\immutable_mixtures.dm" #include "code\modules\atmospherics\gasmixtures\reactions.dm" -#include "code\modules\atmospherics\machinery\airalarm.dm" #include "code\modules\atmospherics\machinery\atmosmachinery.dm" #include "code\modules\atmospherics\machinery\datum_pipeline.dm" +#include "code\modules\atmospherics\machinery\air_alarm\_air_alarm.dm" +#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_ac.dm" +#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_circuit.dm" +#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_interact.dm" +#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_modes.dm" +#include "code\modules\atmospherics\machinery\air_alarm\air_alarm_thresholds.dm" #include "code\modules\atmospherics\machinery\components\components_base.dm" #include "code\modules\atmospherics\machinery\components\mapping.dm" +#include "code\modules\atmospherics\machinery\components\tank.dm" #include "code\modules\atmospherics\machinery\components\binary_devices\binary_devices.dm" #include "code\modules\atmospherics\machinery\components\binary_devices\circulator.dm" #include "code\modules\atmospherics\machinery\components\binary_devices\dp_vent_pump.dm" @@ -2240,25 +2263,26 @@ #include "code\modules\atmospherics\machinery\components\trinary_devices\filter.dm" #include "code\modules\atmospherics\machinery\components\trinary_devices\mixer.dm" #include "code\modules\atmospherics\machinery\components\trinary_devices\trinary_devices.dm" +#include "code\modules\atmospherics\machinery\components\unary_devices\airlock_pump.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\cryo.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\heat_exchanger.dm" +#include "code\modules\atmospherics\machinery\components\unary_devices\machine_connector.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\passive_vent.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\portables_connector.dm" -#include "code\modules\atmospherics\machinery\components\unary_devices\tank.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\thermomachine.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\unary_devices.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm" #include "code\modules\atmospherics\machinery\components\unary_devices\vent_scrubber.dm" #include "code\modules\atmospherics\machinery\other\meter.dm" #include "code\modules\atmospherics\machinery\other\miner.dm" +#include "code\modules\atmospherics\machinery\pipes\bridge_pipe.dm" +#include "code\modules\atmospherics\machinery\pipes\color_adapter.dm" #include "code\modules\atmospherics\machinery\pipes\layermanifold.dm" -#include "code\modules\atmospherics\machinery\pipes\manifold.dm" -#include "code\modules\atmospherics\machinery\pipes\manifold4w.dm" #include "code\modules\atmospherics\machinery\pipes\mapping.dm" #include "code\modules\atmospherics\machinery\pipes\multiz.dm" #include "code\modules\atmospherics\machinery\pipes\pipes.dm" -#include "code\modules\atmospherics\machinery\pipes\simple.dm" +#include "code\modules\atmospherics\machinery\pipes\smart.dm" #include "code\modules\atmospherics\machinery\pipes\heat_exchange\he_pipes.dm" #include "code\modules\atmospherics\machinery\pipes\heat_exchange\junction.dm" #include "code\modules\atmospherics\machinery\pipes\heat_exchange\manifold.dm" diff --git a/code/__DEFINES/_atoms.dm b/code/__DEFINES/_atoms.dm new file mode 100644 index 0000000000000..abc4d805170c4 --- /dev/null +++ b/code/__DEFINES/_atoms.dm @@ -0,0 +1,12 @@ +#define BAD_INIT_QDEL_BEFORE 1 +#define BAD_INIT_DIDNT_INIT 2 +#define BAD_INIT_SLEPT 4 +#define BAD_INIT_NO_HINT 8 + +#ifdef PROFILE_MAPLOAD_INIT_ATOM +#define PROFILE_INIT_ATOM_BEGIN(...) var/__profile_stat_time = TICK_USAGE +#define PROFILE_INIT_ATOM_END(atom) mapload_init_times[##atom.type] += TICK_USAGE_TO_MS(__profile_stat_time) +#else +#define PROFILE_INIT_ATOM_BEGIN(...) +#define PROFILE_INIT_ATOM_END(...) +#endif diff --git a/code/__DEFINES/alarm.dm b/code/__DEFINES/alarm.dm index f5142f5a16791..2c38e3f3f593e 100644 --- a/code/__DEFINES/alarm.dm +++ b/code/__DEFINES/alarm.dm @@ -1,7 +1,7 @@ //A set of defines to be used by the alarm datums ///Sent by air alarms, indecates something wrong with thier attached atmosphere #define ALARM_ATMOS "Atmosphere" -///Sent by fire alarms when they are toggled +///Sent by firelocks when they detect fire, and by fire alarms when a user pulls them #define ALARM_FIRE "Fire" ///Sent by apcs when their power starts to fail #define ALARM_POWER "Power" diff --git a/code/__DEFINES/alerts.dm b/code/__DEFINES/alerts.dm new file mode 100644 index 0000000000000..67fab4471ab38 --- /dev/null +++ b/code/__DEFINES/alerts.dm @@ -0,0 +1,17 @@ +/** Atmos related */ +#define ALERT_TOO_MUCH_OXYGEN "too_much_oxy" +#define ALERT_NOT_ENOUGH_OXYGEN "not_enough_oxy" + +#define ALERT_TOO_MUCH_PLASMA "too_much_plas" +#define ALERT_NOT_ENOUGH_PLASMA "not_enough_plas" + +#define ALERT_TOO_MUCH_CO2 "too_much_co2" +#define ALERT_NOT_ENOUGH_CO2 "not_enough_co2" + +#define ALERT_TOO_MUCH_N2O "too_much_n2o" +#define ALERT_NOT_ENOUGH_N2O "not_enough_n2o" + +#define ALERT_TOO_MUCH_NITRO "too_much_nitro" +#define ALERT_NOT_ENOUGH_NITRO "not_enough_nitro" + +#define ALERT_NOT_ENOUGH_WATER "not_enough_water" diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm deleted file mode 100644 index c5caf46379798..0000000000000 --- a/code/__DEFINES/atmospherics.dm +++ /dev/null @@ -1,404 +0,0 @@ -//ATMOS -//stuff you should probably leave well alone! -/// kPa*L/(K*mol) -#define R_IDEAL_GAS_EQUATION 8.31 -/// kPa -#define ONE_ATMOSPHERE 101.325 -/// -270.3degC -#define TCMB 2.7 -/// -48.15degC -#define TCRYO 225 -/// 0degC -#define T0C 273.15 -/// 20degC -#define T20C 293.15 -/// -14C - Temperature used for kitchen cold room, medical freezer, etc. -#define COLD_ROOM_TEMP 259.15 - -///moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC (103 or so) -#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) -///compared against for superconductivity -#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005) -/// percentage of oxygen in a normal mixture of air -#define O2STANDARD 0.21 -/// same but for nitrogen -#define N2STANDARD 0.79 -/// O2 standard value (21%) -#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD) -/// N2 standard value (79%) -#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD) -/// liters in a cell -#define CELL_VOLUME 2500 - -#define BREATH_VOLUME 0.5 //! liters in a normal breath -#define BREATH_PERCENTAGE (BREATH_VOLUME/CELL_VOLUME) //! Amount of air to take a from a tile - -//EXCITED GROUPS -#define EXCITED_GROUP_BREAKDOWN_CYCLES 3 //! number of FULL air controller ticks before an excited group breaks down (averages gas contents across turfs) -#define EXCITED_GROUP_DISMANTLE_CYCLES 15 //! number of FULL air controller ticks before an excited group dismantles and removes its turfs from active -#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1 //! Ratio of air that must move to/from a tile to reset group processing -#define MINIMUM_AIR_RATIO_TO_MOVE 0.05 //! Minimum ratio of air that must move to/from a tile -#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND) //! Minimum amount of air that has to move before a group processing can be suspended -#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_MOVE) //! Either this must be active or MINIMUM_TEMPERATURE_TO_MOVE -#define MINIMUM_TEMPERATURE_TO_MOVE (T20C+100) //! Either this must be active or MINIMUM_MOLES_DELTA_TO_MOVE -#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4 //! Minimum temperature difference before group processing is suspended -#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 1 //! Minimum temperature difference before the gas temperatures are just set to be equal -#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+10) -#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+200) - -//HEAT TRANSFER COEFFICIENTS -//Must be between 0 and 1. Values closer to 1 equalize temperature faster -//Should not exceed 0.4 else strange heat flow occur -#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0 -#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4 -#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1 //a hack for now -#define HEAT_CAPACITY_VACUUM 7000 //a hack to help make vacuums "cold", sacrificing realism for gameplay - -//FIRE -#define FIRE_MINIMUM_TEMPERATURE_TO_SPREAD (150+T0C) -#define FIRE_MINIMUM_TEMPERATURE_TO_EXIST (100+T0C) -#define FIRE_SPREAD_RADIOSITY_SCALE 0.85 -#define FIRE_GROWTH_RATE 40000 //For small fires -#define PLASMA_MINIMUM_BURN_TEMPERATURE (100+T0C) -#define PLASMA_UPPER_TEMPERATURE (1370+T0C) -#define PLASMA_OXYGEN_FULLBURN 10 - -//GASES -#define MIN_TOXIC_GAS_DAMAGE 1 -#define MAX_TOXIC_GAS_DAMAGE 10 -#define MOLES_GAS_VISIBLE 0.25 //! Moles in a standard cell after which gases are visible - -#define FACTOR_GAS_VISIBLE_MAX 20 //! moles_visible * FACTOR_GAS_VISIBLE_MAX = Moles after which gas is at maximum visibility -#define MOLES_GAS_VISIBLE_STEP 0.25 //! Mole step for alpha updates. This means alpha can update at 0.25, 0.5, 0.75 and so on - -//REACTIONS -//return values for reactions (bitflags) -#define NO_REACTION 0 -#define REACTING 1 -#define STOP_REACTIONS 2 - -// Pressure limits. -/// This determins at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant) -#define HAZARD_HIGH_PRESSURE 550 -/// This determins when the orange pressure icon is displayed (it is 0.7 * HAZARD_HIGH_PRESSURE) -#define WARNING_HIGH_PRESSURE 325 -/// This is when the gray low pressure icon is displayed. (it is 2.5 * HAZARD_LOW_PRESSURE) -#define WARNING_LOW_PRESSURE 50 -/// This is when the black ultra-low pressure icon is displayed. (This one is set as a constant) -#define HAZARD_LOW_PRESSURE 20 - -/// This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount. -#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 - -/// The natural temperature for a body -#define BODYTEMP_NORMAL 310.15 -/// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. -#define BODYTEMP_AUTORECOVERY_DIVISOR 14 -/// Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50. -#define BODYTEMP_AUTORECOVERY_MINIMUM 6 -///Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. -#define BODYTEMP_COLD_DIVISOR 15 -/// Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster. -#define BODYTEMP_HEAT_DIVISOR 15 -/// The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area. -#define BODYTEMP_COOLING_MAX -30 -/// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area. -#define BODYTEMP_HEATING_MAX 30 - -/// The body temperature limit the human body can take before it starts taking damage from heat. -/// This also affects how fast the body normalises it's temperature when hot. -/// 340k is about 66c, and rather high for a human. -#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30) -/// The body temperature limit the human body can take before it starts taking damage from cold. -/// This also affects how fast the body normalises it's temperature when cold. -/// 270k is about -3c, that is below freezing and would hurt over time. -#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40) -/// The body temperature limit the human body can take before it will take wound damage. -#define BODYTEMP_HEAT_WOUND_LIMIT (BODYTEMP_NORMAL + 90) // 400.5 k - -// Body temperature warning icons -/// The temperature the red icon is displayed. -#define BODYTEMP_HEAT_WARNING_3 (BODYTEMP_HEAT_DAMAGE_LIMIT + 360) //+700k -/// The temperature the orange icon is displayed. -#define BODYTEMP_HEAT_WARNING_2 (BODYTEMP_HEAT_DAMAGE_LIMIT + 120) //460K -/// The temperature the yellow icon is displayed. -#define BODYTEMP_HEAT_WARNING_1 (BODYTEMP_HEAT_DAMAGE_LIMIT) //340K -/// The temperature the light green icon is displayed. -#define BODYTEMP_COLD_WARNING_1 (BODYTEMP_COLD_DAMAGE_LIMIT) //270k -/// The temperature the cyan icon is displayed. -#define BODYTEMP_COLD_WARNING_2 (BODYTEMP_COLD_DAMAGE_LIMIT - 70) //200k -/// The temperature the blue icon is displayed. -#define BODYTEMP_COLD_WARNING_3 (BODYTEMP_COLD_DAMAGE_LIMIT - 150) //120k - -/// what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. -#define SPACE_HELM_MIN_TEMP_PROTECT 2.0 -/// Thermal insulation works both ways /Malkevin -#define SPACE_HELM_MAX_TEMP_PROTECT 1500 -/// what min_cold_protection_temperature is set to for space-suit quality jumpsuits or suits. MUST NOT BE 0. -#define SPACE_SUIT_MIN_TEMP_PROTECT 2.0 -/// The min cold protection of a space suit without the heater active -#define SPACE_SUIT_MIN_TEMP_PROTECT_OFF 72 -#define SPACE_SUIT_MAX_TEMP_PROTECT 1500 - -#define FIRE_SUIT_MIN_TEMP_PROTECT 60 //! Cold protection for firesuits -#define FIRE_SUIT_MAX_TEMP_PROTECT 30000 //! what max_heat_protection_temperature is set to for firesuit quality suits. MUST NOT BE 0. -#define FIRE_HELM_MIN_TEMP_PROTECT 60 //! Cold protection for fire helmets -#define FIRE_HELM_MAX_TEMP_PROTECT 30000 //! for fire helmet quality items (red and white hardhats) - -#define FIRE_IMMUNITY_MAX_TEMP_PROTECT 35000 //! what max_heat_protection_temperature is set to for firesuit quality suits and helmets. MUST NOT BE 0. - -//Emergency skinsuits -#define EMERGENCY_HELM_MIN_TEMP_PROTECT 2.0 //The helmet is pressurized with air from the oxygen tank. If they don't take damage from that they won't take damage here -#define EMERGENCY_SUIT_MIN_TEMP_PROTECT 237 //This is the approximate average temperature of Mt. Everest in the winter - -#define HELMET_MIN_TEMP_PROTECT 160 //For normal helmets -#define HELMET_MAX_TEMP_PROTECT 600 //For normal helmets -#define ARMOR_MIN_TEMP_PROTECT 160 //For armor -#define ARMOR_MAX_TEMP_PROTECT 600 //For armor - -#define GLOVES_MIN_TEMP_PROTECT 2.0 //For some gloves (black and) -#define GLOVES_MAX_TEMP_PROTECT 1500 //For some gloves -#define SHOES_MIN_TEMP_PROTECT 2.0 //For gloves -#define SHOES_MAX_TEMP_PROTECT 1500 //For gloves - -#define PRESSURE_DAMAGE_COEFFICIENT 4 //! The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE -#define MAX_HIGH_PRESSURE_DAMAGE 4 -#define LOW_PRESSURE_DAMAGE 4 //! The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value). - -#define COLD_SLOWDOWN_FACTOR 20 //! Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this - -//PIPES -//Atmos pipe limits -/// (kPa) What pressure pumps and powered equipment max out at. -#define MAX_OUTPUT_PRESSURE 4500 -/// (L/s) Maximum speed powered equipment can work at. -#define MAX_TRANSFER_RATE 200 -/// How many percent of the contents that an overclocked volume pumps leak into the air -#define VOLUME_PUMP_LEAK_AMOUNT 0.1 - -//used for device_type vars -#define UNARY 1 -#define BINARY 2 -#define TRINARY 3 -#define QUATERNARY 4 - -//TANKS -#define TANK_MELT_TEMPERATURE 1000000 //! temperature in kelvins at which a tank will start to melt -#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE) //! temperature in kelvins at which a tank starts leaking -#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE) //! temperature in kelvins at which a tank spills all contents into atmosphere -#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE) //! temperature in kelvins at which a tank creates a boom 3x3 base explosion -#define TANK_FRAGMENT_SCALE (6.*ONE_ATMOSPHERE) //! +1 for each SCALE kPa aboe threshold -#define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE*3) -#define TANK_MIN_RELEASE_PRESSURE 0 -#define TANK_DEFAULT_RELEASE_PRESSURE 17 - -//CANATMOSPASS -#define ATMOS_PASS_YES 1 -#define ATMOS_PASS_NO 0 -#define ATMOS_PASS_PROC -1 //ask CanAtmosPass() -#define ATMOS_PASS_DENSITY -2 //just check density - -#define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) ) -#define CANVERTICALATMOSPASS(A, O) ( A.CanAtmosPassVertical == ATMOS_PASS_PROC ? A.CanAtmosPass(O, TRUE) : ( A.CanAtmosPassVertical == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPassVertical ) ) - -//OPEN TURF ATMOS -/// the default air mix that open turfs spawn -#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15" -#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15" -/// -193,15°C telecommunications. also used for xenobiology slime killrooms -#define TCOMMS_ATMOS "n2=100;TEMP=80" -/// space -#define AIRLESS_ATMOS "TEMP=2.7" -/// -93.15°C snow and ice turfs -#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180" -/// -14°C kitchen coldroom, just might lose your tail; higher amount of mol to reach about 101.3 kpA -#define KITCHEN_COLDROOM_ATMOS "o2=26;n2=97;TEMP=[COLD_ROOM_TEMP]" -/// used in the holodeck burn test program -#define BURNMIX_ATMOS "o2=100;plasma=200;TEMP=370" //used in the holodeck burn test program - -//ATMOSPHERICS DEPARTMENT GAS TANK TURFS -#define ATMOS_TANK_N2O "n2o=6000;TEMP=293.15" -#define ATMOS_TANK_CO2 "co2=50000;TEMP=293.15" -#define ATMOS_TANK_PLASMA "plasma=70000;TEMP=293.15" -#define ATMOS_TANK_O2 "o2=100000;TEMP=293.15" -#define ATMOS_TANK_N2 "n2=100000;TEMP=293.15" -#define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15" - -//LAVALAND -#define MAXIMUM_LAVALAND_EQUIPMENT_EFFECT_PRESSURE 90 //! what pressure you have to be under to increase the effect of equipment meant for lavaland -#define LAVALAND_DEFAULT_ATMOS "o2=14;n2=5;co2=13;TEMP=300" - -//ATMOS MIX IDS -//Lavaland used to live here. That was a mistake. - -//ATMOSIA GAS MONITOR TAGS -#define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in" -#define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out" -#define ATMOS_GAS_MONITOR_SENSOR_O2 "o2_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_PLASMA "plasma_in" -#define ATMOS_GAS_MONITOR_OUTPUT_PLASMA "plasma_out" -#define ATMOS_GAS_MONITOR_SENSOR_PLASMA "plasma_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_AIR "air_in" -#define ATMOS_GAS_MONITOR_OUTPUT_AIR "air_out" -#define ATMOS_GAS_MONITOR_SENSOR_AIR "air_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_MIX "mix_in" -#define ATMOS_GAS_MONITOR_OUTPUT_MIX "mix_out" -#define ATMOS_GAS_MONITOR_SENSOR_MIX "mix_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_N2O "n2o_in" -#define ATMOS_GAS_MONITOR_OUTPUT_N2O "n2o_out" -#define ATMOS_GAS_MONITOR_SENSOR_N2O "n2o_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_N2 "n2_in" -#define ATMOS_GAS_MONITOR_OUTPUT_N2 "n2_out" -#define ATMOS_GAS_MONITOR_SENSOR_N2 "n2_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_CO2 "co2_in" -#define ATMOS_GAS_MONITOR_OUTPUT_CO2 "co2_out" -#define ATMOS_GAS_MONITOR_SENSOR_CO2 "co2_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_INCINERATOR "incinerator_in" -#define ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR "incinerator_out" -#define ATMOS_GAS_MONITOR_SENSOR_INCINERATOR "incinerator_sensor" - -#define ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB "toxinslab_in" -#define ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB "toxinslab_out" -#define ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB "toxinslab_sensor" - -#define ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION "distro-loop_meter" -#define ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE "atmos-waste_loop_meter" - -#define ATMOS_GAS_MONITOR_WASTE_ENGINE "engine-waste_out" -#define ATMOS_GAS_MONITOR_WASTE_ATMOS "atmos-waste_out" - -#define ATMOS_GAS_MONITOR_INPUT_SM "sm_in" -#define ATMOS_GAS_MONITOR_OUTPUT_SM "sm_out" -#define ATMOS_GAS_MONITOR_SENSOR_SM "sm_sense" - -#define ATMOS_GAS_MONITOR_INPUT_SM_WASTE "sm_waste_in" -#define ATMOS_GAS_MONITOR_OUTPUT_SM_WASTE "sm_waste_out" -#define ATMOS_GAS_MONITOR_SENSOR_SM_WASTE "sm_waste_sense" - -#define ATMOS_GAS_MONITOR_INPUT_TOXINS_WASTE "toxins_waste_in" -#define ATMOS_GAS_MONITOR_OUTPUT_TOXINS_WASTE "toxins_waste_out" -#define ATMOS_GAS_MONITOR_SENSOR_TOXINS_WASTE "toxins_waste_sense" - -//AIRLOCK CONTROLLER TAGS - -//RnD toxins burn chamber -#define INCINERATOR_TOXMIX_IGNITER "toxmix_igniter" -#define INCINERATOR_TOXMIX_VENT "toxmix_vent" -#define INCINERATOR_TOXMIX_DP_VENTPUMP "toxmix_airlock_pump" -#define INCINERATOR_TOXMIX_AIRLOCK_SENSOR "toxmix_airlock_sensor" -#define INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER "toxmix_airlock_controller" -#define INCINERATOR_TOXMIX_AIRLOCK_INTERIOR "toxmix_airlock_interior" -#define INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR "toxmix_airlock_exterior" - -//Atmospherics/maintenance incinerator -#define INCINERATOR_ATMOS_IGNITER "atmos_incinerator_igniter" -#define INCINERATOR_ATMOS_MAINVENT "atmos_incinerator_mainvent" -#define INCINERATOR_ATMOS_AUXVENT "atmos_incinerator_auxvent" -#define INCINERATOR_ATMOS_DP_VENTPUMP "atmos_incinerator_airlock_pump" -#define INCINERATOR_ATMOS_AIRLOCK_SENSOR "atmos_incinerator_airlock_sensor" -#define INCINERATOR_ATMOS_AIRLOCK_CONTROLLER "atmos_incinerator_airlock_controller" -#define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior" -#define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior" - -//Syndicate lavaland base incinerator (lavaland_surface_syndicate_base1.dmm) -#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter" -#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent" -#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent" -#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior" - -//MULTIPIPES -//IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH. -#define PIPING_LAYER_MIN 1 -#define PIPING_LAYER_MAX 5 -#define PIPING_LAYER_DEFAULT 3 -#define PIPING_LAYER_P_X 5 -#define PIPING_LAYER_P_Y 5 -#define PIPING_LAYER_LCHANGE 0.05 - -#define PIPING_ALL_LAYER (1<<0) //! intended to connect with all layers, check for all instead of just one. -#define PIPING_ONE_PER_TURF (1<<1) //! can only be built if nothing else with this flag is on the tile already. -#define PIPING_DEFAULT_LAYER_ONLY (1<<2) //! can only exist at PIPING_LAYER_DEFAULT -#define PIPING_CARDINAL_AUTONORMALIZE (1<<3) //! north/south east/west doesn't matter, auto normalize on build. - -// Gas defines because i hate typepaths -#define GAS_O2 "o2" -#define GAS_N2 "n2" -#define GAS_CO2 "co2" -#define GAS_PLASMA "plasma" -#define GAS_H2O "water_vapor" -#define GAS_HYPERNOB "nob" -#define GAS_NITROUS "n2o" -#define GAS_NITRYL "no2" -#define GAS_TRITIUM "tritium" -#define GAS_BZ "bz" -#define GAS_STIMULUM "stim" -#define GAS_PLUOXIUM "pluox" - -#define GAS_FLAG_DANGEROUS (1<<0) -#define GAS_FLAG_BREATH_PROC (1<<1) - -//HELPERS -#define PIPING_LAYER_SHIFT(T, PipingLayer) \ - if(T.dir & (NORTH|SOUTH)) { \ - T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\ - } \ - if(T.dir & (EAST|WEST)) { \ - T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y;\ - } - -#define PIPING_FORWARD_SHIFT(T, PipingLayer, more_shift) \ - if(T.dir & (NORTH|SOUTH)) { \ - T.pixel_y += more_shift * (PipingLayer - PIPING_LAYER_DEFAULT);\ - } \ - if(T.dir & (EAST|WEST)) { \ - T.pixel_x += more_shift * (PipingLayer - PIPING_LAYER_DEFAULT);\ - } - -#define PIPING_LAYER_DOUBLE_SHIFT(T, PipingLayer) \ - T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\ - T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y; - -#ifdef TESTING -GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0)) -#define CALCULATE_ADJACENT_TURFS(T) if (SSadjacent_air.queue[T]) { GLOB.atmos_adjacent_savings[1] += 1 } else { GLOB.atmos_adjacent_savings[2] += 1; SSadjacent_air.queue[T] = 1 } -#else -#define CALCULATE_ADJACENT_TURFS(T) SSadjacent_air.queue[T] = 1 -#endif - -GLOBAL_LIST_INIT(pipe_paint_colors, sort_list(list( - "amethyst" = rgb(130,43,255), - "blue" = rgb(0,0,255), - "brown" = rgb(178,100,56), - "cyan" = rgb(0,255,249), - "dark" = rgb(69,69,69), - "green" = rgb(30,255,0), - "grey" = rgb(255,255,255), - "orange" = rgb(255,129,25), - "purple" = rgb(128,0,182), - "red" = rgb(255,0,0), - "violet" = rgb(64,0,128), - "yellow" = rgb(255,198,0) -))) - -//PIPENET UPDATE STATUS -#define PIPENET_UPDATE_STATUS_DORMANT 0 -#define PIPENET_UPDATE_STATUS_REACT_NEEDED 1 -#define PIPENET_UPDATE_STATUS_RECONCILE_NEEDED 2 - -// GAS MIXTURE STUFF (used to be in code/modules/atmospherics/gasmixtures/gas_mixture.dm) -#define MINIMUM_HEAT_CAPACITY 0.0003 -#define MINIMUM_MOLE_COUNT 0.01 -/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that -once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */ -#define QUANTIZE(variable) (round(variable,0.0000001)) diff --git a/code/__DEFINES/atmospherics/atmos_core.dm b/code/__DEFINES/atmospherics/atmos_core.dm new file mode 100644 index 0000000000000..55b7f27f1bced --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_core.dm @@ -0,0 +1,272 @@ +//LISTMOS +//indices of values in gas lists. +///Amount of total moles in said gas mixture +#define MOLES 1 +///Archived version of MOLES +#define ARCHIVE 2 +///All gas related variables +#define GAS_META 3 +///Gas specific heat per mole +#define META_GAS_SPECIFIC_HEAT 1 +///Name of the gas +#define META_GAS_NAME 2 +///Amount of moles required of the gas to be visible +#define META_GAS_MOLES_VISIBLE 3 +///Overlay path of the gas, also setup the alpha based on the amount +#define META_GAS_OVERLAY 4 +///Let the air alarm know if the gas is dangerous +#define META_GAS_DANGER 5 +///Id of the gas for quick access +#define META_GAS_ID 6 +///Short description of the gas. +#define META_GAS_DESC 7 +///Power of the gas when used in the current iteration of fusion +#define META_GAS_FUSION_POWER 8 +///Defines the alert that should jump out if the quantity of a gas affects to a point it's too much or not enough +#define META_GAS_BREATH_ALERT_INFO 9 +///Defines the reagents applied on breathing the gas +#define META_GAS_BREATH_REAGENT 10 +///Defines the gas to which this gas is a result of breathing +#define META_GAS_BREATH_RESULTS 11 +///Reagents applied when the gas passes its dangerous threshold +#define META_GAS_BREATH_REAGENT_DANGEROUS 12 + + +//ATMOS +//stuff you should probably leave well alone! +/// kPa*L/(K*mol) +#define R_IDEAL_GAS_EQUATION 8.31 +/// kPa +#define ONE_ATMOSPHERE 101.325 +/// -270.3degC +#define TCMB 2.7 +/// -48.15degC +#define TCRYO 225 +/// 0degC +#define T0C 273.15 +/// 20degC +#define T20C 293.15 +/// -14C - Temperature used for kitchen cold room, medical freezer, etc. +#define COLD_ROOM_TEMP 259.15 + +/** + *I feel the need to document what happens here. Basically this is used + *catch rounding errors, and make gas go away in small portions. + *People have raised it to higher levels in the past, do not do this. Consider this number a soft limit + *If you're making gasmixtures that have unexpected behavior related to this value, you're doing something wrong. + * + *On an unrelated note this may cause a bug that creates negative gas, related to round(). When it has a second arg it will round up. + *So for instance round(0.5, 1) == 1. I've hardcoded a fix for this into share, by forcing the garbage collect. + *Any other attempts to fix it just killed atmos. I leave this to a greater man then I + */ +/// The minimum heat capacity of a gas +#define MINIMUM_HEAT_CAPACITY 0.0003 +/// Minimum mole count of a gas +#define MINIMUM_MOLE_COUNT 0.01 +/// Molar accuracy to round to +#define MOLAR_ACCURACY 1E-4 +/// Types of gases (based on gaslist_cache) +#define GAS_TYPE_COUNT GLOB.gaslist_cache.len +/// Maximum error caused by QUANTIZE when removing gas (roughly, in reality around 2 * MOLAR_ACCURACY less) +#define MAXIMUM_ERROR_GAS_REMOVAL (MOLAR_ACCURACY * GAS_TYPE_COUNT) + +/// Moles in a standard cell after which gases are visible +#define MOLES_GAS_VISIBLE 0.25 + +/// moles_visible * FACTOR_GAS_VISIBLE_MAX = Moles after which gas is at maximum visibility +#define FACTOR_GAS_VISIBLE_MAX 20 +/// Mole step for alpha updates. This means alpha can update at 0.25, 0.5, 0.75 and so on +#define MOLES_GAS_VISIBLE_STEP 0.25 +/// The total visible states +#define TOTAL_VISIBLE_STATES (FACTOR_GAS_VISIBLE_MAX * (1 / MOLES_GAS_VISIBLE_STEP)) + +//REACTIONS +//return values for reactions (bitflags) +///The gas mixture is not reacting +#define NO_REACTION 0 +///The gas mixture is reacting +#define REACTING 1 +///The gas mixture is able to stop all reactions +#define STOP_REACTIONS 2 + + +//EXCITED GROUPS +/** + * Some further context on breakdown. Unlike dismantle, the breakdown ticker doesn't reset itself when a tile is added + * This is because we cannot expect maps to have small spaces, so we need to even ourselves out often + * We do this to avoid equalizing a large space in one tick, with some significant amount of say heat diff + * This way large areas don't suddenly all become cold at once, it acts more like a wave + * + * Because of this and the behavior of share(), the breakdown cycles value can be tweaked directly to effect how fast we want gas to move + */ +/// number of FULL air controller ticks before an excited group breaks down (averages gas contents across turfs) +#define EXCITED_GROUP_BREAKDOWN_CYCLES 4 +/// number of FULL air controller ticks before an excited group dismantles and removes its turfs from active +#define EXCITED_GROUP_DISMANTLE_CYCLES (EXCITED_GROUP_BREAKDOWN_CYCLES * 2) + 1 //Reset after 2 breakdowns +/// Ratio of air that must move to/from a tile to reset group processing +#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1 +/// Minimum ratio of air that must move to/from a tile +#define MINIMUM_AIR_RATIO_TO_MOVE 0.001 +/// Minimum amount of air that has to move before a group processing can be suspended (Round about 10) +#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND) +/// Either this must be active (round about 0.1) //Might need to raise this a tad to better support space leaks. we'll see +#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_MOVE) +/// or this (or both, obviously) +#define MINIMUM_TEMPERATURE_TO_MOVE (T20C+100) +/// Minimum temperature difference before group processing is suspended +#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4 +/// Minimum temperature difference before the gas temperatures are just set to be equal +#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5 +///Minimum temperature to continue superconduction once started +#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+80) +///Minimum temperature to start doing superconduction calculations +#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+400) + +//HEAT TRANSFER COEFFICIENTS +//Must be between 0 and 1. Values closer to 1 equalize temperature faster +//Should not exceed 0.4 else strange heat flow occur +#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0 +#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4 +/// a hack for now +#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1 +/// a hack to help make vacuums "cold", sacrificing realism for gameplay +#define HEAT_CAPACITY_VACUUM 7000 + +//FIRE +///Minimum temperature for fire to move to the next turf (150 °C or 433 K) +#define FIRE_MINIMUM_TEMPERATURE_TO_SPREAD (150+T0C) +///Minimum temperature for fire to exist on a turf (100 °C or 373 K) +#define FIRE_MINIMUM_TEMPERATURE_TO_EXIST (100+T0C) +///Multiplier for the temperature shared to other turfs +#define FIRE_SPREAD_RADIOSITY_SCALE 0.85 +///Helper for small fires to grow +#define FIRE_GROWTH_RATE 40000 + +///moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC (103 or so) +#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) +#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005) +/// percentage of oxygen in a normal mixture of air +#define O2STANDARD 0.21 +/// same but for nitrogen +#define N2STANDARD 0.79 +/// O2 standard value (21%) +#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD) +/// N2 standard value (79%) +#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD) +/// liters in a cell +#define CELL_VOLUME 2500 + +//CANATMOSPASS +#define ATMOS_PASS_YES 1 +#define ATMOS_PASS_NO 0 +/// ask can_atmos_pass() +#define ATMOS_PASS_PROC -1 +/// just check density +#define ATMOS_PASS_DENSITY -2 + +//Adjacent turf related defines, they dictate what to do with a turf once it's been recalculated +//Used as "state" in CALCULATE_ADJACENT_TURFS +///Normal non-active turf +#define NORMAL_TURF 1 +///Set the turf to be activated on the next calculation +#define MAKE_ACTIVE 2 +///Disable excited group +#define KILL_EXCITED 3 + +/// How many maximum iterations do we allow the Newton-Raphson approximation for gas pressure to do. +#define ATMOS_PRESSURE_APPROXIMATION_ITERATIONS 20 +/// We deal with big numbers and a lot of math, things are bound to get imprecise. Take this traveller. +#define ATMOS_PRESSURE_ERROR_TOLERANCE 0.01 + +/// Used when an atmos machine has "external" selected. +/// Found in `pressure_checks` of vents and air alarms. +#define ATMOS_EXTERNAL_BOUND (1 << 0) + +/// Used when an atmos machine has "internal" selected. +/// Found in `pressure_checks` of vents and air alarms. +#define ATMOS_INTERNAL_BOUND (1 << 1) + +/// The maximum bound of an atmos machine. +/// Found in `pressure_checks` of vents and air alarms. +#define ATMOS_BOUND_MAX (ATMOS_EXTERNAL_BOUND | ATMOS_INTERNAL_BOUND) + +/// Used when an atmos machine is siphoning out air. +/// Found in air alarms, vents, and scrubbers. +#define ATMOS_DIRECTION_SIPHONING 0 + +/// Used when a vent is releasing air. +/// Found in air alarms, vents, and scrubbers. +#define ATMOS_DIRECTION_RELEASING 1 + +/// Used when a scrubber is scrubbing air. +/// Found in air alarms, vents, and scrubbers. +#define ATMOS_DIRECTION_SCRUBBING 1 + +/// The max pressure of pumps. +#define ATMOS_PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 50) + +// Value of [/obj/machinery/airalarm/var/danger_level] and retvals of [/datum/tlv/proc/check_value] +/// No TLV exceeded. +#define AIR_ALARM_ALERT_NONE 0 +/// TLV warning exceeded but not hazardous. +#define AIR_ALARM_ALERT_WARNING 1 +/// TLV hazard exceeded or someone pulled the switch. +#define AIR_ALARM_ALERT_HAZARD 2 + +// Air alarm buildstage [/obj/machinery/airalarm/buildstage] +/// Air alarm missing circuit +#define AIR_ALARM_BUILD_NO_CIRCUIT 0 +/// Air alarm has circuit but is missing wires +#define AIR_ALARM_BUILD_NO_WIRES 1 +/// Air alarm has all components but isn't completed +#define AIR_ALARM_BUILD_COMPLETE 2 + +// Fire alarm buildstage [/obj/machinery/firealarm/buildstage] +/// Fire alarm missing circuit +#define FIRE_ALARM_BUILD_NO_CIRCUIT 0 +/// Fire alarm has circuit but is missing wires +#define FIRE_ALARM_BUILD_NO_WIRES 1 +/// Fire alarm has all components but isn't completed +#define FIRE_ALARM_BUILD_SECURED 2 + +// Fault levels for air alarm display +/// Area faults clear +#define AREA_FAULT_NONE 0 +/// Fault triggered by manual intervention (ie: fire alarm pull) +#define AREA_FAULT_MANUAL 1 +/// Fault triggered automatically (ie: firedoor detection) +#define AREA_FAULT_AUTOMATIC 2 + +// threshold_type values for [/datum/tlv/proc/set_value] and [/datum/tlv/proc/reset_value] +/// [/datum/tlv/var/warning_min] +#define TLV_VAR_WARNING_MIN (1 << 0) +/// [/datum/tlv/var/hazard_min] +#define TLV_VAR_HAZARD_MIN (1 << 1) +/// [/datum/tlv/var/warning_max] +#define TLV_VAR_WARNING_MAX (1 << 2) +/// [/datum/tlv/var/hazard_max] +#define TLV_VAR_HAZARD_MAX (1 << 3) +/// All the vars in [/datum/tlv] +#define TLV_VAR_ALL (TLV_VAR_WARNING_MIN | TLV_VAR_HAZARD_MIN | TLV_VAR_WARNING_MAX | TLV_VAR_HAZARD_MAX) + +/// TLV datums will ignore variables set to this. +#define TLV_VALUE_IGNORE -1 + +#define CIRCULATOR_HOT 0 +#define CIRCULATOR_COLD 1 + +///Default pressure, used in the UI to reset the settings +#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE) +///Maximum settable pressure +#define PUMP_MAX_PRESSURE (PUMP_DEFAULT_PRESSURE * 25) +///Minimum settable pressure +#define PUMP_MIN_PRESSURE (PUMP_DEFAULT_PRESSURE / 10) +///The machine pumps from the turf to the internal tank +#define PUMP_IN TRUE +///The machine pumps from the internal source to the turf +#define PUMP_OUT FALSE + +///Max allowed pressure for canisters to release air per tick +#define CAN_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE * 25) +///Min allowed pressure for canisters to release air per tick +#define CAN_MIN_RELEASE_PRESSURE (ONE_ATMOSPHERE * 0.1) diff --git a/code/__DEFINES/atmospherics/atmos_gasses.dm b/code/__DEFINES/atmospherics/atmos_gasses.dm new file mode 100644 index 0000000000000..8fbc37726a372 --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_gasses.dm @@ -0,0 +1,13 @@ +#define GAS_N2 "n2" +#define GAS_O2 "o2" +#define GAS_CO2 "co2" +#define GAS_PLASMA "plasma" +#define GAS_N2O "n2o" +#define GAS_NITRYL "nitryl" +#define GAS_BZ "bz" +#define GAS_AIR "air" +#define GAS_WATER_VAPOR "water_vapor" +#define GAS_TRITIUM "tritium" +#define GAS_HYPER_NOBLIUM "hypernoblium" +#define GAS_PLUOXIUM "pluoxium" +#define GAS_STIMULUM "stimulum" diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm new file mode 100644 index 0000000000000..c3baf9371a66f --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_helpers.dm @@ -0,0 +1,165 @@ +//DO NOT USE THESE FOR ACCESSING ATMOS DATA, THEY MUTATE THINGS WHEN CALLED. I WILL BEAT YOU WITH A STICK. See the actual proc for more details +///Check if an atom (A) and a turf (O) allow gas passage based on the atom's can_atmos_pass var, do not use. +///(V) is if the share is vertical or not. True or False +#define CANATMOSPASS(A, O, V) ( A.can_atmos_pass == ATMOS_PASS_PROC ? A.can_atmos_pass(O, V) : ( A.can_atmos_pass == ATMOS_PASS_DENSITY ? !A.density : A.can_atmos_pass ) ) + +//Helpers +///Moves the icon of the device based on the piping layer and on the direction +#define PIPING_LAYER_SHIFT(T, PipingLayer) \ + if(T.dir & (NORTH|SOUTH)) { \ + T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\ + } \ + if(T.dir & (EAST|WEST)) { \ + T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y;\ + } + +///Moves the icon of the device based on the piping layer and on the direction, the shift amount is dictated by more_shift +#define PIPING_FORWARD_SHIFT(T, PipingLayer, more_shift) \ + if(T.dir & (NORTH|SOUTH)) { \ + T.pixel_y += more_shift * (PipingLayer - PIPING_LAYER_DEFAULT);\ + } \ + if(T.dir & (EAST|WEST)) { \ + T.pixel_x += more_shift * (PipingLayer - PIPING_LAYER_DEFAULT);\ + } + +///Moves the icon of the device based on the piping layer on both x and y +#define PIPING_LAYER_DOUBLE_SHIFT(T, PipingLayer) \ + T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\ + T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y; + +///Calculate the thermal energy of the selected gas (J) +#define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity()) + +///Directly adds a gas to a gas mixture without checking for its presence beforehand, use only if is certain the absence of said gas +#define ADD_GAS(gas_id, out_list)\ + var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id]; out_list[gas_id] = tmp_gaslist.Copy(); + +///Adds a gas to a gas mixture but checks if is already present, faster than the same proc +#define ASSERT_GAS(gas_id, gas_mixture) ASSERT_GAS_IN_LIST(gas_id, gas_mixture.gases) + +///Adds a gas to a gas LIST but checks if is already present, accepts a list instead of a datum, so faster if the list is locally cached +#define ASSERT_GAS_IN_LIST(gas_id, gases) if (!gases[gas_id]) { ADD_GAS(gas_id, gases) }; + +//prefer this to gas_mixture/total_moles in performance critical areas +///Calculate the total moles of the gas mixture, faster than the proc, good for performance critical areas +#define TOTAL_MOLES(cached_gases, out_var)\ + out_var = 0;\ + for(var/total_moles_id in cached_gases){\ + out_var += cached_gases[total_moles_id][MOLES];\ + } + +GLOBAL_LIST_INIT(nonoverlaying_gases, typecache_of_gases_with_no_overlays()) +///Returns a list of overlays of every gas in the mixture +#define GAS_OVERLAYS(gases, out_var)\ + out_var = list();\ + for(var/_ID in gases){\ + if(GLOB.nonoverlaying_gases[_ID]) continue;\ + var/_GAS = gases[_ID];\ + var/_GAS_META = _GAS[GAS_META];\ + if(_GAS[MOLES] <= _GAS_META[META_GAS_MOLES_VISIBLE]) continue;\ + var/_GAS_OVERLAY = _GAS_META[META_GAS_OVERLAY];\ + out_var += _GAS_OVERLAY[min(TOTAL_VISIBLE_STATES, CEILING(_GAS[MOLES] / MOLES_GAS_VISIBLE_STEP, 1))];\ + } + +#ifdef TESTING +GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0)) +#define CALCULATE_ADJACENT_TURFS(T, state) if (SSair.adjacent_rebuild[T]) { GLOB.atmos_adjacent_savings[1] += 1 } else { GLOB.atmos_adjacent_savings[2] += 1; SSair.adjacent_rebuild[T] = state} +#else +#define CALCULATE_ADJACENT_TURFS(T, state) SSair.adjacent_rebuild[T] = state +#endif + +//If you're doing spreading things related to atmos, DO NOT USE CANATMOSPASS, IT IS NOT CHEAP. use this instead, the info is cached after all. it's tweaked just a bit to allow for circular checks +#define TURFS_CAN_SHARE(T1, T2) (LAZYACCESS(T2.atmos_adjacent_turfs, T1) || LAZYLEN(T1.atmos_adjacent_turfs & T2.atmos_adjacent_turfs)) +//Use this to see if a turf is fully blocked or not, think windows or firelocks. Fails with 1x1 non full tile windows, but it's not worth the cost. +#define TURF_SHARES(T) (LAZYLEN(T.atmos_adjacent_turfs)) +/// Rounding +#define QUANTIZE(variable) (round((variable), (MOLAR_ACCURACY))) + +// Macros to access moles. Used instead of listmos only when nullchecking is necessary. + +///Gets the moles of a specific gas in a gas mixture. +#define GET_MOLES(gas, gas_mixture) (gas_mixture.gases[gas] ? gas_mixture.gases[gas][MOLES] : 0) + +///Adds moles to a specific gas in a gas mixture. +#define ADD_MOLES(gas, gas_mixture, moles)\ + ASSERT_GAS(gas, gas_mixture);\ + gas_mixture.gases[gas][MOLES] += moles; + +///Removes moles while making sure it doesn't go under 0. +#define REMOVE_MOLES(gas, gas_mixture, moles)\ + ASSERT_GAS(gas, gas_mixture);\ + gas_mixture.gases[gas][MOLES] -= max(moles, 0); + +/// Basically REMOVE_MOLES but with the thing sign flipped. Use this when sign is unknown +#define ADJUST_MOLES(gas, gas_mixture, moles)\ + ASSERT_GAS(gas, gas_mixture);\ + gas_mixture.gases[gas][MOLES] += max(moles, 0); + +///Sets the moles of a specific gas in a gas mixture, asserts the gas is present. +#define SET_MOLES(gas, gas_mixture, moles)\ + ASSERT_GAS(gas, gas_mixture);\ + gas_mixture.gases[gas][MOLES] = moles; + +///Adds moles to a specific gas list in a gas mixture. +#define ADD_MOLES_LIST(gas_id, gases, moles)\ + ASSERT_GAS_IN_LIST(gas_id, gases);\ + gases[gas_id][MOLES] += moles; + +///Removes moles while making sure it doesn't go under 0, also a list. +#define REMOVE_MOLES_LIST(gas_id, gases, moles)\ + ASSERT_GAS_IN_LIST(gas_id, gases);\ + gases[gas_id][MOLES] -= max(moles, 0); + +/// Basically REMOVE_MOLES but with the thing sign flipped. Use this when sign is unknown AND A LIST +#define ADJUST_MOLES_LIST(gas_id, gases, moles)\ + ASSERT_GAS_IN_LIST(gas_id, gases);\ + gases[gas_id][MOLES] += max(moles, 0); + +///Sets the moles of a specific gas in a gas list, asserts the gas is present. +#define SET_MOLES_LIST(gas_id, gases, moles)\ + ASSERT_GAS_IN_LIST(gas_id, gases);\ + gases[gas_id][MOLES] = moles; + +#define LINDA_CYCLE_ARCHIVE(turf)\ + turf.air.archive();\ + turf.archived_cycle = SSair.times_fired;\ + turf.temperature_archived = turf.temperature; + +/* Fetch the energy transferred when two gas mixtures' temperature equalize. + * + * To equalize two gas mixtures, we simply pool the energy and divide it by the pooled heat capacity. + * T' = (W1+W2) / (C1+C2) + * But if we want to moderate this conduction, maybe we can calculate the energy transferred + * and multiply a coefficient to it instead. + * This is the energy transferred: + * W = T' * C1 - W1 + * W = (W1+W2) / (C1+C2) * C1 - W1 + * W = (W1C1 + W2C1) / (C1+C2) - W1 + * W = ((W1C1 + W2C1) - (W1 * (C1+C2))) / (C1+C2) + * W = ((W1C1 + W2C1) - (W1C1 + W1C2)) / (C1+C2) + * W = (W1C1 - W1C1 + W2C1 - W1C2) / (C1+C2) + * W = (W2C1 - W1C2) / (C1+C2) + * W = (T2*C2*C1 - T1*C1*C2) / (C1+C2) + * W = (C1*C2) * (T2-T1) / (C1+C2) + * + * W: Energy involved in the operation + * T': Combined temperature + * T1, C1, W1: Temp, heat cap, and thermal energy of the first gas mixture + * T2, C2, W2: Temp, heat cap, and thermal energy of the second gas mixture + * + * Not immediately obvious, but saves us operation time. + * + * We put a lot of parentheses here because the numbers get really really big. + * By prioritizing the division we try to tone the number down so we don't get overflows. + * + * Arguments: + * * temperature_delta: T2 - T1. [/datum/gas_mixture/var/temperature] + * If you have any moderating (less than 1) coefficients and are dealing with very big numbers + * multiply the temperature_delta by it first before passing so we get even more breathing room. + * * heat_capacity_one: gasmix one's [/datum/gas_mixture/proc/heat_capacity] + * * heat_capacity_two: gasmix two's [/datum/gas_mixture/proc/heat_capacity] + * Returns: The energy gained by gas mixture one. Negative if gas mixture one loses energy. + * Honestly the heat capacity is interchangeable, just make sure the delta is right. + */ +#define CALCULATE_CONDUCTION_ENERGY(temperature_delta, heat_capacity_one, heat_capacity_two)\ + ((temperature_delta) * ((heat_capacity_one) * ((heat_capacity_two) / ((heat_capacity_one) + (heat_capacity_two))))) diff --git a/code/__DEFINES/atmospherics/atmos_identifiers.dm b/code/__DEFINES/atmospherics/atmos_identifiers.dm new file mode 100644 index 0000000000000..d3ed2e30907b5 --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_identifiers.dm @@ -0,0 +1,58 @@ +// ATMOSIA GAS MONITOR SUITE TAGS +// Things that use these include atmos control monitors, sensors, inputs, and outlets. +// They last three adds _sensor, _in, and _out respectively to the id_tag variable. +// Dont put underscores here, we use them as delimiters. + +#define ATMOS_GAS_MONITOR_O2 GAS_O2 +#define ATMOS_GAS_MONITOR_PLAS GAS_PLASMA +#define ATMOS_GAS_MONITOR_AIR GAS_AIR +#define ATMOS_GAS_MONITOR_MIX "mix" +#define ATMOS_GAS_MONITOR_N2O GAS_N2O +#define ATMOS_GAS_MONITOR_N2 GAS_N2 +#define ATMOS_GAS_MONITOR_CO2 GAS_CO2 +#define ATMOS_GAS_MONITOR_BZ GAS_BZ +#define ATMOS_GAS_MONITOR_H2 GAS_HYDROGEN +#define ATMOS_GAS_MONITOR_HYPERNOBLIUM GAS_HYPER_NOBLIUM +#define ATMOS_GAS_MONITOR_NITRYL GAS_NITRYL +#define ATMOS_GAS_MONITOR_PLUOXIUM GAS_PLUOXIUM +#define ATMOS_GAS_MONITOR_TRITIUM GAS_TRITIUM +#define ATMOS_GAS_MONITOR_H2O GAS_WATER_VAPOR +#define ATMOS_GAS_MONITOR_INCINERATOR "incinerator" +#define ATMOS_GAS_MONITOR_TOXINS_BURN "toxinsburn" +#define ATMOS_GAS_MONITOR_TOXINS_FREEZER "toxinsfreezer" +#define ATMOS_GAS_MONITOR_DISTRO "distro" +#define ATMOS_GAS_MONITOR_WASTE "waste" +#define ATMOS_GAS_MONITOR_ENGINE "engine" + + +///maps a chamber id to its air sensor +#define CHAMBER_SENSOR_FROM_ID(chamber_id) ((chamber_id) + "_sensor") +///maps an air sensor's chamber id to its input valve[ i.e. outlet_injector] id +#define CHAMBER_INPUT_FROM_ID(chamber_id) ((chamber_id) + "_in") +///maps an air sensor's chamber id to its output valve[i.e. vent pump] id +#define CHAMBER_OUTPUT_FROM_ID(chamber_id) ((chamber_id) + "_out") + +///list of all air sensor's created round start +GLOBAL_LIST_EMPTY(map_loaded_sensors) + +// Human-readble names of these funny tags. +GLOBAL_LIST_INIT(station_gas_chambers, list( + ATMOS_GAS_MONITOR_O2 = "Oxygen Supply", + ATMOS_GAS_MONITOR_PLAS = "Plasma Supply", + ATMOS_GAS_MONITOR_AIR = "Mixed Air Supply", + ATMOS_GAS_MONITOR_N2O = "Nitrous Oxide Supply", + ATMOS_GAS_MONITOR_N2 = "Nitrogen Supply", + ATMOS_GAS_MONITOR_CO2 = "Carbon Dioxide Supply", + ATMOS_GAS_MONITOR_BZ = "BZ Supply", + ATMOS_GAS_MONITOR_HYPERNOBLIUM = "Hypernoblium Supply", + ATMOS_GAS_MONITOR_NITRYL = "Nitryl Supply", + ATMOS_GAS_MONITOR_PLUOXIUM = "Pluoxium Supply", + ATMOS_GAS_MONITOR_TRITIUM = "Tritium Supply", + ATMOS_GAS_MONITOR_H2O = "Water Vapor Supply", + ATMOS_GAS_MONITOR_MIX = "Mix Chamber", + ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber", + ATMOS_GAS_MONITOR_TOXINS_LAB = "Toxins Chamber", + ATMOS_GAS_MONITOR_DISTRO = "Distribution Loop", + ATMOS_GAS_MONITOR_WASTE = "Waste Loop", + ATMOS_GAS_MONITOR_ENGINE = "Supermatter Engine Chamber", +)) diff --git a/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm b/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm new file mode 100644 index 0000000000000..5f0d3a7e6d330 --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm @@ -0,0 +1,78 @@ +///Used to define the temperature of a tile, arg is the temperature it should be at. Should always be put at the end of the atmos list. +///This is solely to be used after compile-time. +#define TURF_TEMPERATURE(temperature) "TEMP=[temperature]" + +//OPEN TURF ATMOS +/// the default air mix that open turfs spawn +#define OPENTURF_DEFAULT_ATMOS GAS_O2 + "=22;" + GAS_N2 + "=82;TEMP=293.15" +/// the default low-pressure air mix used mostly for mining areas. +#define OPENTURF_LOW_PRESSURE GAS_O2 + "=14;" + GAS_N2 + "=30;TEMP=293.15" +/// -193,15°C telecommunications. also used for xenobiology slime killrooms +#define TCOMMS_ATMOS GAS_N2 + "=100;TEMP=80" +/// space +#define AIRLESS_ATMOS "TEMP=2.7" +/// -93.15°C snow and ice turfs +#define FROZEN_ATMOS GAS_O2 + "=22;" + GAS_N2 + "=82;TEMP=180" +/// -14°C kitchen coldroom, just might loss your tail; higher amount of mol to reach about 101.3 kpA +#define KITCHEN_COLDROOM_ATMOS GAS_O2 + "=26;" + GAS_N2 + "=97;TEMP=259.15" +/// used in the holodeck burn test program +#define BURNMIX_ATMOS GAS_O2 + "=2500;" + GAS_PLASMA + "=5000;TEMP=370" +///-153.15°C plasma air, used for burning people. +#define BURNING_COLD GAS_N2 + "=82;" + GAS_PLASMA + "=24;TEMP=120" +///Space temperature hyper nob +#define SPACE_TEMP_NOBLIUM GAS_HYPER_NOBLIUM + "=7500;TEMP=2.7" + + +//ATMOSPHERICS DEPARTMENT GAS TANK TURFS +#define ATMOS_TANK_N2O GAS_N2O + "=6000;TEMP=293.15" +#define ATMOS_TANK_CO2 GAS_CO2 + "=50000;TEMP=293.15" +#define ATMOS_TANK_PLASMA GAS_PLASMA + "=70000;TEMP=293.15" +#define ATMOS_TANK_O2 GAS_O2 + "=100000;TEMP=293.15" +#define ATMOS_TANK_N2 GAS_N2 + "=100000;TEMP=293.15" +#define ATMOS_TANK_BZ GAS_BZ + "=100000;TEMP=293.15" +#define ATMOS_TANK_HYPERNOBLIUM GAS_HYPER_NOBLIUM + "=100000;TEMP=293.15" +#define ATMOS_TANK_NITRYL GAS_NITRYL + "=100000;TEMP=293.15" +#define ATMOS_TANK_PLUOXIUM GAS_PLUOXIUM + "=100000;TEMP=293.15" +#define ATMOS_TANK_TRITIUM GAS_TRITIUM + "=100000;TEMP=293.15" +#define ATMOS_TANK_H2O GAS_WATER_VAPOR + "=100000;TEMP=293.15" +#define ATMOS_TANK_AIRMIX GAS_O2 + "=2644;" + GAS_N2 + "=10580;TEMP=293.15" + +//LAVALAND +/// what pressure you have to be under to increase the effect of equipment meant for lavaland +#define MAXIMUM_LAVALAND_EQUIPMENT_EFFECT_PRESSURE 90 + +//ATMOS MIX IDS +#define LAVALAND_DEFAULT_ATMOS "o2=14;n2=5;co2=13;TEMP=300" + +//AIRLOCK CONTROLLER TAGS + +//RnD ordnance burn chamber +#define INCINERATOR_TOXMIX_IGNITER "toxmix_igniter" +#define INCINERATOR_TOXMIX_VENT "toxmix_vent" +#define INCINERATOR_TOXMIX_DP_VENTPUMP "toxmix_airlock_pump" +#define INCINERATOR_TOXMIX_AIRLOCK_SENSOR "toxmix_airlock_sensor" +#define INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER "toxmix_airlock_controller" +#define INCINERATOR_TOXMIX_AIRLOCK_INTERIOR "toxmix_airlock_interior" +#define INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR "toxmix_airlock_exterior" + +//Atmospherics/maintenance incinerator +#define INCINERATOR_ATMOS_IGNITER "atmos_incinerator_igniter" +#define INCINERATOR_ATMOS_MAINVENT "atmos_incinerator_mainvent" +#define INCINERATOR_ATMOS_AUXVENT "atmos_incinerator_auxvent" +#define INCINERATOR_ATMOS_DP_VENTPUMP "atmos_incinerator_airlock_pump" +#define INCINERATOR_ATMOS_AIRLOCK_SENSOR "atmos_incinerator_airlock_sensor" +#define INCINERATOR_ATMOS_AIRLOCK_CONTROLLER "atmos_incinerator_airlock_controller" +#define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior" +#define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior" +#define TEST_ROOM_ATMOS_MAINVENT_1 "atmos_test_room_mainvent_1" +#define TEST_ROOM_ATMOS_MAINVENT_2 "atmos_test_room_mainvent_2" + +//Syndicate lavaland base incinerator (lavaland_surface_syndicate_base1.dmm) +#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter" +#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent" +#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent" +#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior" diff --git a/code/__DEFINES/atmospherics/atmos_mob_interaction.dm b/code/__DEFINES/atmospherics/atmos_mob_interaction.dm new file mode 100644 index 0000000000000..ca0a01d886452 --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_mob_interaction.dm @@ -0,0 +1,135 @@ +/** liters in a normal breath. note that breaths are taken once every 4 life ticks, which is 8 seconds + * Addendum for people tweaking this value in the future. + * Because o2 tank release values/human o2 requirements are very strictly set to the same pressure, small errors can cause breakage + * This comes from QUANTIZE being used in /datum/gas_mixture.remove(), forming a slight sawtooth pattern of the added/removed gas, centered on the actual pressure + * Changing BREATH_VOLUME can set us on the lower half of this sawtooth, making humans unable to breath at standard pressure. + * There's no good way I can come up with to hardcode a fix for this. So if you're going to change this variable + * graph the functions that describe how it is used/how it interacts with breath code, and pick something on the upper half of the sawtooth + * +**/ +#define BREATH_VOLUME 1.99 +/// Amount of air to take a from a tile +#define BREATH_PERCENTAGE (BREATH_VOLUME/CELL_VOLUME) + +//Defines for N2O and Healium euphoria moodlets +#define EUPHORIA_INACTIVE 0 +#define EUPHORIA_ACTIVE 1 +#define EUPHORIA_LAST_FLAG 2 + +#define MIASMA_CORPSE_MOLES 0.02 +#define MIASMA_GIBS_MOLES 0.005 + +#define MIN_TOXIC_GAS_DAMAGE 1 +#define MAX_TOXIC_GAS_DAMAGE 10 + +// Pressure limits. +/// This determins at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant) +#define HAZARD_HIGH_PRESSURE 550 +/// This determins when the orange pressure icon is displayed (it is 0.7 * HAZARD_HIGH_PRESSURE) +#define WARNING_HIGH_PRESSURE 325 +/// This is when the gray low pressure icon is displayed. (it is 2.5 * HAZARD_LOW_PRESSURE) +#define WARNING_LOW_PRESSURE 50 +/// This is when the black ultra-low pressure icon is displayed. (This one is set as a constant) +#define HAZARD_LOW_PRESSURE 20 + +/// This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount. +#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 + +/// The natural temperature for a body +#define BODYTEMP_NORMAL 310.15 +/// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. +#define BODYTEMP_AUTORECOVERY_DIVISOR 14 +/// Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50. +#define BODYTEMP_AUTORECOVERY_MINIMUM 3 +///Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. +#define BODYTEMP_COLD_DIVISOR 15 +/// Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster. +#define BODYTEMP_HEAT_DIVISOR 15 +/// The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area. +#define BODYTEMP_COOLING_MAX -30 +/// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area. +#define BODYTEMP_HEATING_MAX 30 +/// The body temperature limit the human body can take before it starts taking damage from heat. +/// This also affects how fast the body normalises it's temperature when hot. +/// 340k is about 66c, and rather high for a human. +#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30) +/// The body temperature limit the human body can take before it starts taking damage from cold. +/// This also affects how fast the body normalises it's temperature when cold. +/// 270k is about -3c, that is below freezing and would hurt over time. +#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40) +/// The body temperature limit the human body can take before it will take wound damage. +#define BODYTEMP_HEAT_WOUND_LIMIT (BODYTEMP_NORMAL + 90) // 400.5 k +/// The modifier on cold damage limit hulks get ontop of their regular limit +#define BODYTEMP_HULK_COLD_DAMAGE_LIMIT_MODIFIER 25 +/// The modifier on cold damage hulks get. +#define HULK_COLD_DAMAGE_MOD 2 + +// Body temperature warning icons +/// The temperature the red icon is displayed. +#define BODYTEMP_HEAT_WARNING_3 (BODYTEMP_HEAT_DAMAGE_LIMIT + 360) //+700k +/// The temperature the orange icon is displayed. +#define BODYTEMP_HEAT_WARNING_2 (BODYTEMP_HEAT_DAMAGE_LIMIT + 120) //460K +/// The temperature the yellow icon is displayed. +#define BODYTEMP_HEAT_WARNING_1 (BODYTEMP_HEAT_DAMAGE_LIMIT) //340K +/// The temperature the light green icon is displayed. +#define BODYTEMP_COLD_WARNING_1 (BODYTEMP_COLD_DAMAGE_LIMIT) //270k +/// The temperature the cyan icon is displayed. +#define BODYTEMP_COLD_WARNING_2 (BODYTEMP_COLD_DAMAGE_LIMIT - 70) //200k +/// The temperature the blue icon is displayed. +#define BODYTEMP_COLD_WARNING_3 (BODYTEMP_COLD_DAMAGE_LIMIT - 150) //120k + +/// The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE +#define PRESSURE_DAMAGE_COEFFICIENT 2 +#define MAX_HIGH_PRESSURE_DAMAGE 2 +/// The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value). +#define LOW_PRESSURE_DAMAGE 2 + +/// Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this +#define COLD_SLOWDOWN_FACTOR 20 + + +//CLOTHES + +//Emergency skinsuits +#define EMERGENCY_HELM_MIN_TEMP_PROTECT 2.0 //The helmet is pressurized with air from the oxygen tank. If they don't take damage from that they won't take damage here +#define EMERGENCY_SUIT_MIN_TEMP_PROTECT 237 //This is the approximate average temperature of Mt. Everest in the winter + +/// what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. +#define SPACE_HELM_MIN_TEMP_PROTECT 2.0 +/// Thermal insulation works both ways /Malkevin +#define SPACE_HELM_MAX_TEMP_PROTECT 1500 +/// what min_cold_protection_temperature is set to for space-suit quality jumpsuits or suits. MUST NOT BE 0. +#define SPACE_SUIT_MIN_TEMP_PROTECT 2.0 +/// The min cold protection of a space suit without the heater active +#define SPACE_SUIT_MIN_TEMP_PROTECT_OFF 72 +#define SPACE_SUIT_MAX_TEMP_PROTECT 1500 + +/// Cold protection for firesuits +#define FIRE_SUIT_MIN_TEMP_PROTECT 60 +/// what max_heat_protection_temperature is set to for firesuit quality suits. MUST NOT BE 0. +#define FIRE_SUIT_MAX_TEMP_PROTECT 30000 +/// Cold protection for fire helmets +#define FIRE_HELM_MIN_TEMP_PROTECT 60 +/// for fire helmet quality items (red and white hardhats) +#define FIRE_HELM_MAX_TEMP_PROTECT 30000 + +/// what max_heat_protection_temperature is set to for firesuit quality suits and helmets. MUST NOT BE 0. +#define FIRE_IMMUNITY_MAX_TEMP_PROTECT 35000 + +/// For normal helmets +#define HELMET_MIN_TEMP_PROTECT 160 +/// For normal helmets +#define HELMET_MAX_TEMP_PROTECT 600 +/// For armor +#define ARMOR_MIN_TEMP_PROTECT 160 +/// For armor +#define ARMOR_MAX_TEMP_PROTECT 600 + +/// For some gloves (black and) +#define GLOVES_MIN_TEMP_PROTECT 2.0 +/// For some gloves +#define GLOVES_MAX_TEMP_PROTECT 1500 +/// For gloves +#define SHOES_MIN_TEMP_PROTECT 2.0 +/// For gloves +#define SHOES_MAX_TEMP_PROTECT 1500 diff --git a/code/__DEFINES/atmospherics/atmos_piping.dm b/code/__DEFINES/atmospherics/atmos_piping.dm new file mode 100644 index 0000000000000..7f4ad234ff902 --- /dev/null +++ b/code/__DEFINES/atmospherics/atmos_piping.dm @@ -0,0 +1,100 @@ +//PIPES +//Defines for pipe bitmasking +#define NORTH_FULLPIPE (1<<0) //also just NORTH +#define SOUTH_FULLPIPE (1<<1) //also just SOUTH +#define EAST_FULLPIPE (1<<2) //also just EAST +#define WEST_FULLPIPE (1<<3) //also just WEST +#define NORTH_SHORTPIPE (1<<4) +#define SOUTH_SHORTPIPE (1<<5) +#define EAST_SHORTPIPE (1<<6) +#define WEST_SHORTPIPE (1<<7) +// Helpers to convert cardinals to and from pipe bitfields +// Assumes X_FULLPIPE = X, X_SHORTPIPE >> 4 = X, X_PIPECAPS >> 8 = X as above +#define FULLPIPE_TO_CARDINALS(bitfield) ((bitfield) & ALL_CARDINALS) +#define SHORTPIPE_TO_CARDINALS(bitfield) (((bitfield) >> 4) & ALL_CARDINALS) +#define PIPECAPS_TO_CARDINALS(bitfield) (((bitfield) >> 8) & ALL_CARDINALS) +#define CARDINAL_TO_FULLPIPES(cardinals) (cardinals) +#define CARDINAL_TO_SHORTPIPES(cardinals) ((cardinals) << 4) +#define CARDINAL_TO_PIPECAPS(cardinals) ((cardinals) << 8) +// A pipe is a stub if it only has zero or one permitted direction. For a regular pipe this is nonsensical, and there are no pipe sprites for this, so it is not allowed. +#define ISSTUB(bits) !((bits) & ((bits) - 1)) +#define ISNOTSTUB(bits) ((bits) & ((bits) - 1)) +//Atmos pipe limits +/// (kPa) What pressure pumps and powered equipment max out at. +#define MAX_OUTPUT_PRESSURE 4500 +/// (L/s) Maximum speed powered equipment can work at. +#define MAX_TRANSFER_RATE 200 +/// (kPa) Minimum pressure volume pumps can move. +#define VOLUME_PUMP_MINIMUM_OUTPUT_PRESSURE 0.01 +/// (kPa) What pressure volume pumps max out at. +#define VOLUME_PUMP_MAX_OUTPUT_PRESSURE 9000 +/// (kPa) Allowed pressure difference between input and output pipenets for overclocked volume pump. +#define VOLUME_PUMP_OVERPRESSURE_ALLOWANCE 1000 +/// How many percent of the contents that an overclocked volume pumps leak into the air. +#define VOLUME_PUMP_LEAK_AMOUNT 0.1 +//used for device_type vars +#define UNARY 1 +#define BINARY 2 +#define TRINARY 3 +#define QUATERNARY 4 + +// The volume per direction of atmos pipes. +#define UNARY_PIPE_VOLUME 35 + +//TANKS +/// temperature in kelvins at which a tank will start to melt +#define TANK_MELT_TEMPERATURE 1000000 +/// Tank starts leaking +#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE) +/// Tank spills all contents into atmosphere +#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE) +/// Boom 3x3 base explosion +#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE) +/// +1 for each SCALE kPa aboe threshold +#define TANK_FRAGMENT_SCALE (6.*ONE_ATMOSPHERE) +#define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE*3) +#define TANK_MIN_RELEASE_PRESSURE 0 +#define TANK_DEFAULT_RELEASE_PRESSURE 16 +/// Denotes that our tank is overpressurized simply from gas merging. +#define TANK_MERGE_OVERPRESSURE "tank_overpressure" +// Indices for the reaction_results returned by explosion_information() +/// Reactions that have happened in the tank. +#define TANK_RESULTS_REACTION 1 +/// Additional information of the tank. +#define TANK_RESULTS_MISC 2 + +//MULTIPIPES +//IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH. +//layer = initial(layer) + piping_layer / 1000 in atmospherics/update_icon() to determine order of pipe overlap +#define PIPING_LAYER_MIN 1 +#define PIPING_LAYER_2 2 +#define PIPING_LAYER_DEFAULT 3 +#define PIPING_LAYER_4 4 +#define PIPING_LAYER_MAX 5 +#define PIPING_LAYER_P_X 5 +#define PIPING_LAYER_P_Y 5 +#define PIPING_LAYER_LCHANGE 0.005 + +/// intended to connect with all layers, check for all instead of just one. +#define PIPING_ALL_LAYER (1<<0) +/// can only be built if nothing else with this flag is on the tile already. +#define PIPING_ONE_PER_TURF (1<<1) +/// can only exist at PIPING_LAYER_DEFAULT +#define PIPING_DEFAULT_LAYER_ONLY (1<<2) +/// north/south east/west doesn't matter, auto normalize on build. +#define PIPING_CARDINAL_AUTONORMALIZE (1<<3) +/// intended to connect with everything, both layers and colors +#define PIPING_ALL_COLORS (1<<4) +/// can bridge over pipenets +#define PIPING_BRIDGE (1<<5) +/// intended to connect with layers 2 and 4 only +#define PIPING_DISTRO_AND_WASTE_LAYERS (1<<6) + +// Ventcrawling bitflags, handled in var/vent_movement +///Allows for ventcrawling to occur. All atmospheric machines have this flag on by default. Cryo is the exception +#define VENTCRAWL_ALLOWED (1<<0) +///Allows mobs to enter or leave from atmospheric machines. On for passive, unary, and scrubber vents. +#define VENTCRAWL_ENTRANCE_ALLOWED (1<<1) +///Used to check if a machinery is visible. Called by update_pipe_vision(). On by default for all except cryo. +#define VENTCRAWL_CAN_SEE (1<<2) + diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 3fe2d6671f74c..b9cbd34565fdb 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -66,6 +66,7 @@ #define COLOR_BLUE_GRAY "#75A2BB" #define COLOR_PINK "#FFC0CB" +#define COLOR_LIGHT_PINK "#FF3CC8" #define COLOR_MOSTLY_PURE_PINK "#E4005B" #define COLOR_BLUSH_PINK "#DE5D83" #define COLOR_FADED_PINK "#ff80d5" @@ -73,14 +74,19 @@ #define COLOR_STRONG_MAGENTA "#B800B8" #define COLOR_PURPLE "#800080" #define COLOR_VIOLET "#B900F7" +#define COLOR_AMETHYST "#822BFF" #define COLOR_STRONG_VIOLET "#6927C5" #define COLOR_DARK_PURPLE "#551A8B" + #define COLOR_ORANGE "#FF9900" #define COLOR_LIGHT_ORANGE "#ffc44d" +#define COLOR_ENGINEERING_ORANGE "#FFA62B" #define COLOR_DARK_ORANGE "#C3630C" #define COLOR_BEIGE "#CEB689" #define COLOR_DARK_MODERATE_ORANGE "#8B633B" +#define COLOR_TAN_ORANGE "#FF7B00" + #define COLOR_BROWN "#BA9F6D" #define COLOR_DARK_BROWN "#997C4F" diff --git a/code/__DEFINES/dcs/signals/signals_area.dm b/code/__DEFINES/dcs/signals/signals_area.dm index 077917470f361..0e53527741a62 100644 --- a/code/__DEFINES/dcs/signals/signals_area.dm +++ b/code/__DEFINES/dcs/signals/signals_area.dm @@ -5,8 +5,27 @@ ///! from base of area/proc/power_change(): () #define COMSIG_AREA_POWER_CHANGE "area_power_change" +/// called after a successful area creation by a mob: (area/created_area, list/area/old_areas, mob/creator) +#define COMSIG_AREA_CREATED "!mob_created_area" + // /area signals///! from base of area/Entered(): (atom/movable/M) #define COMSIG_AREA_ENTERED "area_entered" ///! from base of area/Exited(): (atom/movable/M) #define COMSIG_AREA_EXITED "area_exited" +///from base of area/Entered(): (area/new_area). Sent to "area-sensitive" movables, see __DEFINES/traits.dm for info. +#define COMSIG_ENTER_AREA "enter_area" +///from base of area/Exited(): (area). Sent to "area-sensitive" movables, see __DEFINES/traits.dm for info. +#define COMSIG_EXIT_AREA "exit_area" + +/// Called when an alarm handler fires an alarm +#define COMSIG_ALARM_TRIGGERED "alarm_triggered" +/// Called when an alarm handler clears an alarm +#define COMSIG_ALARM_CLEARED "alarm_cleared" + +/// Called when the air alarm mode is updated +#define COMSIG_AIRALARM_UPDATE_MODE "airalarm_update_mode" + +// Area fire signals +/// Sent when an area's fire var changes: (fire_value) +#define COMSIG_AREA_FIRE_CHANGED "area_fire_set" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm index c5d3e717def13..1269121f093c6 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm @@ -18,6 +18,8 @@ #define COMSIG_ATOM_BREAK "atom_break" /// from base of [/atom/proc/atom_fix]: () #define COMSIG_ATOM_FIX "atom_fix" +/// from base of [/atom/proc/atom_destruction]: (damage_flag) +#define COMSIG_ATOM_DESTRUCTION "atom_destruction" ///from base of [/atom/proc/update_integrity]: (old_value, new_value) #define COMSIG_ATOM_INTEGRITY_CHANGED "atom_integrity_changed" ///from base of [/atom/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration) diff --git a/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm index e76747e22846f..dc948d4ef9a59 100644 --- a/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm @@ -14,6 +14,22 @@ /// fires on the target datum when an element is attached to it (/datum/element) #define COMSIG_ELEMENT_DETACH "element_detach" +// Merger datum signals +/// Called on the object being added to a merger group: (datum/merger/new_merger) +#define COMSIG_MERGER_ADDING "comsig_merger_adding" +/// Called on the object being removed from a merger group: (datum/merger/old_merger) +#define COMSIG_MERGER_REMOVING "comsig_merger_removing" +/// Called on the merger after finishing a refresh: (list/leaving_members, list/joining_members) +#define COMSIG_MERGER_REFRESH_COMPLETE "comsig_merger_refresh_complete" + +// Gas mixture signals +/// From /datum/gas_mixture/proc/merge: () +#define COMSIG_GASMIX_MERGED "comsig_gasmix_merged" +/// From /datum/gas_mixture/proc/remove: () +#define COMSIG_GASMIX_REMOVED "comsig_gasmix_removed" +/// From /datum/gas_mixture/proc/react: () +#define COMSIG_GASMIX_REACTED "comsig_gasmix_reacted" + /// Sent when the amount of materials in material_container changes #define COMSIG_MATERIAL_CONTAINER_CHANGED "material_container_changed" @@ -106,12 +122,6 @@ /// signals from globally accessible objects -// Alarm listener datum signals -///Sent when an alarm is fired (alarm, area/source_area) -#define COMSIG_ALARM_TRIGGERED "comsig_alarm_triggered" -///Send when an alarm source is cleared (alarm_type, area/source_area) -#define COMSIG_ALARM_CLEARED "comsig_alarm_clear" - // Radio jammer signals /// Calls something to toggle its jamming ability. (mob/user, silent = FALSE) #define COMSIG_TOGGLE_JAMMER "toggle_jammer" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm index ed7d0bebf176e..260f7df413977 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm @@ -27,9 +27,6 @@ #define COMSIG_MOB_CLIENT_MOVED "mob_client_moved" /// From base of /mob/proc/reset_perspective() : () #define COMSIG_MOB_RESET_PERSPECTIVE "mob_reset_perspective" - - /// Should we stop the current living movement attempt - #define COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE #define COMSIG_MOB_ALLOWED "mob_allowed" //! from base of obj/allowed(mob/M): (/obj) returns bool, if TRUE the mob has id access to the obj #define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic" //! from base of mob/anti_magic_check(): (mob/user, magic, holy, major, self, protection_sources) #define COMPONENT_BLOCK_MAGIC 1 @@ -66,6 +63,8 @@ #define COMSIG_MOB_POINTED "mob_pointed" //from base of /mob/verb/pointed: (atom/A) /// From base of /client/Move() #define COMSIG_MOB_CLIENT_PRE_LIVING_MOVE "mob_client_pre_living_move" + /// Should we stop the current living movement attempt + #define COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE ///Called after a client connects to a mob and all UI elements have been setup #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login" #define COMSIG_MOB_MOUSE_SCROLL_ON "comsig_mob_mouse_scroll_on" //! from base of /mob/MouseWheelOn(): (atom/A, delta_x, delta_y, params) diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_atmospheric_machine.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_atmospheric_machine.dm index 9ae06608196a6..9bd8d96b9b2a3 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_atmospheric_machine.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_atmospheric_machine.dm @@ -7,6 +7,9 @@ /// from /obj/machinery/atmospherics/components/binary/valve/toggle(): (on) #define COMSIG_VALVE_SET_OPEN "valve_toggled" +/// from /obj/machinery/atmospherics/set_on(active): (on) +#define COMSIG_ATMOS_MACHINE_SET_ON "atmos_machine_set_on" -/// from /obj/machinery/atmospherics/components/binary/pump/set_on(active): (on) -#define COMSIG_PUMP_SET_ON "pump_set_on" +/// from /obj/machinery/fire_alarm/reset(), /obj/machinery/fire_alarm/alarm(): (status) +#define COMSIG_FIREALARM_ON_TRIGGER "firealarm_trigger" +#define COMSIG_FIREALARM_ON_RESET "firealarm_reset" diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm index 70a267b692555..0f000f419aa13 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm @@ -18,8 +18,16 @@ #define COMSIG_MACHINERY_SET_OCCUPANT "machinery_set_occupant" ///from /obj/machinery/proc/use_power(): (power_used) #define COMSIG_MACHINERY_POWER_USED "machinery_power_used" +///from /obj/machinery/default_change_direction_wrench: (mob/user, obj/item/wrench) +#define COMSIG_MACHINERY_DEFAULT_ROTATE_WRENCH "machinery_default_rotate_wrench" -// /obj/machinery/atmospherics/components/unary/cryo_cell signals -/// from /obj/machinery/atmospherics/components/unary/cryo_cell/set_on(bool): (on) +// /obj/machinery/cryo_cell signals + +/// from /obj/machinery/cryo_cell/set_on(bool): (on) #define COMSIG_CRYO_SET_ON "cryo_set_on" + +///from /datum/controller/subsystem/air/proc/start_processing_machine: () +#define COMSIG_MACHINERY_START_PROCESSING_AIR "start_processing_air" +///from /datum/controller/subsystem/air/proc/stop_processing_machine: () +#define COMSIG_MACHINERY_STOP_PROCESSING_AIR "stop_processing_air" diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm index 357d32dc19ae0..8ea666eab2987 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm @@ -23,3 +23,6 @@ ///from /obj/item/assembly/proc/pulsed(mob/pulser) #define COMSIG_ASSEMBLY_PULSED "assembly_pulsed" + +/// from /obj/proc/obj_break: () +#define COMSIG_OBJ_BREAK "obj_break" diff --git a/code/__DEFINES/dcs/signals/signals_turf.dm b/code/__DEFINES/dcs/signals/signals_turf.dm index bec34d81c2614..4ae48a9008c62 100644 --- a/code/__DEFINES/dcs/signals/signals_turf.dm +++ b/code/__DEFINES/dcs/signals/signals_turf.dm @@ -15,3 +15,7 @@ #define COMSIG_TURF_AFTER_SHUTTLE_MOVE "turf_after_shuttle_move" /// from base of /datum/turf_reservation/proc/Release: (datum/turf_reservation/reservation) #define COMSIG_TURF_RESERVATION_RELEASED "turf_reservation_released" +//from /turf/open/temperature_expose(datum/gas_mixture/air, exposed_temperature) +#define COMSIG_TURF_EXPOSE "turf_expose" +///from /turf/proc/immediate_calculate_adjacent_turfs() +#define COMSIG_TURF_CALCULATED_ADJACENT_ATMOS "turf_calculated_adjacent_atmos" diff --git a/code/__DEFINES/firealarm.dm b/code/__DEFINES/firealarm.dm new file mode 100644 index 0000000000000..0e1c4bd943378 --- /dev/null +++ b/code/__DEFINES/firealarm.dm @@ -0,0 +1,6 @@ +///Designates a fire lock should be closed due to HEAT +#define FIRELOCK_ALARM_TYPE_HOT "firelock_alarm_type_hot" +///Designates a fire lock should be closed due to COLD +#define FIRELOCK_ALARM_TYPE_COLD "firelock_alarm_type_cold" +///Designates a fire lock should be closed due unknown reasons (IE fire alarm was pulled) +#define FIRELOCK_ALARM_TYPE_GENERIC "firelock_alarm_type_generic" diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 820be445b4754..5b64b77078b3e 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -58,14 +58,16 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define NO_DIRECT_ACCESS_FROM_CONTENTS_1 (1<<14) /// Prevents aggregation of the item in the stack panel #define STAT_UNIQUE_1 (1<<15) +/// Is this object currently processing in the atmos object list? +#define ATMOS_IS_PROCESSING_1 (1<<16) //turf-only flags. These use flags_1 too. // These exist to cover /turf and /area at the same time -#define NOJAUNT_1 (1<<16) -#define UNUSED_RESERVATION_TURF_1 (1<<17) -#define CAN_BE_DIRTY_1 (1<<18) //! If a turf can be made dirty at roundstart. This is also used in areas. -#define NO_LAVA_GEN_1 (1<<19) //! Blocks lava rivers being generated on the turf -#define NO_RUINS_1 (1<<20) //! Blocks ruins spawning on the turf +#define NOJAUNT_1 (1<<17) +#define UNUSED_RESERVATION_TURF_1 (1<<18) +#define CAN_BE_DIRTY_1 (1<<19) //! If a turf can be made dirty at roundstart. This is also used in areas. +#define NO_LAVA_GEN_1 (1<<20) //! Blocks lava rivers being generated on the turf +#define NO_RUINS_1 (1<<21) //! Blocks ruins spawning on the turf // Update flags for [/atom/proc/update_appearance] /// Update the atom's name diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index bf747004f89b3..f2ae002e5200a 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -38,6 +38,7 @@ #define CATWALK_LAYER 2.51 #define LOW_SIGIL_LAYER 2.52 #define SIGIL_LAYER 2.54 +#define HIGH_PIPE_LAYER 2.55 #define HIGH_SIGIL_LAYER 2.56 #define BELOW_OPEN_DOOR_LAYER 2.6 @@ -173,6 +174,9 @@ /// Plane for balloon text (text that fades up) #define BALLOON_CHAT_PLANE 651 +#define ATMOS_GROUP_PLANE 652 +#define ATMOS_GROUP_LAYER 652 + ///--------------- FULLSCREEN IMAGES ------------ #define FLASH_LAYER 1 #define FULLSCREEN_LAYER 2 diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index f9c5ac45d7a3f..81c8a35da2308 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -225,12 +225,6 @@ GLOBAL_LIST_INIT(approved_status_pictures, list( #define CHUNK_SIZE 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc.. -// Circulator defines -// --------------------------------------------------- - -#define CIRCULATOR_HOT 0 -#define CIRCULATOR_COLD 1 - // Particle Accelerator defines // --------------------------------------------------- diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index e447eb3149ed0..e947df9fde76a 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -1,3 +1,9 @@ +// Remove these once we have Byond implementation. +#define ISNAN(a) (a!=a) +#define ISINF(a) (!ISNAN(a) && ISNAN(a-a)) +#define IS_INF_OR_NAN(a) (ISNAN(a-a)) +// Aight dont remove the rest + // Credits to Nickr5 for the useful procs I've taken from his library resource. // This file is quadruple wrapped for your pleasure // ( @@ -99,7 +105,7 @@ . = list() var/d = b*b - 4 * a * c var/bottom = 2 * a - if(d < 0) + if(d < 0 || IS_INF_OR_NAN(d) || IS_INF_OR_NAN(bottom)) return var/root = sqrt(d) . += (-b + root) / bottom diff --git a/code/__DEFINES/mergers.dm b/code/__DEFINES/mergers.dm new file mode 100644 index 0000000000000..7d80634f4911e --- /dev/null +++ b/code/__DEFINES/mergers.dm @@ -0,0 +1,5 @@ +// Defines relating to merger datums + +// Indexes for the turf packet list +#define MERGE_TURF_PACKET_DIR 1 +#define MERGE_TURF_PACKET_ATOMS 2 diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index fb6edab2c8647..d729238fe9dc0 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -6,6 +6,7 @@ #define PIPE_UNARY 4 //! 4 directions: N, S, E, W #define PIPE_ONEDIR 5 //! 1 direction: N/S/E/W #define PIPE_UNARY_FLIPPABLE 6 //! 8 directions: N/S/E/W/N-flipped/S-flipped/E-flipped/W-flipped +#define PIPE_ONEDIR_FLIPPABLE 7 //2 direction: N/S/E/W, N-flipped/S-flipped/E-flipped/W-flipped //Disposal pipe relative connection directions #define DISP_DIR_BASE 0 diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 1c74f6276cc45..66f3a5f481df0 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -80,18 +80,14 @@ #define FREQ_EXPLORATION 1361 //! Exploration comms frequency, cyan #define FREQ_STATUS_DISPLAYS 1435 -#define FREQ_ATMOS_ALARMS 1437 //! air alarms <-> alert computers -#define FREQ_ATMOS_CONTROL 1439 //! air alarms <-> vents and scrubbers #define MIN_FREQ 1441 // ------------------------------------------------------ // Only the 1441 to 1489 range is freely available for general conversation. // This represents 1/8th of the available spectrum. -#define FREQ_ATMOS_STORAGE 1441 #define FREQ_NAV_BEACON 1445 #define FREQ_AI_PRIVATE 1447 //! AI private comms frequency, magenta #define FREQ_PRESSURE_PLATE 1447 -#define FREQ_AIRLOCK_CONTROL 1449 #define FREQ_ELECTROPACK 1449 #define FREQ_MAGNETS 1449 #define FREQ_LOCATOR_IMPLANT 1451 @@ -109,10 +105,7 @@ #define TRANSMISSION_SUPERSPACE 3 //! reaches independent (CentCom) radios only // Filter types, used as an optimization to avoid unnecessary proc calls. -#define RADIO_TO_AIRALARM "to_airalarm" -#define RADIO_FROM_AIRALARM "from_airalarm" #define RADIO_SIGNALER "signaler" -#define RADIO_ATMOSIA "atmosia" #define RADIO_AIRLOCK "airlock" #define RADIO_MAGNETS "magnets" #define RADIO_XENOA "xenoa_radio" diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index fd0dc83d6ad36..a6ec8893d3797 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -1,13 +1,20 @@ //Defines used in atmos gas reactions. Used to be located in ..\modules\atmospherics\gasmixtures\reactions.dm, but were moved here because fusion added so fucking many. -//Plasma fire properties -#define OXYGEN_BURN_RATE_BASE 1.4 -#define PLASMA_BURN_RATE_DELTA 9 -#define PLASMA_MINIMUM_OXYGEN_NEEDED 2 -#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30 -#define FIRE_CARBON_ENERGY_RELEASED 100000 //! Amount of heat released per mole of burnt carbon into the tile -#define FIRE_HYDROGEN_ENERGY_RELEASED 280000 //! Amount of heat released per mole of burnt hydrogen and/or tritium(hydrogen isotope) -#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //! Amount of heat released per mole of burnt plasma into the tile +// Atmos reaction priorities: +/// The prority used to indicate that a reaction should run immediately at the start of a reaction cycle. Currently used by a jumble of decomposition reactions and purgative reactions. +#define PRIORITY_PRE_FORMATION 1 +/// The priority used for reactions that produce a useful or more advanced product. Goes after purgative reactions so that the purgers can be slightly more useful. +#define PRIORITY_FORMATION 2 +/// The priority used for indicate that a reactions should run immediately before most forms of combustion. Used by two decomposition reactions and steam condensation. +#define PRIORITY_POST_FORMATION 3 +/// The priority used to indicate that a reactions should run after all other types of reactions. Exclusively used for combustion reactions that produce fire or are freon. +#define PRIORITY_FIRE 4 + +/// An exponent used to make large volume gas mixtures significantly less likely to release rads. Used to prevent tritfires in distro from irradiating literally the entire station with no warning. +#define ATMOS_RADIATION_VOLUME_EXP 3 + +/// Maximum range a radiation pulse is allowed to be from a gas reaction. +#define GAS_REACTION_MAXIMUM_RADIATION_PULSE_RANGE 20 // Water Vapor: /// The temperature required for water vapor to condense. @@ -15,29 +22,121 @@ /// The temperature required for water vapor to condense as ice instead of water. #define WATER_VAPOR_DEPOSITION_POINT 200 -#define N2O_DECOMPOSITION_MIN_ENERGY 1400 -#define N2O_DECOMPOSITION_ENERGY_RELEASED 200000 +#define OXYGEN_BURN_RATE_BASE 1.4 +#define PLASMA_MINIMUM_OXYGEN_NEEDED 2 + +// Fire: + +// - General: +/// Amount of heat released per mole of burnt carbon into the tile +#define FIRE_CARBON_ENERGY_RELEASED 1e5 -#define NITRYL_FORMATION_ENERGY 100000 +// - Plasma: +/// Minimum temperature to burn plasma +#define PLASMA_MINIMUM_BURN_TEMPERATURE FIRE_MINIMUM_TEMPERATURE_TO_EXIST +/// Upper temperature ceiling for plasmafire reaction calculations for fuel consumption +#define PLASMA_UPPER_TEMPERATURE (PLASMA_MINIMUM_BURN_TEMPERATURE + 1270) +/// The maximum and default amount of plasma consumed as oxydizer per mole of plasma burnt. +#define OXYGEN_BURN_RATIO_BASE 1.4 +/// Multiplier for plasmafire with O2 moles * PLASMA_OXYGEN_FULLBURN for the maximum fuel consumption +#define PLASMA_OXYGEN_FULLBURN 10 +/// The minimum ratio of oxygen to plasma necessary to start producing tritium. +#define SUPER_SATURATION_THRESHOLD 96 +/// The divisor for the maximum plasma burn rate. (1/9 of the plasma can burn in one reaction tick.) +#define PLASMA_BURN_RATE_DELTA 9 +/// Amount of heat released per mole of burnt plasma into the tile +#define FIRE_PLASMA_ENERGY_RELEASED 3e6 + +// - Tritium: +/// The minimum temperature tritium combusts at. +#define TRITIUM_MINIMUM_BURN_TEMPERATURE FIRE_MINIMUM_TEMPERATURE_TO_EXIST #define TRITIUM_BURN_OXY_FACTOR 100 #define TRITIUM_BURN_TRIT_FACTOR 10 -#define TRITIUM_BURN_RADIOACTIVITY_FACTOR 50000 //! The neutrons gotta go somewhere. Completely arbitrary number. -#define TRITIUM_MINIMUM_RADIATION_ENERGY 0.1 //! minimum 0.01 moles trit or 10 moles oxygen to start producing rads -#define MINIMUM_TRIT_OXYBURN_ENERGY 2000000 //! This is calculated to help prevent singlecap bombs(Overpowered tritium/oxygen single tank bombs) -#define SUPER_SATURATION_THRESHOLD 96 -#define STIMULUM_HEAT_SCALE 100000 -#define STIMULUM_FIRST_RISE 0.65 -#define STIMULUM_FIRST_DROP 0.065 -#define STIMULUM_SECOND_RISE 0.0009 -#define STIMULUM_ABSOLUTE_DROP 0.00000335 -#define REACTION_OPPRESSION_THRESHOLD 5 -#define NOBLIUM_FORMATION_ENERGY 2e9 //! 1 Mole of Noblium takes the planck energy to condense. +//The neutrons gotta go somewhere. Completely arbitrary number. +#define TRITIUM_BURN_RADIOACTIVITY_FACTOR 50000 +//minimum 0.01 moles trit or 10 moles oxygen to start producing rads +#define TRITIUM_MINIMUM_RADIATION_ENERGY 0.1 +//This is calculated to help prevent singlecap bombs(Overpowered tritium/oxygen single tank bombs) +#define MINIMUM_TRIT_OXYBURN_ENERGY 2000000 +/// The amount of energy released by burning one mole of tritium. +#define FIRE_TRITIUM_ENERGY_RELEASED 280000 + +// N2O: +/// The minimum temperature N2O can form from nitrogen and oxygen in the presence of BZ at. +#define N2O_FORMATION_MIN_TEMPERATURE 200 +/// The maximum temperature N2O can form from nitrogen and oxygen in the presence of BZ at. +#define N2O_FORMATION_MAX_TEMPERATURE 250 +/// The amount of energy released when a mole of N2O forms from nitrogen and oxygen in the presence of BZ. +#define N2O_FORMATION_ENERGY 10000 + +/// The minimum temperature N2O can decompose at. +#define N2O_DECOMPOSITION_MIN_TEMPERATURE 1400 +/// The maximum temperature N2O can decompose at. +#define N2O_DECOMPOSITION_MAX_TEMPERATURE 100000 +/// The maximum portion of the N2O that can decompose each reaction tick. (50%) +#define N2O_DECOMPOSITION_RATE_DIVISOR 2 +/// One root of the parabola used to scale N2O decomposition rates. +#define N2O_DECOMPOSITION_MIN_SCALE_TEMP 0 +/// The other root of the parabola used to scale N2O decomposition rates. +#define N2O_DECOMPOSITION_MAX_SCALE_TEMP 100000 +/// The divisor used to normalize the N2O decomp scaling parabola. Basically the value of the apex/nadir of (x - [N2O_DECOMPOSITION_MIN_SCALE_TEMP]) * (x - [N2O_DECOMPOSITION_MAX_SCALE_TEMP]). +#define N2O_DECOMPOSITION_SCALE_DIVISOR ((-1/4) * ((N2O_DECOMPOSITION_MAX_SCALE_TEMP - N2O_DECOMPOSITION_MIN_SCALE_TEMP)**2)) +/// The amount of energy released when one mole of N2O decomposes into nitrogen and oxygen. +#define N2O_DECOMPOSITION_ENERGY 200000 + +// BZ: +/// The maximum temperature BZ can form at. Deliberately set lower than the minimum burn temperature for most combustible gases in an attempt to prevent long fuse singlecaps. +#define BZ_FORMATION_MAX_TEMPERATURE (FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 60) // Yes, someone used this as a bomb timer. I hate players. +/// The amount of energy 1 mole of BZ forming from N2O and plasma releases. +#define BZ_FORMATION_ENERGY 80000 + +// Pluoxium: +/// The minimum temperature pluoxium can form from carbon dioxide, oxygen, and tritium at. +#define PLUOXIUM_FORMATION_MIN_TEMP 50 +/// The maximum temperature pluoxium can form from carbon dioxide, oxygen, and tritium at. +#define PLUOXIUM_FORMATION_MAX_TEMP T0C +/// The maximum amount of pluoxium that can form from carbon dioxide, oxygen, and tritium per reaction tick. +#define PLUOXIUM_FORMATION_MAX_RATE 5 +/// The amount of energy one mole of pluoxium forming from carbon dioxide, oxygen, and tritium releases. +#define PLUOXIUM_FORMATION_ENERGY 250 + +// NITRYL: +/// The minimum temperature necessary for NITRYL to form from tritium, nitrogen, and BZ. +#define NITRYL_FORMATION_MIN_TEMP 1500 +/// A scaling divisor for the rate of NITRYL formation relative to mix temperature. +#define NITRYL_FORMATION_TEMP_DIVISOR (FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 8) +/// The amount of thermal energy consumed when a mole of NITRYL is formed from tritium, nitrogen, and BZ. +#define NITRYL_FORMATION_ENERGY 100000 + +/// The maximum temperature NITRYL can decompose into nitrogen and hydrogen at. +#define NITRYL_DECOMPOSITION_MAX_TEMP (T0C + 70) //Pretty warm, explicitly not fire temps. Time bombs are cool, but not that cool. If it makes you feel any better it's close. +/// A scaling divisor for the rate of NITRYL decomposition relative to mix temperature. +#define NITRYL_DECOMPOSITION_TEMP_DIVISOR (FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 8) +/// The amount of energy released when a mole of NITRYL decomposes into nitrogen and hydrogen. +#define NITRYL_DECOMPOSITION_ENERGY 30000 + + +// Stimulum: +#define STIMULUM_HEAT_SCALE 100000 +#define STIMULUM_FIRST_RISE 0.65 +#define STIMULUM_FIRST_DROP 0.065 +#define STIMULUM_SECOND_RISE 0.0009 +#define STIMULUM_ABSOLUTE_DROP 0.00000335 +#define STIMULUM_MINIMUM_TEMPERATURE 1500 + +// H-Nob: +/// The maximum temperature hyper-noblium can form from tritium and nitrogen at. +#define NOBLIUM_FORMATION_MIN_TEMP TCMB +/// The maximum temperature hyper-noblium can form from tritium and nitrogen at. +#define NOBLIUM_FORMATION_MAX_TEMP 15 +/// The amount of energy a single mole of hyper-noblium forming from tritium and nitrogen releases. +#define NOBLIUM_FORMATION_ENERGY 2e7 + +/// The number of moles of hyper-noblium required to prevent reactions. +#define REACTION_OPPRESSION_THRESHOLD 5 + #define STIM_BALL_GAS_AMOUNT 5 -//Research point amounts -#define NOBLIUM_RESEARCH_AMOUNT 1000 -#define BZ_RESEARCH_SCALE 4 -#define BZ_RESEARCH_MAX_AMOUNT 400 -#define STIMULUM_RESEARCH_AMOUNT 50 +#define PLUOXIUM_TEMP_CAP 200 //Plasma fusion properties #define FUSION_ENERGY_THRESHOLD 3e9 //! Amount of energy it takes to start a fusion reaction #define FUSION_MOLE_THRESHOLD 250 //! Mole count required (tritium/plasma) to start a fusion reaction diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 397cfeddd3148..f6b497cc8dcbe 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -216,7 +216,6 @@ #define FIRE_PRIORITY_ASSETS 105 #define FIRE_PRIORITY_TGUI 110 #define FIRE_PRIORITY_TICKER 200 -#define FIRE_PRIORITY_ATMOS_ADJACENCY 300 #define FIRE_PRIORITY_CHAT 400 #define FIRE_PRIORITY_RUNECHAT 410 #define FIRE_PRIORITY_OVERLAYS 500 @@ -237,25 +236,6 @@ #define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) -// SSair run section -#define SSAIR_PIPENETS 1 -#define SSAIR_ATMOSMACHINERY 2 -#define SSAIR_EXCITEDGROUPS 3 -#define SSAIR_HIGHPRESSURE 4 -#define SSAIR_HOTSPOTS 5 -#define SSAIR_TURF_CONDUCTION 6 -#define SSAIR_REBUILD_PIPENETS 7 -#define SSAIR_EQUALIZE 8 -#define SSAIR_ACTIVETURFS 9 -#define SSAIR_TURF_POST_PROCESS 10 -#define SSAIR_FINALIZE_TURFS 11 -#define SSAIR_ATMOSMACHINERY_AIR 12 -#define SSAIR_DEFERRED_AIRS 13 - -// Explosion Subsystem subtasks -#define SSEXPLOSIONS_MOVABLES 1 -#define SSEXPLOSIONS_TURFS 2 -#define SSEXPLOSIONS_THROWS 3 // Wardrobe subsystem tasks #define SSWARDROBE_STOCK 1 @@ -321,6 +301,24 @@ */ #define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__) +// Air subsystem subtasks +#define SSAIR_PIPENETS 1 +#define SSAIR_ATMOSMACHINERY 2 +#define SSAIR_ACTIVETURFS 3 +#define SSAIR_HOTSPOTS 4 +#define SSAIR_EXCITEDGROUPS 5 +#define SSAIR_HIGHPRESSURE 6 +#define SSAIR_PROCESS_ATOMS 7 + +//Pipenet rebuild helper defines, these suck but it'll do for now +#define SSAIR_REBUILD_PIPENET 1 +#define SSAIR_REBUILD_QUEUE 2 + +// Explosion Subsystem subtasks +#define SSEXPLOSIONS_MOVABLES 1 +#define SSEXPLOSIONS_TURFS 2 +#define SSEXPLOSIONS_THROWS 3 + // Subsystem delta times or tickrates, in seconds. I.e, how many seconds in between each process() call for objects being processed by that subsystem. // Only use these defines if you want to access some other objects processing delta_time, otherwise use the delta_time that is sent as a parameter to process() #define SSMACHINES_DT (SSmachines.wait/10) diff --git a/code/__DEFINES/supermatter.dm b/code/__DEFINES/supermatter.dm index 50f07bc5769da..8d83e7935b21b 100644 --- a/code/__DEFINES/supermatter.dm +++ b/code/__DEFINES/supermatter.dm @@ -2,10 +2,10 @@ #define PLASMA_HEAT_PENALTY 15 // Higher == Bigger heat and waste penalty from having the crystal surrounded by this gas. Negative numbers reduce penalty. #define OXYGEN_HEAT_PENALTY 1 -#define CO2_HEAT_PENALTY 0.1 +#define CO2_HEAT_PENALTY 2 #define NITROGEN_HEAT_PENALTY -1.5 #define BZ_HEAT_PENALTY 5 -#define PLUOXIUM_HEAT_PENALTY -1 +#define PLUOXIUM_HEAT_PENALTY -0.5 //Better then co2, worse then n2 #define TRITIUM_HEAT_PENALTY 10 #define OXYGEN_TRANSMIT_MODIFIER 1.5 //Higher == Bigger bonus to power generation. @@ -13,6 +13,17 @@ #define N2O_HEAT_RESISTANCE 6 //Higher == Gas makes the crystal more resistant against heat damage. +/// The minimum portion of the CO2 in the air that will be consumed. Higher values mean more CO2 will be consumed be default. +#define CO2_CONSUMPTION_RATIO_MIN 0 +/// The maximum portion of the CO2 in the air that will be consumed. Lower values mean the CO2 consumption rate caps earlier. +#define CO2_CONSUMPTION_RATIO_MAX 1 +/// The minimum pressure for a pure CO2 atmosphere to begin being consumed. Higher values mean it takes more CO2 pressure to make CO2 be consumed. Should be >= 0 +#define CO2_CONSUMPTION_PP (ONE_ATMOSPHERE*0.01) +/// How the amount of CO2 consumed per tick scales with partial pressure. Higher values decrease the rate CO2 consumption scales with partial pressure. Should be >0 +#define CO2_PRESSURE_SCALING (ONE_ATMOSPHERE*0.25) +/// How much the amount of CO2 consumed per tick scales with gasmix power ratio. Higher values means gasmix has a greater effect on the CO2 consumed. +#define CO2_GASMIX_SCALING (0.1) + #define POWERLOSS_INHIBITION_GAS_THRESHOLD 0.20 //Higher == Higher percentage of inhibitor gas needed before the charge inertia chain reaction effect starts. #define POWERLOSS_INHIBITION_MOLE_THRESHOLD 20 //Higher == More moles of the gas are needed before the charge inertia chain reaction effect starts. //Scales powerloss inhibition down until this amount of moles is reached #define POWERLOSS_INHIBITION_MOLE_BOOST_THRESHOLD 500 //bonus powerloss inhibition boost if this amount of moles is reached diff --git a/code/__DEFINES/vv.dm b/code/__DEFINES/vv.dm index 7602316bbbeac..46ae6506c4535 100644 --- a/code/__DEFINES/vv.dm +++ b/code/__DEFINES/vv.dm @@ -114,8 +114,7 @@ #define VV_HK_SET_MOLES "set_moles" #define VV_HK_EMPTY "empty" #define VV_HK_SET_TEMPERATURE "set_temp" -#define VV_HK_PARSE_GASSTRING "parse_gasstring" -#define VV_HK_SET_VOLUME "set_volume" +#define VV_HK_UPDATE_ACTIVE_TURF "update_active_turfs" // /obj #define VV_HK_OSAY "osay" diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 3401f7841e6a8..48bd1c7bb0083 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -73,6 +73,18 @@ LAZYINITLIST(lazy_list[key]); \ lazy_list[key] |= value; +///Ensures the length of a list is at least I, prefilling it with V if needed. if V is a proc call, it is repeated for each new index so that list() can just make a new list for each item. +#define LISTASSERTLEN(L, I, V...) \ + if (length(L) < I) { \ + var/_OLD_LENGTH = length(L); \ + L.len = I; \ + /* Convert the optional argument to a if check */ \ + for (var/_USELESS_VAR in list(V)) { \ + for (var/_INDEX_TO_ASSIGN_TO in _OLD_LENGTH+1 to I) { \ + L[_INDEX_TO_ASSIGN_TO] = V; \ + } \ + } \ + } /// Passed into BINARY_INSERT to compare keys #define COMPARE_KEY __BIN_LIST[__BIN_MID] diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 73f1d2779d463..a38754be1dac3 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng // break_if_found is a typecache of turf/area types to return false if found // Please keep this proc type agnostic. If you need to restrict it do it elsewhere or add an arg. /proc/detect_room(turf/origin, list/break_if_found) - if(isclosedturf(origin)) + if(origin.blocks_air) return list(origin) . = list() @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng if(break_if_found[checkT.type] || break_if_found[checkT.loc.type]) return FALSE var/static/list/cardinal_cache = list("[NORTH]"=TRUE, "[EAST]"=TRUE, "[SOUTH]"=TRUE, "[WEST]"=TRUE) - if(!cardinal_cache["[dir]"] || isclosedturf(checkT) || !CANATMOSPASS(sourceT, checkT)) + if(!cardinal_cache["[dir]"] || !TURFS_CAN_SHARE(sourceT, checkT)) continue found_turfs += checkT // Since checkT is connected, add it to the list to be processed @@ -55,21 +55,33 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng var/static/blacklisted_areas = typecacheof(list( /area/space, )) + var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types) if(!turfs) to_chat(creator, span_warning("The new area must be completely airtight and not a part of a shuttle.")) return - if(turfs.len > BP_MAX_ROOM_SIZE) + if(length(turfs) > BP_MAX_ROOM_SIZE) to_chat(creator, span_warning("The room you're in is too big. It is [((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.")) return + var/list/apc_map = list() var/list/areas = list("New Area" = /area) - for(var/i in 1 to turfs.len) + for(var/i in 1 to length(turfs)) + var/turf/the_turf = turfs[i] var/area/place = get_area(turfs[i]) if(blacklisted_areas[place.type]) continue if(!place.requires_power || place.teleport_restriction || place.area_flags & HIDDEN_AREA) continue // No expanding powerless rooms etc + if(!TURF_SHARES(the_turf)) // No expanding areas of walls/something blocking this turf because that defeats the whole point of them used to separate areas + continue + if(!isnull(place.apc)) + apc_map[place.name] = place.apc + //If we found just one apc we can just convert that to work for our new area. But 2 or more!! nope + if(length(apc_map) > 1) + creator.balloon_alert(creator, "too many conflicting APCs, only one allowed!") + return areas[place.name] = place + var/area_choice = input(creator, "Choose an area to expand or make a new area.", "Area Expansion") as null|anything in areas area_choice = areas[area_choice] @@ -92,22 +104,64 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng newA.setup(str) newA.set_dynamic_lighting() newA.default_gravity = oldA.default_gravity + require_area_resort() //new area registered. resort the names else newA = area_choice - for(var/i in 1 to turfs.len) - var/turf/thing = turfs[i] - thing.change_area(thing.loc, newA) + //we haven't done anything. let's get outta here + if(newA == oldA) + creator.balloon_alert(creator, "no area change!") + return + + /** + * A list of all machinery tied to an area along with the area itself. key=area name,value=list(area,list of machinery) + * we use this to keep track of what areas are affected by the blueprints & what machinery of these areas needs to be reconfigured accordingly + */ + var/list/area/affected_areas = list() + for(var/turf/the_turf as anything in turfs) + var/area/old_area = the_turf.loc + + //keep rack of all areas affected by turf changes + affected_areas[old_area.name] = old_area + + //move the turf to its new area and unregister it from the old one + the_turf.change_area(old_area, newA) + + //inform atoms on the turf that their area has changed + for(var/atom/stuff as anything in the_turf) + //unregister the stuff from its old area + SEND_SIGNAL(stuff, COMSIG_EXIT_AREA, oldA) + + //register the stuff to its new area. special exception for apc as its not registered to this signal + if(istype(stuff, /obj/machinery/power/apc)) + var/obj/machinery/power/apc/area_apc = stuff + area_apc.assign_to_area() + else + SEND_SIGNAL(stuff, COMSIG_ENTER_AREA, newA) newA.reg_in_areas_in_z() - var/list/firedoors = oldA.firedoors - for(var/door in firedoors) - var/obj/machinery/door/firedoor/FD = door - FD.CalculateAffectingAreas() + //convert map to list + var/list/area/area_list = list() + for(var/area_name in affected_areas) + area_list += affected_areas[area_name] + SEND_GLOBAL_SIGNAL(COMSIG_AREA_CREATED, newA, area_list, creator) to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) log_game("[key_name(creator)] created a new area: [AREACOORD(creator)] (previously \"[oldA.name]\")") + + //purge old areas that had all their turfs merged into the new one i.e. old empty areas. also recompute fire doors + for(var/i in 1 to length(area_list)) + var/area/merged_area = area_list[i] + + //recompute fire doors affecting areas + for(var/obj/machinery/door/firedoor/FD as anything in merged_area.firedoors) + FD.calculate_affecting_areas() + + //no more turfs in this area. Time to clean up + if(!merged_area.has_contained_turfs()) + qdel(merged_area) + return TRUE #undef BP_MAX_ROOM_SIZE diff --git a/code/__HELPERS/atmospherics.dm b/code/__HELPERS/atmospherics.dm new file mode 100644 index 0000000000000..ef64b09f39500 --- /dev/null +++ b/code/__HELPERS/atmospherics.dm @@ -0,0 +1,124 @@ +/proc/molar_cmp_less_than(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL) + return (a < (b + epsilon)) + +/proc/molar_cmp_greater_than(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL) + return ((a + epsilon) > b) + +/proc/molar_cmp_equals(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL) + return (((a + epsilon) > b) && ((a - epsilon) < b)) + +/** A simple rudimentary gasmix to information list converter. Can be used for UIs. + * Args: + * - gasmix: [/datum/gas_mixture] + * - name: String used to name the list, optional. + * Returns: A list parsed_gasmixes with the following structure: + * - parsed_gasmixes - Assoc List + * -- Key: name Value: String Desc: Gasmix Name + * -- Key: temperature Value: Number Desc: Temperature in kelvins + * -- Key: volume Value: Number Desc: Volume in liters + * -- Key: pressure Value: Number Desc: Pressure in kPa + * -- Key: ref Value: Text Desc: The reference for the instantiated gasmix. + * -- Key: gases Value: Assoc list Desc: List of gasses in our gasmix + * --- Key: gas_name Value: Gas Mole Desc: Gas Name - Gas Amount pair + * Returned list should always be filled with keys even if value are nulls. + */ +/proc/gas_mixture_parser(datum/gas_mixture/gasmix, name) + . = list( + "gases" = list(), + "reactions" = list(), + "name" = format_text(name), + "total_moles" = null, + "temperature" = null, + "volume"= null, + "pressure"= null, + "reference" = null, + ) + if(!gasmix) + return + for(var/gas_path in gasmix.gases) + .["gases"] += list(list( + gasmix.gases[gas_path][GAS_META][META_GAS_ID], + gasmix.gases[gas_path][GAS_META][META_GAS_NAME], + gasmix.gases[gas_path][MOLES], + )) + for(var/datum/gas_reaction/reaction_result as anything in gasmix.reaction_results) + .["reactions"] += list(list( + initial(reaction_result.id), + initial(reaction_result.name), + gasmix.reaction_results[reaction_result], + )) + .["total_moles"] = gasmix.total_moles() + .["temperature"] = gasmix.temperature + .["volume"] = gasmix.volume + .["pressure"] = gasmix.return_pressure() + .["reference"] = REF(gasmix) + +/proc/extract_id_tags(list/objects) + var/list/tags = list() + + for (var/obj/object as anything in objects) + tags += object.id_tag + + return tags + +/proc/find_by_id_tag(list/objects, id_tag) + for (var/obj/object as anything in objects) + if (object.id_tag == id_tag) + return object + + return null + +/proc/print_gas_mixture(datum/gas_mixture/gas_mixture) + var/message = "TEMPERATURE: [gas_mixture.temperature]K, QUANTITY: [gas_mixture.total_moles()] mols, VOLUME: [gas_mixture.volume]L; " + for(var/key in gas_mixture.gases) + var/list/gaslist = gas_mixture.gases[key] + message += "[gaslist[GAS_META][META_GAS_ID]]=[gaslist[MOLES]] mols;" + return message + +/proc/log_atmos(text, datum/gas_mixture/gas_mixture) + var/message = "[text]\"[print_gas_mixture(gas_mixture)]\"" + //Cache commonly accessed information. + var/list/gases = gas_mixture.gases //List of gas datum paths that are associated with a list of information related to the gases. + var/heat_capacity = gas_mixture.heat_capacity() + var/temperature = gas_mixture.return_temperature() + var/thermal_energy = temperature * heat_capacity + var/volume = gas_mixture.return_volume() + var/pressure = gas_mixture.return_pressure() + var/total_moles = gas_mixture.total_moles() + ///The total value of the gas mixture in credits. + var/total_value = 0 + var/list/specific_gas_data = list() + + //Gas specific information assigned to each gas. + for(var/datum/gas/gas_path as anything in gases) + var/list/gas = gases[gas_path] + var/moles = gas[MOLES] + var/composition = moles / total_moles + var/energy = temperature * moles * gas[GAS_META][META_GAS_SPECIFIC_HEAT] + var/value = initial(gas_path.base_value) * moles + total_value += value + specific_gas_data[gas[GAS_META][META_GAS_NAME]] = list( + "moles" = moles, + "composition" = composition, + "molar concentration" = moles / volume, + "partial pressure" = composition * pressure, + "energy" = energy, + "energy density" = energy / volume, + "value" = value, + ) + + log_game( + list( + message, + "total moles" = total_moles, + "volume" = volume, + "molar density" = total_moles / volume, + "temperature" = temperature, + "pressure" = pressure, + "heat capacity" = heat_capacity, + "energy" = thermal_energy, + "energy density" = thermal_energy / volume, + "value" = total_value, + "gases" = specific_gas_data, + ) + ) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index b65a99f086ba3..f0ae35f43512f 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -141,7 +141,6 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list( /obj/structure/noticeboard, /obj/machinery/button, /obj/machinery/computer/security/telescreen, - /obj/machinery/embedded_controller/radio/simple_vent_controller, /obj/item/storage/secure/safe, /obj/machinery/flasher, /obj/machinery/keycard_auth, diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 383aedd51f843..76acd6b1177a6 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -262,3 +262,36 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) return "a rolling pin" else return "something... but the gods didn't set this up right (Please report this bug)" + +/** + * Generate a name devices + * + * Creates a randomly generated tag or name for devices or anything really + * it keeps track of a special list that makes sure no name is used more than + * once + * + * args: + * * len (int)(Optional) Default=5 The length of the name + * * prefix (string)(Optional) static text in front of the random name + * * postfix (string)(Optional) static text in back of the random name + * Returns (string) The generated name + */ +/proc/assign_random_name(len=5, prefix="", postfix="") + //DO NOT REMOVE NAMES HERE UNLESS YOU KNOW WHAT YOU'RE DOING + //All names already used + var/static/list/used_names = list() + + var/static/valid_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" + var/list/new_name = list() + var/text + // machine id's should be fun random chars hinting at a larger world + do + new_name.Cut() + new_name += prefix + for(var/i = 1 to len) + new_name += valid_chars[rand(1,length(valid_chars))] + new_name += postfix + text = new_name.Join() + while(used_names[text]) + used_names[text] = TRUE + return text diff --git a/code/__HELPERS/piping_colors_lists.dm b/code/__HELPERS/piping_colors_lists.dm new file mode 100644 index 0000000000000..3d675f6fd7440 --- /dev/null +++ b/code/__HELPERS/piping_colors_lists.dm @@ -0,0 +1,47 @@ +///All colors available to pipes and atmos components +GLOBAL_LIST_INIT(pipe_paint_colors, list( + "omni" = COLOR_VERY_LIGHT_GRAY, + "blue" = COLOR_BLUE, + "red" = COLOR_RED, + "green" = COLOR_VIBRANT_LIME, + "orange" = COLOR_ENGINEERING_ORANGE, + "cyan" = COLOR_CYAN, + "dark" = COLOR_DARK, + "yellow" = COLOR_YELLOW, + "brown" = COLOR_BROWN, + "pink" = COLOR_LIGHT_PINK, + "purple" = COLOR_PURPLE, + "violet" = COLOR_STRONG_VIOLET +)) + +///List that sorts the colors and is used for setting up the pipes layer so that they overlap correctly +GLOBAL_LIST_INIT(pipe_colors_ordered, sort_list(list( + COLOR_AMETHYST = -6, + COLOR_BLUE = -5, + COLOR_BROWN = -4, + COLOR_CYAN = -3, + COLOR_DARK = -2, + COLOR_VIBRANT_LIME = -1, + COLOR_VERY_LIGHT_GRAY = 0, + COLOR_ENGINEERING_ORANGE = 1, + COLOR_PURPLE = 2, + COLOR_RED = 3, + COLOR_STRONG_VIOLET = 4, + COLOR_YELLOW = 5 +))) + +///Names shown in the examine for every colored atmos component +GLOBAL_LIST_INIT(pipe_color_name, sort_list(list( + COLOR_VERY_LIGHT_GRAY = "omni", + COLOR_BLUE = "blue", + COLOR_RED = "red", + COLOR_VIBRANT_LIME = "green", + COLOR_ENGINEERING_ORANGE = "orange", + COLOR_CYAN = "cyan", + COLOR_DARK = "dark", + COLOR_YELLOW = "yellow", + COLOR_BROWN = "brown", + COLOR_LIGHT_PINK = "pink", + COLOR_PURPLE = "purple", + COLOR_STRONG_VIOLET = "violet" +))) diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm index 5a932b02c8ada..9f953ac259418 100644 --- a/code/__HELPERS/turfs.dm +++ b/code/__HELPERS/turfs.dm @@ -400,13 +400,13 @@ Turf and target are separate in case you want to teleport some distance from a t if(QDELETED(air)) return FALSE // Can most things breathe? - for(var/id in air.get_gases()) + for(var/id in air.gases) if(id in GLOB.hardcoded_gases) continue return FALSE - if(air.get_moles(GAS_O2) < 16 || air.get_moles(GAS_PLASMA) || air.get_moles(GAS_CO2) >= 10) + if(GET_MOLES(/datum/gas/oxygen, air) < 16 || GET_MOLES(/datum/gas/plasma, air) || GET_MOLES(/datum/gas/carbon_dioxide, air) >= 10) return FALSE - var/temperature = air.return_temperature() + var/temperature = air.temperature if(temperature <= 270 || temperature >= 360) return FALSE var/pressure = air.return_pressure() diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 459498718f414..2dc0fff7bbcae 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -120,6 +120,9 @@ else return null +///Returns a single dir rotated by x degrees clockwise, adhering to the cardinal directions. +#define turn_cardinal(dir, rotation) ( angle2dir_cardinal ( dir2angle(dir) + rotation ) ) + /// Returns the angle in english /proc/angle2text(degree) return dir2text(angle2dir(degree)) diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm index a5d006113a368..5a7162ecb7f7a 100644 --- a/code/__HELPERS/type_processing.dm +++ b/code/__HELPERS/type_processing.dm @@ -59,3 +59,6 @@ if(findtext("[key]", filter) || findtext("[value]", filter)) matches[key] = value return matches + +/proc/return_typenames(type) + return splittext("[type]", "/") diff --git a/code/_compile_options.dm b/code/_compile_options.dm index e25a88b2b58e7..cdf98992f6d4b 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -29,6 +29,7 @@ #endif //ifdef REFERENCE_TRACKING //#define VISUALIZE_ACTIVE_TURFS //Highlights atmos active turfs in green +//#define TRACK_MAX_SHARE //Allows max share tracking, for use in the atmos debugging ui #endif //ifdef TESTING /// Enables BYOND TRACY, which allows profiling using Tracy. @@ -142,24 +143,11 @@ #define CBT #endif + +//Someone else should probably update this once LINDA is fully merged. Probably Bacon or Crossed. #if defined(OPENDREAM) && !defined(CIBUILDING) #error Compiling BeeStation in OpenDream is unsupported due to BeeStation's dependence on the auxtools DLL to function. #elif !defined(CBT) && !defined(SPACEMAN_DMM) && !defined(FASTDMM) && !defined(CIBUILDING) #warn Building with Dream Maker is no longer supported and will result in missing interface files. #warn Switch to VSCode and when prompted install the recommended extensions, you can then either use the UI or press Ctrl+Shift+B to build the codebase. #endif - -#define AUXMOS (world.system_type == MS_WINDOWS ? "auxtools/auxmos.dll" : __detect_auxmos()) - -/proc/__detect_auxmos() - var/static/auxmos_path - if(!auxmos_path) - if (fexists("./libauxmos.so")) - auxmos_path = "./libauxmos.so" - else if (fexists("./auxtools/libauxmos.so")) - auxmos_path = "./auxtools/libauxmos.so" - else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so")) - auxmos_path = "[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so" - else - CRASH("Could not find libauxmos.so") - return auxmos_path diff --git a/code/_globalvars/lists/canisters.dm b/code/_globalvars/lists/canisters.dm new file mode 100644 index 0000000000000..38c5b985d3517 --- /dev/null +++ b/code/_globalvars/lists/canisters.dm @@ -0,0 +1,20 @@ +///List of all the gases, used in labelling the canisters +GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) + +///Returns a map of canister id to its type path +/proc/init_gas_id_to_canister() + return sort_list(list( + GAS_N2 = /obj/machinery/portable_atmospherics/canister/nitrogen, + GAS_O2 = /obj/machinery/portable_atmospherics/canister/oxygen, + GAS_CO2 = /obj/machinery/portable_atmospherics/canister/carbon_dioxide, + GAS_PLASMA = /obj/machinery/portable_atmospherics/canister/plasma, + GAS_N2O = /obj/machinery/portable_atmospherics/canister/nitrous_oxide, + GAS_NITRYL = /obj/machinery/portable_atmospherics/canister/nitryl, + GAS_BZ = /obj/machinery/portable_atmospherics/canister/bz, + GAS_AIR = /obj/machinery/portable_atmospherics/canister/air, + GAS_WATER_VAPOR = /obj/machinery/portable_atmospherics/canister/water_vapor, + GAS_TRITIUM = /obj/machinery/portable_atmospherics/canister/tritium, + GAS_HYPER_NOBLIUM = /obj/machinery/portable_atmospherics/canister/nob, + GAS_PLUOXIUM = /obj/machinery/portable_atmospherics/canister/pluoxium, + "caution" = /obj/machinery/portable_atmospherics/canister, + )) diff --git a/code/_globalvars/lists/color.dm b/code/_globalvars/lists/color.dm new file mode 100644 index 0000000000000..26c0d89b9f188 --- /dev/null +++ b/code/_globalvars/lists/color.dm @@ -0,0 +1,7 @@ +GLOBAL_LIST_INIT(contrast_colors, list( + COLOR_BLACK, + COLOR_DARK_CYAN, + COLOR_RED, + COLOR_TAN_ORANGE, + COLOR_VIOLET, +)) diff --git a/code/_globalvars/turf.dm b/code/_globalvars/turf.dm index f8eeecf61d891..96917a3cc6b39 100644 --- a/code/_globalvars/turf.dm +++ b/code/_globalvars/turf.dm @@ -3,7 +3,7 @@ */ GLOBAL_LIST_INIT(default_turf_damage, list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5", "damaged6", "damaged7")) -GLOBAL_LIST_INIT(default_turf_burn, list("damaged1", "damaged2", "damaged3", "damaged4")) +GLOBAL_LIST_INIT(default_burn_turf, list("damaged1", "damaged2", "damaged3", "damaged4")) GLOBAL_LIST_INIT(wood_turf_damage, list("damaged_wood1", "damaged_wood2")) GLOBAL_LIST_INIT(wood_big_turf_damage, list("damaged_woodbig1", "damaged_woodbig2")) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index c74cd00a5ad27..d2f077fc6aa6d 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -102,12 +102,12 @@ //Middle right (status indicators) -#define ui_healthdoll "EAST-1:28,CENTER-2:13" -#define ui_health "EAST-1:28,CENTER-1:15" -#define ui_internal "EAST-1:28,CENTER+1:17" -#define ui_mood "EAST-1:28,CENTER:17" -#define ui_spacesuit "EAST-1:28,CENTER-4:10" -#define ui_stamina "EAST-1:28,CENTER-3:10" +#define ui_healthdoll "EAST-1:28,CENTER-2:17" +#define ui_health "EAST-1:28,CENTER-1:19" +#define ui_internal "EAST-1:28,CENTER+1:21" +#define ui_mood "EAST-1:28,CENTER:21" +#define ui_spacesuit "EAST-1:28,CENTER-4:14" +#define ui_stamina "EAST-1:28,CENTER-3:14" //borgs #define ui_borg_health "EAST-1:28,CENTER-1:15" //borgs have the health display where humans have the pressure damage indicator. diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 0c8bae820e487..460cef8bba1c4 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -87,6 +87,10 @@ client.screen -= alert qdel(alert) +// Proc to check for an alert +/mob/proc/has_alert(category) + return !isnull(alerts[category]) + /atom/movable/screen/alert icon = 'icons/hud/screen_alert.dmi' icon_state = "default" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 935e4fe14b379..6d94886e3f886 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -64,11 +64,12 @@ GLOBAL_LIST_INIT(available_ui_styles, list( var/atom/movable/screen/healths var/atom/movable/screen/stamina var/atom/movable/screen/healthdoll - var/atom/movable/screen/internals var/atom/movable/screen/spacesuit // subtypes can override this to force a specific UI style var/ui_style + /// If this client is being shown atmos debug overlays or not + var/atmos_debug_overlays = FALSE /datum/hud/New(mob/owner) mymob = owner @@ -115,7 +116,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list( healths = null stamina = null healthdoll = null - internals = null lingchemdisplay = null devilsouldisplay = null lingstingdisplay = null diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index dbbd42f2e4641..3a4c8dfda6cb5 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -305,10 +305,6 @@ rest_icon.hud = src static_inventory += rest_icon - internals = new /atom/movable/screen/internals() - internals.hud = src - infodisplay += internals - spacesuit = new /atom/movable/screen/spacesuit spacesuit.hud = src infodisplay += spacesuit diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 42d0ff7866dfc..542b496d3459a 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -98,10 +98,6 @@ throw_icon.hud = src hotkeybuttons += throw_icon - internals = new /atom/movable/screen/internals() - internals.hud = src - infodisplay += internals - healths = new /atom/movable/screen/healths() healths.hud = src infodisplay += healths diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index b40b76a38d63d..60fcc271a3ee8 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -277,3 +277,10 @@ . = ..() add_filter("glow", 1, list(type = "bloom", threshold = rgb(128, 128, 128), size = 2, offset = 1, alpha = 255)) add_filter("mask", 2, alpha_mask_filter(render_source = "blind_fullscreen_overlay")) + +/obj/screen/plane_master/excited_turfs + name = "atmos excited turfs" + plane = ATMOS_GROUP_PLANE + appearance_flags = PLANE_MASTER + blend_mode = BLEND_OVERLAY + alpha = 0 diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b97abe803dd25..effec7721c770 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -298,68 +298,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) icon = 'icons/hud/screen_cyborg.dmi' screen_loc = ui_borg_intents -/atom/movable/screen/internals - name = "toggle internals" - icon_state = "internal0" - screen_loc = ui_internal - -/atom/movable/screen/internals/Click() - if(!iscarbon(usr)) - return - var/mob/living/carbon/C = usr - if(C.incapacitated()) - return - - if(C.internal) - C.internal = null - to_chat(C, span_notice("You are no longer running on internals.")) - icon_state = "internal0" - C.update_action_buttons_icon() - return - if(!C.getorganslot(ORGAN_SLOT_BREATHING_TUBE)) - var/obj/item/clothing/head/Helm = C.head - if(!istype(C.wear_mask, /obj/item/clothing/mask) && !(Helm?.clothing_flags & HEADINTERNALS)) - to_chat(C, span_warning("You are not wearing an internals compatible mask or helmet!")) - return 1 - else - var/obj/item/clothing/mask/M = C.wear_mask - if(M?.mask_adjusted) // if mask on face but pushed down - M.adjustmask(C) // adjust it back - if( !(M?.clothing_flags & MASKINTERNALS) && !(Helm?.clothing_flags & HEADINTERNALS)) - to_chat(C, span_warning("You are not wearing an internals compatible mask or helmet!")) - return - - var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank) - if(I) - to_chat(C, span_notice("You are now running on internals from [I] in your [C.get_held_index_name(C.get_held_index_of_item(I))].")) - C.toggle_internals(I) - else if(ishuman(C)) - var/mob/living/carbon/human/H = C - if(istype(H.s_store, /obj/item/tank)) - to_chat(H, span_notice("You are now running on internals from [H.s_store] on your [H.wear_suit.name].")) - C.toggle_internals(H.s_store) - else if(istype(H.belt, /obj/item/tank)) - to_chat(H, span_notice("You are now running on internals from [H.belt] on your belt.")) - C.toggle_internals(H.belt) - else if(istype(H.l_store, /obj/item/tank)) - to_chat(H, span_notice("You are now running on internals from [H.l_store] in your left pocket.")) - C.toggle_internals(H.l_store) - else if(istype(H.r_store, /obj/item/tank)) - to_chat(H, span_notice("You are now running on internals from [H.r_store] in your right pocket.")) - C.toggle_internals(H.r_store) - - //Separate so CO2 jetpacks are a little less cumbersome. - if(!C.internal && istype(C.back, /obj/item/tank)) - to_chat(C, span_notice("You are now running on internals from [C.back] on your back.")) - C.toggle_internals(C.back) - - if(C.internal) - icon_state = "internal1" - else - to_chat(C, span_warning("You don't have an oxygen tank!")) - return - C.update_action_buttons_icon() - /atom/movable/screen/spacesuit name = "Space suit cell status" icon_state = "spacesuit_0" diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 042327df0bd61..597d8811184ee 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -50,7 +50,7 @@ if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_GHOST, user) & COMPONENT_CANCEL_ATTACK_CHAIN) return TRUE if(user.client) - if(user.gas_scan && atmosanalyzer_scan(user, src)) + if(user.gas_scan && atmos_scan(user = user, target = src, silent = TRUE)) return TRUE else if(IsAdminGhost(user)) attack_ai(user) diff --git a/code/controllers/subsystem/adjacent_air.dm b/code/controllers/subsystem/adjacent_air.dm deleted file mode 100644 index 200dbc3e30de5..0000000000000 --- a/code/controllers/subsystem/adjacent_air.dm +++ /dev/null @@ -1,54 +0,0 @@ -SUBSYSTEM_DEF(adjacent_air) - name = "Atmos Adjacency" - flags = SS_BACKGROUND - runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME - wait = 10 - priority = FIRE_PRIORITY_ATMOS_ADJACENCY - var/list/queue = list() - var/list/disable_queue = list() - -/datum/controller/subsystem/adjacent_air/stat_entry() -#ifdef TESTING - . = ..("P:[length(queue)], S:[GLOB.atmos_adjacent_savings[1]], T:[GLOB.atmos_adjacent_savings[2]]") -#else - . = ..("P:[length(queue)]") -#endif - -/datum/controller/subsystem/adjacent_air/Initialize() - while(length(queue)) - fire(mc_check = FALSE) - return SS_INIT_SUCCESS - -/datum/controller/subsystem/adjacent_air/fire(resumed = FALSE, mc_check = TRUE) - if(SSair.thread_running()) - pause() - return - - var/list/disable_queue = src.disable_queue - - while (length(disable_queue)) - var/turf/terf = disable_queue[1] - var/arg = disable_queue[terf] - disable_queue.Cut(1,2) - - terf.ImmediateDisableAdjacency(arg) - - if(mc_check) - if(MC_TICK_CHECK) - return - else - CHECK_TICK - - var/list/queue = src.queue - - while (length(queue)) - var/turf/currT = queue[1] - queue.Cut(1,2) - - currT.ImmediateCalculateAdjacentTurfs() - - if(mc_check) - if(MC_TICK_CHECK) - break - else - CHECK_TICK diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 94c3f34263af0..845c150156e71 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -6,64 +6,54 @@ SUBSYSTEM_DEF(air) flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + var/cached_cost = 0 + + var/cost_atoms = 0 var/cost_turfs = 0 + var/cost_hotspots = 0 var/cost_groups = 0 var/cost_highpressure = 0 - var/cost_deferred_airs - var/cost_hotspots = 0 - var/cost_post_process = 0 - var/cost_superconductivity = 0 var/cost_pipenets = 0 - var/cost_rebuilds = 0 var/cost_atmos_machinery = 0 - var/cost_equalize = 0 - var/thread_wait_ticks = 0 - var/cur_thread_wait_ticks = 0 - ///The last time the subsystem completely processed - var/last_complete_process = 0 - - var/low_pressure_turfs = 0 - var/high_pressure_turfs = 0 - - var/num_group_turfs_processed = 0 - var/num_equalize_processed = 0 + var/cost_rebuilds = 0 + var/cost_adjacent = 0 + var/list/excited_groups = list() + var/list/active_turfs = list() var/list/hotspots = list() var/list/networks = list() - var/list/pipenets_needing_rebuilt = list() - var/list/deferred_airs = list() - var/max_deferred_airs = 0 + var/list/rebuild_queue = list() + //Subservient to rebuild queue + var/list/expansion_queue = list() + /// List of turfs to recalculate adjacent turfs on before processing + var/list/adjacent_rebuild = list() + /// A list of machines that will be processed when currentpart == SSAIR_ATMOSMACHINERY. Use SSair.begin_processing_machine and SSair.stop_processing_machine to add and remove machines. var/list/obj/machinery/atmos_machinery = list() - var/list/obj/machinery/atmos_air_machinery = list() - var/list/pipe_init_dirs_cache = list() + var/list/pipe_init_dirs_cache = list() //atmos singletons var/list/gas_reactions = list() + var/list/atmos_gen + var/list/planetary = list() //Lets cache static planetary mixes + /// List of gas string -> canonical gas mixture + var/list/strings_to_mix = list() + //Special functions lists var/list/turf/open/high_pressure_delta = list() + var/list/atom_process = list() + /// Reactions which will contribute to a hotspot's size. + var/list/hotspot_reactions - + /// A cache of objects that perisists between processing runs when resumed == TRUE. Dangerous, qdel'd objects not cleared from this may cause runtimes on processing. var/list/currentrun = list() - var/currentpart = SSAIR_REBUILD_PIPENETS + var/currentpart = SSAIR_PIPENETS var/map_loading = TRUE + var/list/queued_for_activation + var/display_all_groups = FALSE - var/log_explosive_decompression = TRUE // If things get spammy, admemes can turn this off. - - // Max number of turfs equalization will grab. - var/equalize_turf_limit = 10 - // Max number of turfs to look for a space turf, and max number of turfs that will be decompressed. - var/equalize_hard_turf_limit = 2000 - // Whether equalization should be enabled at all. - var/equalize_enabled = FALSE - // Whether turf-to-turf heat exchanging should be enabled. - var/heat_enabled = FALSE - // Max number of times process_turfs will share in a tick. - var/share_max_steps = 3 - // Excited group processing will try to equalize groups with total pressure difference less than this amount. - var/excited_group_pressure_goal = 1 - + // Supercruise Z-pausing var/list/paused_z_levels //Paused z-levels will not add turfs to active var/list/unpausing_z_levels = list() var/list/unpause_processing = list() @@ -71,77 +61,57 @@ SUBSYSTEM_DEF(air) var/list/pausing_z_levels = list() var/list/pause_processing = list() + ///The last time the subsystem completely processed + var/last_complete_process = 0 + + /datum/controller/subsystem/air/stat_entry(msg) msg += "C:{" - msg += "HP:[round(cost_highpressure,1)]|" + msg += "AT:[round(cost_turfs,1)]|" msg += "HS:[round(cost_hotspots,1)]|" - msg += "HE:[round(heat_process_time(),1)]|" - msg += "SC:[round(cost_superconductivity,1)]|" + msg += "EG:[round(cost_groups,1)]|" + msg += "HP:[round(cost_highpressure,1)]|" msg += "PN:[round(cost_pipenets,1)]|" - msg += "AM:[round(cost_atmos_machinery,1)]" + msg += "AM:[round(cost_atmos_machinery,1)]|" + msg += "AO:[round(cost_atoms, 1)]|" + msg += "RB:[round(cost_rebuilds,1)]|" + msg += "AJ:[round(cost_adjacent,1)]|" msg += "} " - msg += "TC:{" - msg += "AT:[round(cost_turfs,1)]|" - msg += "EG:[round(cost_groups,1)]|" - msg += "EQ:[round(cost_equalize,1)]|" - msg += "PO:[round(cost_post_process,1)]" - msg += "}" - msg += "TH:[round(thread_wait_ticks,1)]|" + msg += "AT:[active_turfs.len]|" msg += "HS:[hotspots.len]|" - msg += "PN:[networks.len]|" + msg += "EG:[excited_groups.len]|" msg += "HP:[high_pressure_delta.len]|" - msg += "HT:[high_pressure_turfs]|" - msg += "LT:[low_pressure_turfs]|" - msg += "ET:[num_equalize_processed]|" - msg += "GT:[num_group_turfs_processed]|" - msg += "DF:[max_deferred_airs]|" - msg += "GA:[get_amt_gas_mixes()]|" - msg += "MG:[get_max_gas_mixes()]" + msg += "PN:[networks.len]|" + msg += "AM:[atmos_machinery.len]|" + msg += "AO:[atom_process.len]|" + msg += "RB:[rebuild_queue.len]|" + msg += "EP:[expansion_queue.len]|" + msg += "AJ:[adjacent_rebuild.len]|" + msg += "AT/MS:[round((cost ? active_turfs.len/cost : 0),0.1)]" return ..() -/datum/controller/subsystem/air/Initialize() + +/datum/controller/subsystem/air/Initialize(timeofday) map_loading = FALSE + gas_reactions = init_gas_reactions() + hotspot_reactions = init_hotspot_reactions() + setup_allturfs() setup_atmos_machinery() setup_pipenets() - gas_reactions = init_gas_reactions() - auxtools_update_reactions() + setup_turf_visuals() + process_adjacent_rebuild() return SS_INIT_SUCCESS -/datum/controller/subsystem/air/proc/extools_update_ssair() - -/datum/controller/subsystem/air/proc/auxtools_update_reactions() - -/proc/reset_all_air() - SSair.can_fire = 0 - message_admins("Air reset begun.") - for(var/turf/open/T in world) - T.Initalize_Atmos(0) - CHECK_TICK - message_admins("Air reset done.") - SSair.can_fire = 1 - -/datum/controller/subsystem/air/proc/thread_running() - return FALSE - -/proc/fix_corrupted_atmos() - -/datum/admins/proc/fixcorruption() - set category = "Debug" - set desc="Fixes air that has weird NaNs (-1.#IND and such). Hopefully." - set name="Fix Infinite Air" - fix_corrupted_atmos() - -/datum/controller/subsystem/air/fire(resumed = 0) +/datum/controller/subsystem/air/fire(resumed = FALSE) var/timer = TICK_USAGE_REAL - //If we have unpausing z-level, process them first + //If we have unpausing z-level, process them first if(length(unpausing_z_levels) && !length(unpause_processing)) var/z_value = unpausing_z_levels[1] unpausing_z_levels.Remove(z_value) unpause_processing = block(locate(1, 1, z_value), locate(world.maxx, world.maxy, z_value)) - while(length(unpause_processing)) var/turf/T = unpause_processing[length(unpause_processing)] if(!isspaceturf(T)) //Skip space turfs, since they won't have atmos @@ -153,16 +123,21 @@ SUBSYSTEM_DEF(air) //but that is better than freezing the entire MC if(MC_TICK_CHECK) return - //If we have unpausing z-level, process them first if(length(pausing_z_levels) && !length(pause_processing)) var/z_value = pausing_z_levels[1] pausing_z_levels.Remove(z_value) pause_processing = block(locate(1, 1, z_value), locate(world.maxx, world.maxy, z_value)) - while(length(pause_processing)) - var/turf/T = pause_processing[length(pause_processing)] - T.ImmediateDisableAdjacency() + var/turf/turf = pause_processing[length(pause_processing)] + for(var/direction in GLOB.cardinals_multiz) + var/turf/adjacent_turfs = get_step_multiz(turf, direction) + if(!istype(adjacent_turfs)) + continue + if(adjacent_turfs.atmos_adjacent_turfs) + adjacent_turfs.atmos_adjacent_turfs -= src + UNSETEMPTY(adjacent_turfs.atmos_adjacent_turfs) + LAZYCLEARLIST(turf.atmos_adjacent_turfs) //Goodbye pause_processing.len -- //We overran this tick, stop processing @@ -171,164 +146,153 @@ SUBSYSTEM_DEF(air) if(MC_TICK_CHECK) return - if(currentpart == SSAIR_REBUILD_PIPENETS) + //Rebuilds can happen at any time, so this needs to be done outside of the normal system + cost_rebuilds = 0 + cost_adjacent = 0 + + // We need to have a solid setup for turfs before fire, otherwise we'll get massive runtimes and strange behavior + if(length(adjacent_rebuild)) timer = TICK_USAGE_REAL - var/list/pipenet_rebuilds = pipenets_needing_rebuilt - for(var/thing in pipenet_rebuilds) - var/obj/machinery/atmospherics/AT = thing - if(!istype(AT)) - continue - AT.build_network() - cost_rebuilds = MC_AVERAGE(cost_rebuilds, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) - pipenets_needing_rebuilt.Cut() + process_adjacent_rebuild() + //This does mean that the apperent rebuild costs fluctuate very quickly, this is just the cost of having them always process, no matter what + cost_adjacent = TICK_USAGE_REAL - timer + if(state != SS_RUNNING) + return + + // Every time we fire, we want to make sure pipenets are rebuilt. The game state could have changed between each fire() proc call + // and anything missing a pipenet can lead to unintended behaviour at worse and various runtimes at best. + if(length(rebuild_queue) || length(expansion_queue)) + timer = TICK_USAGE_REAL + process_rebuilds() + //This does mean that the apperent rebuild costs fluctuate very quickly, this is just the cost of having them always process, no matter what + cost_rebuilds = TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = FALSE - currentpart = SSAIR_PIPENETS if(currentpart == SSAIR_PIPENETS || !resumed) timer = TICK_USAGE_REAL + if(!resumed) + cached_cost = 0 process_pipenets(resumed) - cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + cached_cost += TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = 0 + cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE currentpart = SSAIR_ATMOSMACHINERY - // This is only machinery like filters, mixers that don't interact with air + if(currentpart == SSAIR_ATMOSMACHINERY) timer = TICK_USAGE_REAL + if(!resumed) + cached_cost = 0 process_atmos_machinery(resumed) - cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + cached_cost += TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = 0 - currentpart = SSAIR_HIGHPRESSURE + cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE + currentpart = SSAIR_ACTIVETURFS - if(currentpart == SSAIR_HIGHPRESSURE) - timer = TICK_USAGE_REAL - process_high_pressure_delta(resumed) - cost_highpressure = MC_AVERAGE(cost_highpressure, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) - if(state != SS_RUNNING) - return - resumed = 0 - currentpart = SSAIR_FINALIZE_TURFS - // This literally just waits for the turf processing thread to finish, doesn't do anything else. - // this is necessary cause the next step after this interacts with the air--we get consistency - // issues if we don't wait for it, disappearing gases etc. - if(currentpart == SSAIR_FINALIZE_TURFS) - finish_turf_processing(resumed) - if(state != SS_RUNNING) - cur_thread_wait_ticks++ - return - resumed = 0 - thread_wait_ticks = MC_AVERAGE(thread_wait_ticks, cur_thread_wait_ticks) - cur_thread_wait_ticks = 0 - currentpart = SSAIR_DEFERRED_AIRS - if(currentpart == SSAIR_DEFERRED_AIRS) - timer = TICK_USAGE_REAL - process_deferred_airs(resumed) - cost_deferred_airs = MC_AVERAGE(cost_deferred_airs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) - if(state != SS_RUNNING) - return - resumed = 0 - currentpart = SSAIR_ATMOSMACHINERY_AIR - if(currentpart == SSAIR_ATMOSMACHINERY_AIR) + if(currentpart == SSAIR_ACTIVETURFS) timer = TICK_USAGE_REAL - process_atmos_air_machinery(resumed) - cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + if(!resumed) + cached_cost = 0 + process_active_turfs(resumed) + cached_cost += TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = 0 + cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE currentpart = SSAIR_HOTSPOTS - if(currentpart == SSAIR_HOTSPOTS) + if(currentpart == SSAIR_HOTSPOTS) //We do this before excited groups to allow breakdowns to be independent of adding turfs while still *mostly preventing mass fires timer = TICK_USAGE_REAL + if(!resumed) + cached_cost = 0 process_hotspots(resumed) - cost_hotspots = MC_AVERAGE(cost_hotspots, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + cached_cost += TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = 0 - currentpart = heat_enabled ? SSAIR_TURF_CONDUCTION : SSAIR_ACTIVETURFS - // Heat -- slow and of questionable usefulness. Off by default for this reason. Pretty cool, though. - if(currentpart == SSAIR_TURF_CONDUCTION) - timer = TICK_USAGE_REAL - if(process_turf_heat(MC_TICK_REMAINING_MS)) - pause() - cost_superconductivity = MC_AVERAGE(cost_superconductivity, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) - if(state != SS_RUNNING) - return - resumed = 0 - currentpart = SSAIR_ACTIVETURFS - // This simply starts the turf thread. It runs in the background until the FINALIZE_TURFS step, at which point it's waited for. - // This also happens to do all the commented out stuff below, all in a single separate thread. This is mostly so that the - // waiting is consistent. - if(currentpart == SSAIR_ACTIVETURFS) - timer = TICK_USAGE_REAL - process_turfs(resumed) - cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) - if(state != SS_RUNNING) - return - resumed = 0 - /* - // Monstermos and/or Putnamos--making large pressure deltas move faster - if(currentpart == SSAIR_EQUALIZE) - timer = TICK_USAGE_REAL - process_turf_equalize(resumed) - cost_equalize = MC_AVERAGE(cost_equalize, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) - if(state != SS_RUNNING) - return - resumed = 0 + cost_hotspots = MC_AVERAGE(cost_hotspots, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE currentpart = SSAIR_EXCITEDGROUPS - // Making small pressure deltas equalize immediately so they don't process anymore + if(currentpart == SSAIR_EXCITEDGROUPS) timer = TICK_USAGE_REAL + if(!resumed) + cached_cost = 0 process_excited_groups(resumed) - cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + cached_cost += TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = 0 - currentpart = SSAIR_TURF_POST_PROCESS - // Quick multithreaded "should we display/react?" checks followed by finishing those up before the next step - if(currentpart == SSAIR_TURF_POST_PROCESS) + cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE + currentpart = SSAIR_HIGHPRESSURE + + if(currentpart == SSAIR_HIGHPRESSURE) timer = TICK_USAGE_REAL - post_process_turfs(resumed) - cost_post_process = MC_AVERAGE(cost_post_process, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + if(!resumed) + cached_cost = 0 + process_high_pressure_delta(resumed) + cached_cost += TICK_USAGE_REAL - timer if(state != SS_RUNNING) return - resumed = 0 - currentpart = SSAIR_HOTSPOTS - */ - currentpart = SSAIR_REBUILD_PIPENETS + cost_highpressure = MC_AVERAGE(cost_highpressure, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE + currentpart = SSAIR_PROCESS_ATOMS + + if(currentpart == SSAIR_PROCESS_ATOMS) + timer = TICK_USAGE_REAL + if(!resumed) + cached_cost = 0 + process_atoms(resumed) + cached_cost += TICK_USAGE_REAL - timer + if(state != SS_RUNNING) + return + cost_atoms = MC_AVERAGE(cost_atoms, TICK_DELTA_TO_MS(cached_cost)) + resumed = FALSE + + currentpart = SSAIR_PIPENETS last_complete_process = world.time + SStgui.update_uis(SSair) //Lightning fast debugging motherfucker /datum/controller/subsystem/air/Recover() - thread_wait_ticks = SSair.thread_wait_ticks - cur_thread_wait_ticks = SSair.cur_thread_wait_ticks - low_pressure_turfs = SSair.low_pressure_turfs - high_pressure_turfs = SSair.high_pressure_turfs - num_group_turfs_processed = SSair.num_group_turfs_processed - num_equalize_processed = SSair.num_equalize_processed + excited_groups = SSair.excited_groups + active_turfs = SSair.active_turfs hotspots = SSair.hotspots networks = SSair.networks - pipenets_needing_rebuilt = SSair.pipenets_needing_rebuilt - deferred_airs = SSair.deferred_airs - max_deferred_airs = SSair.max_deferred_airs + rebuild_queue = SSair.rebuild_queue + expansion_queue = SSair.expansion_queue + adjacent_rebuild = SSair.adjacent_rebuild atmos_machinery = SSair.atmos_machinery - atmos_air_machinery = SSair.atmos_air_machinery pipe_init_dirs_cache = SSair.pipe_init_dirs_cache gas_reactions = SSair.gas_reactions + atmos_gen = SSair.atmos_gen + planetary = SSair.planetary high_pressure_delta = SSair.high_pressure_delta + atom_process = SSair.atom_process currentrun = SSair.currentrun - currentpart = SSair.currentpart - map_loading = SSair.map_loading - log_explosive_decompression = SSair.log_explosive_decompression - equalize_turf_limit = SSair.equalize_turf_limit - equalize_hard_turf_limit = SSair.equalize_hard_turf_limit - equalize_enabled = SSair.equalize_enabled - heat_enabled = SSair.heat_enabled - share_max_steps = SSair.share_max_steps - excited_group_pressure_goal = SSair.excited_group_pressure_goal - paused_z_levels = SSair.paused_z_levels + queued_for_activation = SSair.queued_for_activation + +/datum/controller/subsystem/air/proc/process_adjacent_rebuild(init = FALSE) + var/list/queue = adjacent_rebuild + + while (length(queue)) + var/turf/currT = queue[1] + var/goal = queue[currT] + queue.Cut(1,2) + + currT.immediate_calculate_adjacent_turfs() + if(goal == MAKE_ACTIVE) + add_to_active(currT) + else if(goal == KILL_EXCITED) + add_to_active(currT, TRUE) + + if(init) + CHECK_TICK + else + if(MC_TICK_CHECK) + break /datum/controller/subsystem/air/proc/process_pipenets(resumed = FALSE) if (!resumed) @@ -345,115 +309,53 @@ SUBSYSTEM_DEF(air) if(MC_TICK_CHECK) return -/datum/controller/subsystem/air/proc/add_to_rebuild_queue(atmos_machine) - if(istype(atmos_machine, /obj/machinery/atmospherics)) - pipenets_needing_rebuilt += atmos_machine - -/datum/controller/subsystem/air/proc/process_deferred_airs(resumed = 0) - max_deferred_airs = max(deferred_airs.len,max_deferred_airs) - while(deferred_airs.len) - var/list/cur_op = deferred_airs[deferred_airs.len] - deferred_airs.len-- - var/datum/gas_mixture/air1 - var/datum/gas_mixture/air2 - if(isopenturf(cur_op[1])) - var/turf/open/T = cur_op[1] - air1 = T.return_air() - else - air1 = cur_op[1] - if(isopenturf(cur_op[2])) - var/turf/open/T = cur_op[2] - air2 = T.return_air() - else - air2 = cur_op[2] - if(istype(cur_op[3], /datum/callback)) - var/datum/callback/cb = cur_op[3] - cb.Invoke(air1, air2) - else - if(cur_op[3] == 0) - air1.transfer_to(air2, air1.total_moles()) - else - air1.transfer_ratio_to(air2, cur_op[3]) - if(MC_TICK_CHECK) +/datum/controller/subsystem/air/proc/add_to_rebuild_queue(obj/machinery/atmospherics/atmos_machine) + if(istype(atmos_machine, /obj/machinery/atmospherics) && !atmos_machine.rebuilding) + rebuild_queue += atmos_machine + atmos_machine.rebuilding = TRUE + +/datum/controller/subsystem/air/proc/add_to_expansion(datum/pipenet/line, starting_point) + var/list/new_packet = new(SSAIR_REBUILD_QUEUE) + new_packet[SSAIR_REBUILD_PIPENET] = line + new_packet[SSAIR_REBUILD_QUEUE] = list(starting_point) + expansion_queue += list(new_packet) + +/datum/controller/subsystem/air/proc/remove_from_expansion(datum/pipenet/line) + for(var/list/packet in expansion_queue) + if(packet[SSAIR_REBUILD_PIPENET] == line) + expansion_queue -= packet return -/datum/controller/subsystem/air/proc/process_atmos_machinery(resumed = 0) - if (!resumed) - src.currentrun = atmos_machinery.Copy() +/datum/controller/subsystem/air/proc/process_atoms(resumed = FALSE) + if(!resumed) + src.currentrun = atom_process.Copy() //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun while(currentrun.len) - var/obj/machinery/current_machinery = currentrun[currentrun.len] + var/atom/talk_to = currentrun[currentrun.len] currentrun.len-- - if(!current_machinery) - atmos_machinery -= current_machinery - // Prevents uninitalized atmos machinery from processing. - if (!(current_machinery.flags_1 & INITIALIZED_1)) - continue - if(current_machinery.process_atmos() == PROCESS_KILL) - stop_processing_machine(current_machinery) + if(!talk_to) + return + talk_to.process_exposure() if(MC_TICK_CHECK) return -/datum/controller/subsystem/air/proc/process_atmos_air_machinery(resumed = 0) - var/seconds = wait * 0.1 +/datum/controller/subsystem/air/proc/process_atmos_machinery(resumed = FALSE) if (!resumed) - src.currentrun = atmos_air_machinery.Copy() + src.currentrun = atmos_machinery.Copy() //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun while(currentrun.len) - var/obj/machinery/current_machinery = currentrun[currentrun.len] + var/obj/machinery/M = currentrun[currentrun.len] currentrun.len-- - // Prevents uninitalized atmos machinery from processing. - if (!(current_machinery.flags_1 & INITIALIZED_1)) + if(!M) + atmos_machinery -= M continue - if(!current_machinery) - atmos_air_machinery -= current_machinery - if(current_machinery.process_atmos(seconds) == PROCESS_KILL) - stop_processing_machine(current_machinery) + if(M.process_atmos() == PROCESS_KILL) + stop_processing_machine(M) if(MC_TICK_CHECK) return -/** - * Adds a given machine to the processing system for SSAIR_ATMOSMACHINERY processing. - * - * Arguments: - * * machine - The machine to start processing. Can be any /obj/machinery. - */ -/datum/controller/subsystem/air/proc/start_processing_machine(obj/machinery/machine) - if(machine.atmos_processing) - return - machine.atmos_processing = TRUE - if(machine.interacts_with_air) - atmos_air_machinery += machine - else - atmos_machinery += machine - -/** - * Removes a given machine to the processing system for SSAIR_ATMOSMACHINERY processing. - * - * Arguments: - * * machine - The machine to stop processing. - */ -/datum/controller/subsystem/air/proc/stop_processing_machine(obj/machinery/machine) - if(!machine.atmos_processing) - return - machine.atmos_processing = FALSE - if(machine.interacts_with_air) - atmos_air_machinery -= machine - else - atmos_machinery -= machine - - // If we're currently processing atmos machines, there's a chance this machine is in - // the currentrun list, which is a cache of atmos_machinery. Remove it from that list - // as well to prevent processing qdeleted objects in the cache. - if(currentpart == SSAIR_ATMOSMACHINERY) - currentrun -= machine - if(machine.interacts_with_air && currentpart == SSAIR_ATMOSMACHINERY_AIR) - currentrun -= machine - -/datum/controller/subsystem/air/proc/process_turf_heat() - /datum/controller/subsystem/air/proc/process_hotspots(resumed = FALSE) if (!resumed) src.currentrun = hotspots.Copy() @@ -469,21 +371,16 @@ SUBSYSTEM_DEF(air) if(MC_TICK_CHECK) return - -/datum/controller/subsystem/air/proc/process_high_pressure_delta(resumed = 0) +/datum/controller/subsystem/air/proc/process_high_pressure_delta(resumed = FALSE) while (high_pressure_delta.len) var/turf/open/T = high_pressure_delta[high_pressure_delta.len] high_pressure_delta.len-- T.high_pressure_movements() T.pressure_difference = 0 - T.pressure_specific_target = null if(MC_TICK_CHECK) return -/datum/controller/subsystem/air/proc/process_turf_equalize(resumed = 0) - if(process_turf_equalize_auxtools(resumed,MC_TICK_REMAINING_MS)) - pause() - /* +/datum/controller/subsystem/air/proc/process_active_turfs(resumed = FALSE) //cache for sanic speed var/fire_count = times_fired if (!resumed) @@ -494,124 +391,494 @@ SUBSYSTEM_DEF(air) var/turf/open/T = currentrun[currentrun.len] currentrun.len-- if (T) - T.equalize_pressure_in_zone(fire_count) - //equalize_pressure_in_zone(T, fire_count) + T.process_cell(fire_count) if (MC_TICK_CHECK) return - */ -/datum/controller/subsystem/air/proc/process_turfs(resumed = 0) - if(process_turfs_auxtools(resumed,MC_TICK_REMAINING_MS)) - pause() - /* - //cache for sanic speed - var/fire_count = times_fired +/datum/controller/subsystem/air/proc/process_excited_groups(resumed = FALSE) if (!resumed) - src.currentrun = active_turfs.Copy() + src.currentrun = excited_groups.Copy() //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun while(currentrun.len) - var/turf/open/T = currentrun[currentrun.len] + var/datum/excited_group/EG = currentrun[currentrun.len] currentrun.len-- - if (T) - T.process_cell(fire_count) + EG.breakdown_cooldown++ + EG.dismantle_cooldown++ + if(EG.breakdown_cooldown >= EXCITED_GROUP_BREAKDOWN_CYCLES) + EG.self_breakdown(poke_turfs = TRUE) + else if(EG.dismantle_cooldown >= EXCITED_GROUP_DISMANTLE_CYCLES && !(EG.turf_reactions & (REACTING | STOP_REACTIONS))) + EG.dismantle() + EG.turf_reactions = NONE + if (MC_TICK_CHECK) + return + +/datum/controller/subsystem/air/proc/process_rebuilds() + //Yes this does mean rebuilding pipenets can freeze up the subsystem forever, but if we're in that situation something else is very wrong + var/list/currentrun = rebuild_queue + while(currentrun.len || length(expansion_queue)) + while(currentrun.len && !length(expansion_queue)) //If we found anything, process that first + var/obj/machinery/atmospherics/remake = currentrun[currentrun.len] + currentrun.len-- + if (!remake) + continue + remake.rebuild_pipes() + if (MC_TICK_CHECK) + return + + var/list/queue = expansion_queue + while(queue.len) + var/list/pack = queue[queue.len] + //We operate directly with the pipenet like this because we can trust any rebuilds to remake it properly + var/datum/pipenet/linepipe = pack[SSAIR_REBUILD_PIPENET] + var/list/border = pack[SSAIR_REBUILD_QUEUE] + expand_pipenet(linepipe, border) + if(state != SS_RUNNING) //expand_pipenet can fail a tick check, we shouldn't let things get too fucky here + return + + linepipe.building = FALSE + queue.len-- + if (MC_TICK_CHECK) + return + +///Rebuilds a pipenet by expanding outwards, while yielding when sane +/datum/controller/subsystem/air/proc/expand_pipenet(datum/pipenet/net, list/border) + while(border.len) + var/obj/machinery/atmospherics/borderline = border[border.len] + border.len-- + + var/list/result = borderline.pipenet_expansion(net) + if(!length(result)) + continue + for(var/obj/machinery/atmospherics/considered_device in result) + if(!istype(considered_device, /obj/machinery/atmospherics/pipe)) + considered_device.set_pipenet(net, borderline) + net.add_machinery_member(considered_device) + continue + var/obj/machinery/atmospherics/pipe/item = considered_device + if(net.members.Find(item)) + continue + if(item.parent) + var/static/pipenetwarnings = 10 + if(pipenetwarnings > 0) + log_mapping("build_pipenet(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) around [AREACOORD(item)].") + pipenetwarnings-- + if(pipenetwarnings == 0) + log_mapping("build_pipenet(): further messages about pipenets will be suppressed") + + net.members += item + border += item + + net.air.volume += item.volume + item.parent = net + + if(item.air_temporary) + net.air.merge(item.air_temporary) + item.air_temporary = null + if (MC_TICK_CHECK) return - */ - -/datum/controller/subsystem/air/proc/process_excited_groups(resumed = 0) - if(process_excited_groups_auxtools(resumed,MC_TICK_REMAINING_MS)) - pause() - -/datum/controller/subsystem/air/proc/finish_turf_processing(resumed = 0) - if(finish_turf_processing_auxtools(MC_TICK_REMAINING_MS)) - pause() - -/datum/controller/subsystem/air/proc/post_process_turfs(resumed = 0) - if(post_process_turfs_auxtools(resumed,MC_TICK_REMAINING_MS)) - pause() - -/datum/controller/subsystem/air/proc/finish_turf_processing_auxtools() -/datum/controller/subsystem/air/proc/process_turfs_auxtools() -/datum/controller/subsystem/air/proc/post_process_turfs_auxtools() -/datum/controller/subsystem/air/proc/process_turf_equalize_auxtools() -/datum/controller/subsystem/air/proc/process_excited_groups_auxtools() -/datum/controller/subsystem/air/proc/get_amt_gas_mixes() -/datum/controller/subsystem/air/proc/get_max_gas_mixes() -/datum/controller/subsystem/air/proc/turf_process_time() -/datum/controller/subsystem/air/proc/heat_process_time() + +///Removes a turf from processing, and causes its excited group to clean up so things properly adapt to the change +/datum/controller/subsystem/air/proc/remove_from_active(turf/open/T) + active_turfs -= T + if(currentpart == SSAIR_ACTIVETURFS) + currentrun -= T + #ifdef VISUALIZE_ACTIVE_TURFS //Use this when you want details about how the turfs are moving, display_all_groups should work for normal operation + T.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_VIBRANT_LIME) + #endif + if(istype(T)) + T.excited = FALSE + if(T.excited_group) + //If this fires during active turfs it'll cause a slight removal of active turfs, as they breakdown if they have no excited group + //The group also expands by a tile per rebuild on each edge, suffering + T.excited_group.garbage_collect() //Kill the excited group, it'll reform on its own later + +///Puts an active turf to sleep so it doesn't process. Do this without cleaning up its excited group. +/datum/controller/subsystem/air/proc/sleep_active_turf(turf/open/T) + active_turfs -= T + if(currentpart == SSAIR_ACTIVETURFS) + currentrun -= T + #ifdef VISUALIZE_ACTIVE_TURFS + T.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_VIBRANT_LIME) + #endif + if(istype(T)) + T.excited = FALSE + +///Adds a turf to active processing, handles duplicates. Call this with blockchanges == TRUE if you want to nuke the assoc excited group +/datum/controller/subsystem/air/proc/add_to_active(turf/open/activate, blockchanges = FALSE) + if(istype(activate) && activate.air) + activate.significant_share_ticker = 0 + if(blockchanges && activate.excited_group) //This is used almost exclusivly for shuttles, so the excited group doesn't stay behind + activate.excited_group.garbage_collect() //Nuke it + if(activate.excited) //Don't keep doing it if there's no point + return + #ifdef VISUALIZE_ACTIVE_TURFS + activate.add_atom_colour(COLOR_VIBRANT_LIME, TEMPORARY_COLOUR_PRIORITY) + #endif + activate.excited = TRUE + active_turfs += activate + else if(activate.flags_1 & INITIALIZED_1) + for(var/turf/open/neighbor as anything in activate.atmos_adjacent_turfs) + add_to_active(neighbor, TRUE) + else if(map_loading) + if(queued_for_activation) + queued_for_activation[activate] = activate + else + activate.requires_activation = TRUE /datum/controller/subsystem/air/StartLoadingMap() + LAZYINITLIST(queued_for_activation) map_loading = TRUE /datum/controller/subsystem/air/StopLoadingMap() map_loading = FALSE - -/datum/controller/subsystem/air/proc/pause_z(z_level) - LAZYADD(paused_z_levels, z_level) - unpausing_z_levels -= z_level - pausing_z_levels |= z_level - -/datum/controller/subsystem/air/proc/unpause_z(z_level) - pausing_z_levels -= z_level - unpausing_z_levels |= z_level - LAZYREMOVE(paused_z_levels, z_level) + for(var/T in queued_for_activation) + add_to_active(T, TRUE) + queued_for_activation.Cut() /datum/controller/subsystem/air/proc/setup_allturfs() - var/times_fired = ++src.times_fired - - for(var/turf/T as anything in ALL_TURFS()) - if (!T.init_air) + var/list/active_turfs = src.active_turfs + times_fired++ + + // Clear active turfs - faster than removing every single turf in the world + // one-by-one, and Initalize_Atmos only ever adds `src` back in. + #ifdef VISUALIZE_ACTIVE_TURFS + for(var/jumpy in active_turfs) + var/turf/active = jumpy + active.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_VIBRANT_LIME) + #endif + active_turfs.Cut() + var/time = 0 + + var/list/turf/open/difference_check = list() + for(var/turf/setup as anything in ALL_TURFS()) + if (!setup.init_air) continue - T.Initalize_Atmos(times_fired) + // We pass the tick as the current step so if we sleep the step changes + // This way we can make setting up adjacent turfs O(n) rather then O(n^2) + setup.Initalize_Atmos(time) + // We assert that we'll only get open turfs here + difference_check += setup + if(CHECK_TICK) + time-- + + // Now we're gonna compare for differences + // Taking advantage of current cycle being set to negative before this run to do A->B B->A prevention + for(var/turf/open/potential_diff as anything in difference_check) + // I can't use 0 here, so we're gonna do this instead. If it ever breaks I'll eat my shoe + potential_diff.current_cycle = -INFINITY + for(var/turf/open/enemy_tile as anything in potential_diff.atmos_adjacent_turfs) + // If it's already been processed, then it's already talked to us + if(enemy_tile.current_cycle == -INFINITY) + continue + // .air instead of .return_air() because we can guarentee that the proc won't do anything + if(potential_diff.air.compare(enemy_tile.air, MOLES)) + //testing("Active turf found. Return value of compare(): [T.air.compare(enemy_tile.air, MOLES)]") + if(!potential_diff.excited) + potential_diff.excited = TRUE + SSair.active_turfs += potential_diff + if(!enemy_tile.excited) + enemy_tile.excited = TRUE + SSair.active_turfs += enemy_tile + // No sense continuing to iterate + break CHECK_TICK + if(active_turfs.len) + var/starting_ats = active_turfs.len + sleep(world.tick_lag) + var/timer = world.timeofday + log_mapping("There are [starting_ats] active turfs at roundstart caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required).") + for(var/turf/T in active_turfs) + GLOB.active_turfs_startlist += T + + //now lets clear out these active turfs + var/list/turfs_to_check = active_turfs.Copy() + do + var/list/new_turfs_to_check = list() + for(var/turf/open/T in turfs_to_check) + new_turfs_to_check += T.resolve_active_graph() + CHECK_TICK + + active_turfs += new_turfs_to_check + turfs_to_check = new_turfs_to_check + while (turfs_to_check.len) + + var/ending_ats = active_turfs.len + for(var/thing in excited_groups) + var/datum/excited_group/EG = thing + EG.self_breakdown(roundstart = TRUE) + EG.dismantle() + CHECK_TICK + + var/msg = "HEY! LISTEN! [DisplayTimeText(world.timeofday - timer)] were wasted processing [starting_ats] turf(s) (connected to [ending_ats - starting_ats] other turfs) with atmos differences at round start." + to_chat(world, span_boldannounce("[msg]")) + warning(msg) + +/turf/open/proc/resolve_active_graph() + . = list() + var/datum/excited_group/EG = excited_group + if (blocks_air || !air) + return + if (!EG) + EG = new + EG.add_turf(src) + + for (var/turf/open/ET in atmos_adjacent_turfs) + if (ET.blocks_air || !ET.air) + continue + + var/ET_EG = ET.excited_group + if (ET_EG) + if (ET_EG != EG) + EG.merge_groups(ET_EG) + EG = excited_group //merge_groups() may decide to replace our current EG + else + EG.add_turf(ET) + if (!ET.excited) + ET.excited = TRUE + . += ET + +/turf/open/space/resolve_active_graph() + return list() + /datum/controller/subsystem/air/proc/setup_atmos_machinery() - for (var/obj/machinery/atmospherics/AM in atmos_machinery + atmos_air_machinery) - AM.atmosinit() + for (var/obj/machinery/atmospherics/AM in atmos_machinery) + AM.atmos_init() CHECK_TICK //this can't be done with setup_atmos_machinery() because // all atmos machinery has to initalize before the first // pipenet can be built. /datum/controller/subsystem/air/proc/setup_pipenets() - for (var/obj/machinery/atmospherics/AM in atmos_machinery + atmos_air_machinery) - AM.build_network() + for(var/obj/machinery/atmospherics/AM in atmos_machinery) + var/list/targets = AM.get_rebuild_targets() + for(var/datum/pipenet/build_off as anything in targets) + build_off.build_pipenet_blocking(AM) CHECK_TICK +GLOBAL_LIST_EMPTY(colored_turfs) +GLOBAL_LIST_EMPTY(colored_images) +/datum/controller/subsystem/air/proc/setup_turf_visuals() + for(var/sharp_color in GLOB.contrast_colors) + var/list/add_to = list() + GLOB.colored_turfs += list(add_to) + var/obj/effect/overlay/atmos_excited/suger_high = new() + add_to += suger_high + var/image/shiny = new('icons/effects/effects.dmi', suger_high, "atmos_top") + shiny.layer = ATMOS_GROUP_LAYER + shiny.color = sharp_color + GLOB.colored_images += shiny + /datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines) - if(!initialized) // yogs - fixes randomized bars - return // yogs var/obj/machinery/atmospherics/AM for(var/A in 1 to atmos_machines.len) AM = atmos_machines[A] - AM.atmosinit() + AM.atmos_init() CHECK_TICK for(var/A in 1 to atmos_machines.len) AM = atmos_machines[A] - AM.build_network() + var/list/targets = AM.get_rebuild_targets() + for(var/datum/pipenet/build_off as anything in targets) + build_off.build_pipenet_blocking(AM) CHECK_TICK -/datum/controller/subsystem/air/proc/get_init_dirs(type, dir) + +/datum/controller/subsystem/air/proc/get_init_dirs(type, dir, init_dir) if(!pipe_init_dirs_cache[type]) pipe_init_dirs_cache[type] = list() - if(!pipe_init_dirs_cache[type]["[dir]"]) - var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir) - pipe_init_dirs_cache[type]["[dir]"] = temp.GetInitDirections() + if(!pipe_init_dirs_cache[type]["[init_dir]"]) + pipe_init_dirs_cache[type]["[init_dir]"] = list() + + if(!pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"]) + var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir, init_dir) + pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"] = temp.get_init_directions() qdel(temp) - return pipe_init_dirs_cache[type]["[dir]"] - -#undef SSAIR_PIPENETS -#undef SSAIR_ATMOSMACHINERY -#undef SSAIR_EXCITEDGROUPS -#undef SSAIR_HIGHPRESSURE -#undef SSAIR_HOTSPOTS -#undef SSAIR_TURF_CONDUCTION -#undef SSAIR_EQUALIZE -#undef SSAIR_ACTIVETURFS -#undef SSAIR_TURF_POST_PROCESS -#undef SSAIR_FINALIZE_TURFS -#undef SSAIR_ATMOSMACHINERY_AIR + return pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"] + +/datum/controller/subsystem/air/proc/generate_atmos() + atmos_gen = list() + for(var/T in subtypesof(/datum/atmosphere)) + var/datum/atmosphere/atmostype = T + atmos_gen[initial(atmostype.id)] = new atmostype + +/// Takes a gas string, returns the matching mutable gas_mixture +/datum/controller/subsystem/air/proc/parse_gas_string(gas_string, gastype = /datum/gas_mixture) + var/datum/gas_mixture/cached = strings_to_mix["[gas_string]-[gastype]"] + if(cached) + if(istype(cached, /datum/gas_mixture/immutable)) + return cached + return cached.copy() + + var/datum/gas_mixture/canonical_mix = new gastype() + // We set here so any future key changes don't fuck us + strings_to_mix["[gas_string]-[gastype]"] = canonical_mix + gas_string = preprocess_gas_string(gas_string) + + var/list/gas = params2list(gas_string) + if(gas["TEMP"]) + canonical_mix.temperature = text2num(gas["TEMP"]) + canonical_mix.temperature_archived = canonical_mix.temperature + gas -= "TEMP" + else // if we do not have a temp in the new gas mix lets assume room temp. + canonical_mix.temperature = T20C + for(var/id in gas) + var/path = id + if(!ispath(path)) + path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around + SET_MOLES(path, canonical_mix, text2num(gas[id])) + + if(istype(canonical_mix, /datum/gas_mixture/immutable)) + return canonical_mix + return canonical_mix.copy() + +/datum/controller/subsystem/air/proc/preprocess_gas_string(gas_string) + if(!atmos_gen) + generate_atmos() + if(!atmos_gen[gas_string]) + return gas_string + var/datum/atmosphere/mix = atmos_gen[gas_string] + return mix.gas_string + +/** + * Adds a given machine to the processing system for SSAIR_ATMOSMACHINERY processing. + * + * This should be fast, so no error checking is done. + * If you start adding in things you shouldn't, you'll cause runtimes every 2 seconds for every + * object you added. Do not use irresponsibly. + * Arguments: + * * machine - The machine to start processing. Can be any /obj/machinery. + */ +/datum/controller/subsystem/air/proc/start_processing_machine(obj/machinery/machine) + if(machine.atmos_processing) + return + if(QDELETED(machine)) + stack_trace("We tried to add a garbage collecting machine to SSair. Don't") + return + machine.atmos_processing = TRUE + atmos_machinery += machine + +/** + * Removes a given machine to the processing system for SSAIR_ATMOSMACHINERY processing. + * + * This should be fast, so no error checking is done. + * If you call this proc when your machine isn't processing, you're likely attempting to + * remove something that isn't in a list with over 1000 objects, twice. Do not use + * irresponsibly. + * Arguments: + * * machine - The machine to stop processing. + */ +/datum/controller/subsystem/air/proc/stop_processing_machine(obj/machinery/machine) + if(!machine.atmos_processing) + return + machine.atmos_processing = FALSE + atmos_machinery -= machine + + // If we're currently processing atmos machines, there's a chance this machine is in + // the currentrun list, which is a cache of atmos_machinery. Remove it from that list + // as well to prevent processing qdeleted objects in the cache. + if(currentpart == SSAIR_ATMOSMACHINERY) + currentrun -= machine + +/datum/controller/subsystem/air/ui_state(mob/user) + return GLOB.debug_state + +/datum/controller/subsystem/air/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosControlPanel") + ui.set_autoupdate(FALSE) + ui.open() + +/datum/controller/subsystem/air/ui_data(mob/user) + var/list/data = list() + data["excited_groups"] = list() + for(var/datum/excited_group/group in excited_groups) + var/turf/T = group.turf_list[1] + var/area/target = get_area(T) + var/max = 0 + #ifdef TRACK_MAX_SHARE + for(var/who in group.turf_list) + var/turf/open/lad = who + max = max(lad.max_share, max) + #endif + data["excited_groups"] += list(list( + "jump_to" = REF(T), //Just go to the first turf + "group" = REF(group), + "area" = target.name, + "breakdown" = group.breakdown_cooldown, + "dismantle" = group.dismantle_cooldown, + "size" = group.turf_list.len, + "should_show" = group.should_display, + "max_share" = max + )) + data["active_size"] = active_turfs.len + data["hotspots_size"] = hotspots.len + data["excited_size"] = excited_groups.len + data["frozen"] = can_fire + data["show_all"] = display_all_groups + data["fire_count"] = times_fired + #ifdef TRACK_MAX_SHARE + data["display_max"] = TRUE + #else + data["display_max"] = FALSE + #endif + data["showing_user"] = user.hud_used.atmos_debug_overlays + return data + +/datum/controller/subsystem/air/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(. || !check_rights_for(usr.client, R_DEBUG)) + return + switch(action) + if("move-to-target") + var/turf/target = locate(params["spot"]) + if(!target) + return + usr.forceMove(target) + if("toggle-freeze") + can_fire = !can_fire + return TRUE + if("toggle_show_group") + var/datum/excited_group/group = locate(params["group"]) + if(!group) + return + group.should_display = !group.should_display + if(display_all_groups) + return TRUE + if(group.should_display) + group.display_turfs() + else + group.hide_turfs() + return TRUE + if("toggle_show_all") + display_all_groups = !display_all_groups + for(var/datum/excited_group/group in excited_groups) + if(display_all_groups) + group.display_turfs() + else if(!group.should_display) //Don't flicker yeah? + group.hide_turfs() + return TRUE + if("toggle_user_display") + var/mob/user = ui.user + user.hud_used.atmos_debug_overlays = !user.hud_used.atmos_debug_overlays + if(user.hud_used.atmos_debug_overlays) + user.client.images += GLOB.colored_images + else + user.client.images -= GLOB.colored_images + return TRUE + +// Supercruise Z-pausing +/datum/controller/subsystem/air/proc/pause_z(z_level) + LAZYADD(paused_z_levels, z_level) + unpausing_z_levels -= z_level + pausing_z_levels |= z_level + +/datum/controller/subsystem/air/proc/unpause_z(z_level) + pausing_z_levels -= z_level + unpausing_z_levels |= z_level + LAZYREMOVE(paused_z_levels, z_level) diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 292fabedaf37e..3d1f81f6a9a38 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -1,8 +1,3 @@ -#define BAD_INIT_QDEL_BEFORE 1 -#define BAD_INIT_DIDNT_INIT 2 -#define BAD_INIT_SLEPT 4 -#define BAD_INIT_NO_HINT 8 - #define SUBSYSTEM_INIT_SOURCE "subsystem init" SUBSYSTEM_DEF(atoms) name = "Atoms" @@ -46,14 +41,6 @@ SUBSYSTEM_DEF(atoms) InitializeAtoms() return SS_INIT_SUCCESS -#ifdef PROFILE_MAPLOAD_INIT_ATOM -#define PROFILE_INIT_ATOM_BEGIN(...) var/__profile_stat_time = TICK_USAGE -#define PROFILE_INIT_ATOM_END(atom) mapload_init_times += list(list(##atom.type, TICK_USAGE_TO_MS(__profile_stat_time))) -#else -#define PROFILE_INIT_ATOM_BEGIN(...) -#define PROFILE_INIT_ATOM_END(...) -#endif - /datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms, list/atoms_to_return) if(initialized == INITIALIZATION_INSSATOMS) return @@ -272,9 +259,3 @@ SUBSYSTEM_DEF(atoms) #undef SUBSYSTEM_INIT_SOURCE -#undef BAD_INIT_QDEL_BEFORE -#undef BAD_INIT_DIDNT_INIT -#undef BAD_INIT_SLEPT -#undef BAD_INIT_NO_HINT -#undef PROFILE_INIT_ATOM_BEGIN -#undef PROFILE_INIT_ATOM_END diff --git a/code/controllers/subsystem/callback.dm b/code/controllers/subsystem/callback.dm deleted file mode 100644 index ecc65760f4e80..0000000000000 --- a/code/controllers/subsystem/callback.dm +++ /dev/null @@ -1,14 +0,0 @@ -SUBSYSTEM_DEF(callbacks) - name = "Auxtools Callbacks" - flags = SS_TICKER | SS_NO_INIT - wait = 1 - priority = FIRE_PRIORITY_CALLBACKS - -/proc/process_atmos_callbacks() - SScallbacks.can_fire = 0 - SScallbacks.flags |= SS_NO_FIRE - CRASH("Auxtools not found! Callback subsystem shutting itself off.") - -/datum/controller/subsystem/callbacks/fire() - if(process_atmos_callbacks(MC_TICK_REMAINING_MS)) - pause() diff --git a/code/controllers/subsystem/explosion.dm b/code/controllers/subsystem/explosion.dm index c7ca9ca925e8f..238e9076f55ad 100644 --- a/code/controllers/subsystem/explosion.dm +++ b/code/controllers/subsystem/explosion.dm @@ -34,9 +34,10 @@ SUBSYSTEM_DEF(explosions) var/list/med_mov_atom = list() var/list/high_mov_atom = list() - var/list/explosions = list() + // Track how many explosions have happened. + var/explosion_index = 0 - var/currentpart = SSAIR_REBUILD_PIPENETS + var/currentpart = SSEXPLOSIONS_TURFS var/turf/last_exploded_turf = null var/last_explosion_count = 0 @@ -449,7 +450,9 @@ SUBSYSTEM_DEF(explosions) if(GLOB.Debug2) log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.") - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EXPLOSION, epicenter, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range) + explosion_index += 1 + + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EXPLOSION, epicenter, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range, explosion_index) #undef CREAK_DELAY #undef DEVASTATION_PROB @@ -639,7 +642,6 @@ SUBSYSTEM_DEF(explosions) currentpart = SSEXPLOSIONS_TURFS -#undef SSAIR_REBUILD_PIPENETS #undef EXPLOSION_THROW_SPEED #undef EXPLOSION_TURF_MAX #undef SSEX_TURF diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 429ad235cf027..df43c7b6602dd 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -154,6 +154,8 @@ SUBSYSTEM_DEF(mapping) var/area/old_area = T.loc old_area.turfs_to_uncontain += T T.flags_1 |= UNUSED_RESERVATION_TURF_1 + // reservation turfs are not allowed to interact with atmos at all + T.blocks_air = TRUE world_contents += T world_turf_contents += T packet.len-- @@ -574,6 +576,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) // already /turf/open/space/basic. var/turf/T = t T.flags_1 |= UNUSED_RESERVATION_TURF_1 + T.blocks_air = TRUE unused_turfs["[z]"] = block reservation_ready["[z]"] = TRUE clearing_reserved_turfs = FALSE diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 957e5806f02a7..12dea7035bb80 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -46,21 +46,17 @@ SUBSYSTEM_DEF(overlays) count++ if(!atom_to_compile) continue + if(length(atom_to_compile.overlays) >= MAX_ATOM_OVERLAYS) + //Break it real GOOD + stack_trace("Too many overlays on [atom_to_compile.type] - [length(atom_to_compile.overlays)], refusing to update and cutting.") + atom_to_compile.overlays.Cut() + continue STAT_START_STOPWATCH COMPILE_OVERLAYS(atom_to_compile) UNSETEMPTY(atom_to_compile.add_overlays) UNSETEMPTY(atom_to_compile.remove_overlays) STAT_STOP_STOPWATCH STAT_LOG_ENTRY(stats, atom_to_compile.type) - if(length(atom_to_compile.overlays) >= MAX_ATOM_OVERLAYS) - //Break it real GOOD - var/text_lays = overlays2text(atom_to_compile.overlays) - stack_trace("Too many overlays on [atom_to_compile.type] - [length(atom_to_compile.overlays)], refusing to update and cutting.\ - \n What follows is a printout of all existing overlays at the time of the overflow \n[text_lays]") - atom_to_compile.overlays.Cut() - //Let them know they fucked up - atom_to_compile.add_overlay(mutable_appearance('icons/testing/greyscale_error.dmi')) - continue if(mc_check) if(MC_TICK_CHECK) break diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index 1da7ab31698cc..ed862d47b7300 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -67,7 +67,6 @@ SUBSYSTEM_DEF(time_track) "air_eg_cost", "air_highpressure_cost", "air_hotspots_cost", - "air_superconductivity_cost", "air_pipenets_cost", "air_rebuilds_cost", "air_turf_count", @@ -137,13 +136,11 @@ SUBSYSTEM_DEF(time_track) SSair.cost_groups, SSair.cost_highpressure, SSair.cost_hotspots, - SSair.cost_superconductivity, SSair.cost_pipenets, SSair.cost_rebuilds, length(SSair.hotspots), length(SSair.networks), length(SSair.high_pressure_delta), - //length(SSair.active_super_conductivity), // LINDA, I assume SSdbcore.all_queries_num, SSdbcore.queries_active_num, SSdbcore.queries_standby_num diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 62d52b69f8606..8b33bb7970cb4 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -147,7 +147,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/hypospray, /obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer, /obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis, - /obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes, + /obj/machinery/dna_scannernew, /obj/machinery/cryo_cell, /obj/item/surgical_drapes, /obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/costume/plague, /obj/item/clothing/mask/gas/plaguedoctor)), diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm index ba06b1c879219..a82c21143620b 100644 --- a/code/datums/alarm.dm +++ b/code/datums/alarm.dm @@ -58,6 +58,7 @@ our_area.active_alarms[alarm_type] += 1 + SEND_SIGNAL(src, COMSIG_ALARM_TRIGGERED, alarm_type, our_area) SEND_GLOBAL_SIGNAL(COMSIG_ALARM_FIRE(alarm_type), src, alarm_type, our_area, our_z_level, optional_camera) return TRUE @@ -90,6 +91,7 @@ if(!length(our_area.active_alarms)) our_area.active_alarms -= alarm_type + SEND_SIGNAL(src, COMSIG_ALARM_CLEARED, alarm_type, our_area) SEND_GLOBAL_SIGNAL(COMSIG_ALARM_CLEAR(alarm_type), src, alarm_type, our_area) return TRUE diff --git a/code/datums/atmosphere/_atmosphere.dm b/code/datums/atmosphere/_atmosphere.dm index df76b3f2a4111..f4667adedb448 100644 --- a/code/datums/atmosphere/_atmosphere.dm +++ b/code/datums/atmosphere/_atmosphere.dm @@ -17,15 +17,18 @@ generate_gas_string() /datum/atmosphere/proc/generate_gas_string() + var/list/spicy_gas = restricted_gases.Copy() var/target_pressure = rand(minimum_pressure, maximum_pressure) var/pressure_scalar = target_pressure / maximum_pressure // First let's set up the gasmix and base gases for this template // We make the string from a gasmix in this proc because gases need to calculate their pressure var/datum/gas_mixture/gasmix = new - gasmix.set_temperature(rand(minimum_temp, maximum_temp)) + var/list/gaslist = gasmix.gases + gasmix.temperature = rand(minimum_temp, maximum_temp) for(var/i in base_gases) - gasmix.set_moles(i, base_gases[i]) + ADD_GAS(i, gaslist) + gaslist[i][MOLES] = base_gases[i] // Now let the random choices begin var/datum/gas/gastype @@ -37,23 +40,24 @@ else gastype = pick(restricted_gases) amount = restricted_gases[gastype] - if(gasmix.get_moles(gastype)) - continue + spicy_gas -= gastype //You can only pick each restricted gas once amount *= rand(50, 200) / 100 // Randomly modifes the amount from half to double the base for some variety amount *= pressure_scalar // If we pick a really small target pressure we want roughly the same mix but less of it all amount = CEILING(amount, 0.1) - gasmix.set_moles(gastype, gasmix.get_moles(gastype) + amount) + ADD_MOLES_LIST(gastype, gaslist, amount) // That last one put us over the limit, remove some of it while(gasmix.return_pressure() > target_pressure) - gasmix.set_moles(gastype, gasmix.get_moles(gastype) - (gasmix.get_moles(gastype) * 0.1)) - gasmix.set_moles(gastype, FLOOR(gasmix.get_moles(gastype), 0.1)) + gaslist[gastype][MOLES] -= gaslist[gastype][MOLES] * 0.1 + gaslist[gastype][MOLES] = FLOOR(gaslist[gastype][MOLES], 0.1) + gasmix.garbage_collect() // Now finally lets make that string var/list/gas_string_builder = list() - for(var/i in gasmix.get_gases()) - gas_string_builder += "[GLOB.gas_data.ids[i]]=[gasmix.get_moles(i)]" - gas_string_builder += "TEMP=[gasmix.return_temperature()]" + for(var/i in gasmix.gases) + var/list/gas = gaslist[i] + gas_string_builder += "[gas[GAS_META][META_GAS_ID]]=[gas[MOLES]]" + gas_string_builder += "TEMP=[gasmix.temperature]" gas_string = gas_string_builder.Join(";") diff --git a/code/datums/components/crafting/crafting_lists/structures.dm b/code/datums/components/crafting/crafting_lists/structures.dm index 835719293a27b..10e19903e5ab5 100644 --- a/code/datums/components/crafting/crafting_lists/structures.dm +++ b/code/datums/components/crafting/crafting_lists/structures.dm @@ -120,6 +120,18 @@ category = CAT_STRUCTURE one_per_turf = TRUE +/datum/crafting_recipe/air_sensor + name = "Monitored Air Sensor" + result = /obj/item/air_sensor + time = 1 SECONDS + reqs = list( + /obj/item/analyzer = 1, + /obj/item/stack/sheet/iron = 1, + ) + blacklist = list(/obj/item/analyzer/ranged) + tools = list(TOOL_SCREWDRIVER) + category = CAT_STRUCTURE + one_per_turf = TRUE /datum/crafting_recipe/weightmachine name = "Chest press machine" result = /obj/structure/weightmachine diff --git a/code/datums/components/gas_leaker.dm b/code/datums/components/gas_leaker.dm new file mode 100644 index 0000000000000..d386b73ff0044 --- /dev/null +++ b/code/datums/components/gas_leaker.dm @@ -0,0 +1,87 @@ +#define PROCESS_COMPONENT "component" +#define PROCESS_MACHINE "machine" +#define PROCESS_OBJ "obj" + +/// A component to leak gas over time from damaged objects with gas storage +/datum/component/gas_leaker + /// Keeps track of what type we were attached to so we don't need to istype every process + var/process_type + + /// The percent of max integrity that we start leaking. From 0 to 1 + var/integrity_leak_percent + + /// The rate at which gas leaks, you probably want this *very* low. From 0 to 1 + var/leak_rate + + /// Mirror of the machine var signifying whether this is live in the air subsystem + var/atmos_processing = FALSE + +/datum/component/gas_leaker/Initialize(integrity_leak_percent=0.9, leak_rate=1) + . = ..() + if(istype(parent, /obj/machinery/atmospherics/components)) + process_type = PROCESS_COMPONENT + else if(ismachinery(parent)) + process_type = PROCESS_MACHINE + else if(isobj(parent)) + process_type = PROCESS_OBJ + else + return COMPONENT_INCOMPATIBLE + + src.integrity_leak_percent = integrity_leak_percent + src.leak_rate = leak_rate + +/datum/component/gas_leaker/Destroy(force, silent) + SSair.stop_processing_machine(src) + return ..() + +/datum/component/gas_leaker/RegisterWithParent() + . = ..() + RegisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(start_processing)) + +/datum/component/gas_leaker/UnregisterFromParent() + . = ..() + UnregisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE) + +/datum/component/gas_leaker/proc/process_atmos() + . = PROCESS_KILL + switch(process_type) + if(PROCESS_OBJ) + . = process_obj(parent) + if(PROCESS_MACHINE) + . = process_machine(parent) + if(PROCESS_COMPONENT) + . = process_component(parent) + +/datum/component/gas_leaker/proc/start_processing() + SIGNAL_HANDLER + // Hello fellow atmospherics machines, I too am definitely an atmos machine like you! + // This component needs to tick at the same rate as the atmos system + SSair.start_processing_machine(src) + +/datum/component/gas_leaker/proc/process_obj(obj/master, list/airs=list()) + airs += master.return_air() + return process_leak(master, airs) + +/datum/component/gas_leaker/proc/process_machine(obj/machinery/master, list/airs=list()) + if(master.machine_stat & BROKEN) + return PROCESS_KILL + return process_obj(master, airs) + +/datum/component/gas_leaker/proc/process_component(obj/machinery/atmospherics/components/master, list/airs=list()) + airs += master.airs + return process_machine(master, airs) + +/datum/component/gas_leaker/proc/process_leak(obj/master, list/airs) + var/current_integrity = master.get_integrity() + if(current_integrity > master.max_integrity * integrity_leak_percent) + return PROCESS_KILL + var/turf/location = get_turf(master) + var/true_rate = (1 - (current_integrity / master.max_integrity)) * leak_rate + for(var/datum/gas_mixture/mix as anything in airs) + var/pressure = mix.return_pressure() + if(mix.release_gas_to(location.return_air(), pressure, true_rate)) + location.air_update_turf(FALSE, FALSE) + +#undef PROCESS_OBJ +#undef PROCESS_MACHINE +#undef PROCESS_COMPONENT diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index 7d5a6ee0bc998..da430e5f71772 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -161,12 +161,12 @@ if(!newturf) qdel(src) - var/atom/curloc = master.loc + var/atom/current_location = master.loc for(var/atom/movable/movable_orbiter as anything in current_orbiters) if(QDELETED(movable_orbiter) || movable_orbiter.loc == newturf) continue movable_orbiter.abstract_move(newturf) - if(CHECK_TICK && master.loc != curloc) + if(CHECK_TICK && master.loc != current_location) // We moved again during the checktick, cancel current operation break diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm index cbaf051bdefb4..d0ae8d089cbca 100644 --- a/code/datums/components/wet_floor.dm +++ b/code/datums/components/wet_floor.dm @@ -115,7 +115,7 @@ var/turf/open/T = parent var/diff = world.time - last_process var/decrease = 0 - var/t = T.GetTemperature() + var/t = T.get_temperature() switch(t) if(-INFINITY to T0C) add_wet(TURF_WET_ICE, max_time_left()) //Water freezes into ice! diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index f14ecfe2b9296..6791fc274ded9 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -134,7 +134,7 @@ if(end == start) return TRUE var/turf/Temp = get_step_towards(end, start) - if(!CANATMOSPASS(end, Temp)) + if(!TURFS_CAN_SHARE(end, Temp)) //Don't go through a wall return FALSE end = Temp diff --git a/code/datums/diseases/advance/symptoms/clockwork.dm b/code/datums/diseases/advance/symptoms/clockwork.dm index fc420040f59c4..b24948de14cbb 100644 --- a/code/datums/diseases/advance/symptoms/clockwork.dm +++ b/code/datums/diseases/advance/symptoms/clockwork.dm @@ -107,8 +107,8 @@ var/obj/item/organ/lungs/clockwork/organ = new() if(robustbits) organ.gas_max = list( - GAS_PLASMA = 15, - GAS_CO2 = 15, + /datum/gas/plasma = 15, + /datum/gas/carbon_dioxide = 15, ) organ.SA_para_min = 15 organ.SA_sleep_min = 15 diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index 0470d2975e517..687bb8d5f3047 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -4,7 +4,7 @@ spread_text = "On contact" spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS cure_text = "Chick Chicky Boom!" - cures = list("plasma") + cures = list(GAS_PLASMA) agent = "Unknown" viable_mobtypes = list(/mob/living/carbon/human) spreading_modifier = 1 diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm index d944a4dbac53f..ddffd374ba120 100644 --- a/code/datums/elements/atmos_requirements.dm +++ b/code/datums/elements/atmos_requirements.dm @@ -45,10 +45,10 @@ if(!ST.air && (atmos_requirements["min_oxy"] || atmos_requirements["min_tox"] || atmos_requirements["min_n2"] || atmos_requirements["min_co2"])) return FALSE - var/plas = ST.air.get_moles(GAS_PLASMA) - var/oxy = ST.air.get_moles(GAS_O2) - var/n2 = ST.air.get_moles(GAS_N2) - var/co2 = ST.air.get_moles(GAS_CO2) + var/plas = GET_MOLES(/datum/gas/plasma, ST.air) + var/oxy = GET_MOLES(/datum/gas/oxygen, ST.air) + var/n2 = GET_MOLES(/datum/gas/nitrogen, ST.air) + var/co2 = GET_MOLES(/datum/gas/carbon_dioxide, ST.air) . = TRUE if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"]) diff --git a/code/datums/elements/atmos_sensitive.dm b/code/datums/elements/atmos_sensitive.dm new file mode 100644 index 0000000000000..fa9d84a1812ea --- /dev/null +++ b/code/datums/elements/atmos_sensitive.dm @@ -0,0 +1,85 @@ +//This element facilitates reaction to atmos changes when a tile is inactive. +//It adds the object to a list on SSair to be processed for so long as the object wants to be processed +//And removes it as soon as the object is no longer interested +//Don't put it on things that tend to clump into one spot, you will cause lag spikes. +/datum/element/atmos_sensitive + element_flags = ELEMENT_DETACH + +/datum/element/atmos_sensitive/Attach(datum/target, mapload) + if(!isatom(target)) //How + return ELEMENT_INCOMPATIBLE + var/atom/to_track = target + if(to_track.loc) + to_track.RegisterSignal(to_track.loc, COMSIG_TURF_EXPOSE, TYPE_PROC_REF(/atom, check_atmos_process)) + RegisterSignal(to_track, COMSIG_MOVABLE_MOVED, PROC_REF(react_to_move)) + + if(!mapload && isopenturf(to_track.loc)) + to_track.atmos_conditions_changed() //Make sure you're properly registered + + return ..() + +/datum/element/atmos_sensitive/Detach(atom/source) + if(source.loc) + UnregisterSignal(source.loc, COMSIG_TURF_EXPOSE) + UnregisterSignal(source, COMSIG_MOVABLE_MOVED) + if(source.flags_1 & ATMOS_IS_PROCESSING_1) + source.atmos_end() + SSair.atom_process -= source + source.flags_1 &= ~ATMOS_IS_PROCESSING_1 + return ..() + +/datum/element/atmos_sensitive/proc/react_to_move(atom/source, atom/movable/oldloc, direction, forced) + SIGNAL_HANDLER + + if(oldloc) + source.UnregisterSignal(oldloc, COMSIG_TURF_EXPOSE) + if(source.loc) + source.RegisterSignal(source.loc, COMSIG_TURF_EXPOSE, TYPE_PROC_REF(/atom, check_atmos_process)) + source.atmos_conditions_changed() //Make sure you're properly registered + +/atom/proc/check_atmos_process(datum/source, datum/gas_mixture/air, exposed_temperature) + SIGNAL_HANDLER + if(should_atmos_process(air, exposed_temperature)) + if(flags_1 & ATMOS_IS_PROCESSING_1) + return + SSair.atom_process += src + flags_1 |= ATMOS_IS_PROCESSING_1 + else if(flags_1 & ATMOS_IS_PROCESSING_1) + atmos_end() + SSair.atom_process -= src + flags_1 &= ~ATMOS_IS_PROCESSING_1 + +/atom/proc/process_exposure() + var/turf/open/spot = loc + if(!isopenturf(loc)) + //If you end up in a locker or a wall reconsider your life decisions + atmos_end() + SSair.atom_process -= src + flags_1 &= ~ATMOS_IS_PROCESSING_1 + return + if(!should_atmos_process(spot.air, spot.air.temperature)) //Things can change without a tile becoming active + atmos_end() + SSair.atom_process -= src + flags_1 &= ~ATMOS_IS_PROCESSING_1 + return + atmos_expose(spot.air, spot.air.temperature) + +/turf/open/process_exposure() + if(!should_atmos_process(air, air.temperature)) + atmos_end() + SSair.atom_process -= src + flags_1 &= ~ATMOS_IS_PROCESSING_1 + return + atmos_expose(air, air.temperature) + +///We use this proc to check if we should start processing an item, or continue processing it. Returns true/false as expected +/atom/proc/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return FALSE + +///This is your process() proc +/atom/proc/atmos_expose(datum/gas_mixture/air, exposed_temperature) + return + +///What to do when our requirements are no longer met +/atom/proc/atmos_end() + return diff --git a/code/datums/elements/volatile_gas_storage.dm b/code/datums/elements/volatile_gas_storage.dm new file mode 100644 index 0000000000000..22c5f52fdf5a8 --- /dev/null +++ b/code/datums/elements/volatile_gas_storage.dm @@ -0,0 +1,49 @@ +/// An element to make an /obj explode based on gas pressure when broken +/datum/element/volatile_gas_storage + element_flags = ELEMENT_BESPOKE + + /// The minimum pressure of the gas storage to consider an explosion when broken + var/minimum_explosive_pressure + /// The max pressure to stop scaling the explosion at, you can go higher but the explosion range will stay at max + var/max_explosive_pressure + /// The max explsion range at the max pressure + var/max_explosive_force + +/datum/element/volatile_gas_storage/Attach(datum/target, minimum_explosive_pressure=5000, max_explosive_pressure=100000, max_explosive_force=9) + . = ..() + if(istype(target, /obj/machinery/atmospherics/components)) + RegisterSignal(target, COMSIG_ATOM_BREAK, PROC_REF(AtmosComponentBreak)) + else if(isobj(target)) + RegisterSignal(target, COMSIG_ATOM_BREAK, PROC_REF(ObjBreak)) + else + return ELEMENT_INCOMPATIBLE + + src.minimum_explosive_pressure = minimum_explosive_pressure + src.max_explosive_pressure = max_explosive_pressure + src.max_explosive_force = max_explosive_force + +/datum/element/volatile_gas_storage/Detach(datum/source, ...) + . = ..() + UnregisterSignal(source, COMSIG_ATOM_BREAK) + +/datum/element/volatile_gas_storage/proc/Break(atom/origin, datum/gas_mixture/released_gas) + var/expelled_pressure = min(released_gas?.return_pressure(), max_explosive_pressure) + + if(expelled_pressure < minimum_explosive_pressure) + return + + var/explosive_force = CEILING((expelled_pressure / max_explosive_pressure) * max_explosive_force , 1) + // This is supposed to represent only shrapnel and no fire + // Maybe one day we'll get something a bit better + explosion(get_turf(origin), light_impact_range=explosive_force, adminlog = origin) + +/datum/element/volatile_gas_storage/proc/AtmosComponentBreak(obj/machinery/atmospherics/components/owner) + SIGNAL_HANDLER + for(var/datum/gas_mixture/gas_contents as anything in owner.airs) + if(!gas_contents) + continue + Break(owner, gas_contents) + +/datum/element/volatile_gas_storage/proc/ObjBreak(obj/owner) + SIGNAL_HANDLER + Break(owner, owner.return_air()) diff --git a/code/datums/greyscale/greyscale_configs.dm b/code/datums/greyscale/greyscale_configs.dm index 16ba9efad921d..d4da73af93493 100644 --- a/code/datums/greyscale/greyscale_configs.dm +++ b/code/datums/greyscale/greyscale_configs.dm @@ -23,10 +23,16 @@ name = "Hazard Striped Canister" json_config = 'code/datums/greyscale/json_configs/canister_hazard.json' -/datum/greyscale_config/prototype_canister - name = "Prototype Canister" - icon_file = 'icons/obj/atmospherics/prototype_canister.dmi' - json_config = 'code/datums/greyscale/json_configs/canister_proto.json' +// MISC ATMOSPHERICS +/datum/greyscale_config/meter + name = "Meter" + icon_file = 'icons/obj/atmospherics/pipes/meter.dmi' + json_config = 'code/datums/greyscale/json_configs/meter.json' + +/datum/greyscale_config/thermomachine + name = "Thermomachine" + icon_file = 'icons/obj/atmospherics/components/thermomachine.dmi' + json_config = 'code/datums/greyscale/json_configs/thermomachine.json' /datum/greyscale_config/carp name = "Space Carp" diff --git a/code/datums/greyscale/json_configs/canister_proto.json b/code/datums/greyscale/json_configs/canister_proto.json deleted file mode 100644 index 09f19b80e9b4e..0000000000000 --- a/code/datums/greyscale/json_configs/canister_proto.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "": [ - { - "type": "icon_state", - "icon_state": "can_base", - "blend_mode": "overlay", - "color_ids": [ 1 ] - }, - { - "type": "icon_state", - "icon_state": "can_shader", - "blend_mode": "multiply" - }, - { - "type": "icon_state", - "icon_state": "stand", - "blend_mode": "overlay" - }, - { - "type": "icon_state", - "icon_state": "decals", - "blend_mode": "overlay" - }, - [ - { - "type": "icon_state", - "icon_state": "light_base", - "blend_mode": "overlay", - "color_ids": [ 2 ] - }, - { - "type": "icon_state", - "icon_state": "light", - "blend_mode": "overlay", - "color_ids": [ 3 ] - } - ] - ] -} diff --git a/code/datums/greyscale/json_configs/meter.json b/code/datums/greyscale/json_configs/meter.json new file mode 100644 index 0000000000000..344500c2a9dcc --- /dev/null +++ b/code/datums/greyscale/json_configs/meter.json @@ -0,0 +1,374 @@ +{ + "meter": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure_off", + "blend_mode": "overlay" + } + ], + "meter0": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure0", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons0", + "blend_mode": "overlay" + } + ], + "meter1_1": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure1_1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons1", + "blend_mode": "overlay" + } + ], + "meter1_2": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure1_2", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons1", + "blend_mode": "overlay" + } + ], + "meter1_3": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure1_3", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons1", + "blend_mode": "overlay" + } + ], + "meter1_4": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure1_4", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons1", + "blend_mode": "overlay" + } + ], + "meter1_5": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure1_5", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons1", + "blend_mode": "overlay" + } + ], + "meter1_6": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure1_6", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons1", + "blend_mode": "overlay" + } + ], + "meter2_1": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure2_1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons2", + "blend_mode": "overlay" + } + ], + "meter2_2": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure2_2", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons2", + "blend_mode": "overlay" + } + ], + "meter2_3": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure2_3", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons2", + "blend_mode": "overlay" + } + ], + "meter2_4": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure2_4", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons2", + "blend_mode": "overlay" + } + ], + "meter2_5": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure2_5", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons2", + "blend_mode": "overlay" + } + ], + "meter2_6": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure2_6", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons2", + "blend_mode": "overlay" + } + ], + "meter3_1": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure3_1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons3", + "blend_mode": "overlay" + } + ], + "meter3_2": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure3_2", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons3", + "blend_mode": "overlay" + } + ], + "meter3_3": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure3_3", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons3", + "blend_mode": "overlay" + } + ], + "meter3_4": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure3_4", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons3", + "blend_mode": "overlay" + } + ], + "meter3_5": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure3_5", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons3", + "blend_mode": "overlay" + } + ], + "meter3_6": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure3_6", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons3", + "blend_mode": "overlay" + } + ], + "meter4": [ + { + "type": "icon_state", + "icon_state": "meter_base", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "pressure4", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttons4", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/thermomachine.json b/code/datums/greyscale/json_configs/thermomachine.json new file mode 100644 index 0000000000000..37a4cbd681561 --- /dev/null +++ b/code/datums/greyscale/json_configs/thermomachine.json @@ -0,0 +1,41 @@ +{ + "thermo_base": [ + { + "type": "icon_state", + "icon_state": "temp_meter", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "thermo_base", + "blend_mode": "overlay" + } + ], + "thermo_1": [ + { + "type": "icon_state", + "icon_state": "temp_meter_1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "thermo_base_1", + "blend_mode": "overlay" + } + ], + "thermo-open": [ + { + "type": "icon_state", + "icon_state": "temp_meter-o", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "thermo_base-o", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index 6ad65524b517b..9cc4ce8c437b2 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -107,3 +107,10 @@ falloff_exponent = 10 falloff_distance = 5 vary = FALSE + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/looping_sound/firealarm + mid_sounds = list('sound/machines/FireAlarm1.ogg' = 1,'sound/machines/FireAlarm2.ogg' = 1,'sound/machines/FireAlarm3.ogg' = 1,'sound/machines/FireAlarm4.ogg' = 1) + mid_length = 2.4 SECONDS + volume = 40 diff --git a/code/datums/mergers/_merger.dm b/code/datums/mergers/_merger.dm new file mode 100644 index 0000000000000..9659d591d7ed7 --- /dev/null +++ b/code/datums/mergers/_merger.dm @@ -0,0 +1,157 @@ +#define MERGERS_DEBUG FALSE + +/// A datum that tracks a type or types of objects in a cluster +/datum/merger + /// The unique ID for this merger datum, adjacent merg groups with the same id will combine + var/id + /// The types allowed to be in this merge group + var/list/merged_typecache + /// Optional proc to call on potential members, return true to allow merge + var/attempt_merge_proc + + /// The arbitrary "owner" member of the merge group + var/atom/origin + /// Assoc list of all members in the group -> dirs from them to their connected nighbors + var/list/members = list() + +#if MERGERS_DEBUG + var/debug_color +#endif + +/datum/merger/New(id, list/merged_typecache, atom/origin, attempt_merge_proc) +#if MERGERS_DEBUG + debug_color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) +#endif + src.id = id + src.merged_typecache = merged_typecache + src.origin = origin + src.attempt_merge_proc = attempt_merge_proc + Refresh() + +/datum/merger/Destroy(force) + for(var/atom/thing as anything in members) + RemoveMember(thing) + return ..() + +/datum/merger/proc/RemoveMember(atom/thing, clean=TRUE) + SEND_SIGNAL(thing, COMSIG_MERGER_REMOVING, src) + UnregisterSignal(thing, COMSIG_MOVABLE_MOVED) + UnregisterSignal(thing, COMSIG_PARENT_QDELETING) + if(!thing.mergers) + return + thing.mergers -= id + if(clean && !length(thing.mergers)) + thing.mergers = null + members -= thing + origin = null + if(origin == thing && length(members)) + origin = pick(members) + +/datum/merger/proc/AddMember(atom/thing, connected_dir) // note that this fires for the origin of the merger as well + SEND_SIGNAL(thing, COMSIG_MERGER_ADDING, src) + RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(QueueRefresh)) + RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(HandleMemberDel)) + if(!thing.mergers) + thing.mergers = list() + else if(thing.mergers[id]) + var/datum/merger/other_merger = thing.mergers[id] + other_merger.RemoveMember(thing) + if(!thing.mergers) + thing.mergers = list() + + thing.mergers[id] = src + members[thing] = connected_dir + if(!origin) + origin = thing + +#if MERGERS_DEBUG + thing.add_atom_colour(debug_color, ADMIN_COLOUR_PRIORITY) + if(SSatoms.initialized != INITIALIZATION_INNEW_MAPLOAD) + sleep(1 SECONDS) +#endif + +/datum/merger/proc/HandleMemberDel(atom/source) + SIGNAL_HANDLER + RemoveMember(source) + QueueRefresh() + +/datum/merger/proc/QueueRefresh() + SIGNAL_HANDLER + addtimer(CALLBACK(src, PROC_REF(Refresh)), 1, TIMER_UNIQUE) + +/datum/merger/proc/Refresh() + // List of turf -> list(interesting dir, found matching atoms) + var/list/found_turfs = list() + if(origin) + var/turf/starting = get_turf(origin) + check_turf(starting, found_turfs, NONE) + for(var/i = 1; i <= length(found_turfs), i++) + var/turf/focus = found_turfs[i] + var/list/focus_packet = found_turfs[focus] + var/dirs_checked = focus_packet[MERGE_TURF_PACKET_DIR] + for(var/dir in GLOB.cardinals) + if(dirs_checked & dir) + continue + var/turf/location = get_step(focus, dir) + if(!location) + continue + if(!check_turf(location, found_turfs, dir)) + if(QDELETED(src)) + return + continue + focus_packet[MERGE_TURF_PACKET_DIR] |= dir + + // Now that we have an idea of our connecting directions, build the fresh members list + var/list/fresh_members = list() + for(var/turf/location as anything in found_turfs) + var/list/turf_packet = found_turfs[location] + var/connected_dirs = turf_packet[MERGE_TURF_PACKET_DIR] + for(var/datum/member as anything in turf_packet[MERGE_TURF_PACKET_ATOMS]) + fresh_members[member] = connected_dirs + + var/list/leaving_members = members - fresh_members + for(var/atom/thing as anything in leaving_members) + RemoveMember(thing) + + var/list/joining_members = fresh_members - members + for(var/atom/thing as anything in joining_members) + AddMember(thing, joining_members[thing]) + + // They may not need a full update but the connected dirs could change + for(var/atom/thing as anything in fresh_members) + members[thing] = fresh_members[thing] + + SEND_SIGNAL(src, COMSIG_MERGER_REFRESH_COMPLETE, leaving_members, joining_members) + + if(!length(members)) + qdel(src) + +// Checks to see if the passed in location contains something interesting to us. If it does, return TRUE, otherwise return false +// If it is interesting, we add it to our processing list +/datum/merger/proc/check_turf(turf/location, list/found_turfs, asking_from) + var/found_something = FALSE + // if asking_from is invalid (like if it's 0), we get a random output. that's bad, let's check for falsyness + var/us_to_them = asking_from && REVERSE_DIR(asking_from) + + if(found_turfs[location]) + found_turfs[location][MERGE_TURF_PACKET_DIR] |= us_to_them + return TRUE + + for(var/atom/movable/thing as anything in location) + if(!merged_typecache[thing.type]) + continue + if(attempt_merge_proc && !call(thing, attempt_merge_proc)(src, found_turfs)) + continue + if(thing.mergers && thing.mergers[id] != src) + var/datum/merger/existing = thing.mergers[id] + qdel(src) + existing.Refresh() + return FALSE + if(!found_turfs[location]) + found_turfs[location] = list(us_to_them, list()) + found_turfs[location][MERGE_TURF_PACKET_ATOMS] += thing + found_something = TRUE + + return found_something + +#undef MERGERS_DEBUG diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 88d04817c9275..94059f622c521 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1121,7 +1121,7 @@ /datum/status_effect/heretic_mark/void/on_effect() var/turf/open/turfie = get_turf(owner) - turfie.TakeTemperature(-40) + turfie.take_temperature(-40) owner.adjust_bodytemperature(-20) if(iscarbon(owner)) var/mob/living/carbon/carbon_owner = owner diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm index 0b1c7ebff5e56..00291609871c3 100644 --- a/code/datums/wires/airalarm.dm +++ b/code/datums/wires/airalarm.dm @@ -1,24 +1,20 @@ /datum/wires/airalarm holder_type = /obj/machinery/airalarm proper_name = "Air Alarm" - FASTDMM_PROP(\ - set_instance_vars(\ - pixel_x = (dir & 3)? INSTANCE_VAR_DEFAULT : (dir == 4 ? -24 : 24),\ - pixel_y = (dir & 3)? (dir == 1 ? -24 : 24) : INSTANCE_VAR_DEFAULT\ - ),\ - dir_amount = 4\ - ) /datum/wires/airalarm/New(atom/holder) wires = list( WIRE_POWER, WIRE_IDSCAN, WIRE_AI, - WIRE_PANIC, WIRE_ALARM + WIRE_PANIC, WIRE_ALARM, + WIRE_SPEAKER ) add_duds(3) ..() /datum/wires/airalarm/interactable(mob/user) + if(!..()) + return FALSE var/obj/machinery/airalarm/A = holder if(A.panel_open && A.buildstage == 2) return TRUE @@ -37,33 +33,32 @@ if(WIRE_POWER) // Short out for a long time. if(!A.shorted) A.shorted = TRUE - A.update_icon() - addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 1200) + A.update_appearance() + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 2 MINUTES) if(WIRE_IDSCAN) // Toggle lock. A.locked = !A.locked if(WIRE_AI) // Disable AI control for a while. if(!A.aidisabled) A.aidisabled = TRUE - addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 100) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 10 SECONDS) if(WIRE_PANIC) // Toggle panic siphon. if(!A.shorted) - if(A.mode == 1) // AALARM_MODE_SCRUB - A.mode = 3 // AALARM_MODE_PANIC + if(istype(A.selected_mode, /datum/air_alarm_mode/filtering)) + A.select_mode(usr, /datum/air_alarm_mode/panic_siphon) else - A.mode = 1 // AALARM_MODE_SCRUB - A.apply_mode(usr) + A.select_mode(usr, /datum/air_alarm_mode/filtering) if(WIRE_ALARM) // Clear alarms. if(A.alarm_manager.clear_alarm(ALARM_ATMOS)) - A.post_alert(0) - A.update_icon() + A.danger_level = AIR_ALARM_ALERT_NONE + A.update_appearance() -/datum/wires/airalarm/on_cut(wire, mob/user, mend) +/datum/wires/airalarm/on_cut(wire, mend, source) var/obj/machinery/airalarm/A = holder switch(wire) if(WIRE_POWER) // Short out forever. A.shock(usr, 50) A.shorted = !mend - A.update_icon() + A.update_appearance() if(WIRE_IDSCAN) if(!mend) A.locked = TRUE @@ -71,9 +66,10 @@ A.aidisabled = mend // Enable/disable AI control. if(WIRE_PANIC) // Force panic syphon on. if(!mend && !A.shorted) - A.mode = 3 // AALARM_MODE_PANIC - A.apply_mode(usr) + A.select_mode(usr, /datum/air_alarm_mode/panic_siphon) if(WIRE_ALARM) // Post alarm. if(A.alarm_manager.send_alarm(ALARM_ATMOS)) - A.post_alert(2) - A.update_icon() + A.danger_level = AIR_ALARM_ALERT_HAZARD + A.update_appearance() + if(WIRE_SPEAKER) + A.speaker_enabled = mend diff --git a/code/datums/wires/airlock_cycle.dm b/code/datums/wires/airlock_cycle.dm deleted file mode 100644 index bfce4c7d8c71c..0000000000000 --- a/code/datums/wires/airlock_cycle.dm +++ /dev/null @@ -1,52 +0,0 @@ -/datum/wires/advanced_airlock_controller - holder_type = /obj/machinery/advanced_airlock_controller - proper_name = "Air Alarm" - -/datum/wires/advanced_airlock_controller/New(atom/holder) - wires = list( - WIRE_POWER, - WIRE_IDSCAN, WIRE_AI - ) - add_duds(3) - ..() - -/datum/wires/advanced_airlock_controller/interactable(mob/user) - var/obj/machinery/advanced_airlock_controller/A = holder - if(A.panel_open && A.buildstage == 2) - return TRUE - -/datum/wires/advanced_airlock_controller/get_status() - var/obj/machinery/advanced_airlock_controller/A = holder - var/list/status = list() - status += "The interface light is [A.locked ? "red" : "green"]." - status += "The short indicator is [A.shorted ? "lit" : "off"]." - status += "The AI connection light is [!A.aidisabled ? "on" : "off"]." - return status - -/datum/wires/advanced_airlock_controller/on_pulse(wire) - var/obj/machinery/advanced_airlock_controller/A = holder - switch(wire) - if(WIRE_POWER) // Short out for a long time. - if(!A.shorted) - A.shorted = TRUE - A.update_icon() - addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/advanced_airlock_controller, reset), wire), 1200) - if(WIRE_IDSCAN) // Toggle lock. - A.locked = !A.locked - if(WIRE_AI) // Disable AI control for a while. - if(!A.aidisabled) - A.aidisabled = TRUE - addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/advanced_airlock_controller, reset), wire), 100) - -/datum/wires/advanced_airlock_controller/on_cut(wire, mob/user, mend) - var/obj/machinery/advanced_airlock_controller/A = holder - switch(wire) - if(WIRE_POWER) // Short out forever. - A.shock(usr, 50) - A.shorted = !mend - A.update_icon() - if(WIRE_IDSCAN) - if(!mend) - A.locked = TRUE - if(WIRE_AI) - A.aidisabled = mend // Enable/disable AI control. diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 8d7122469004e..c91ef8b2370c3 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -27,12 +27,25 @@ var/list/turf/turfs_to_uncontain = list() ///Do we have an active fire alarm? - var/fire = null - + var/fire = FALSE + ///A var for whether the area allows for detecting fires/etc. Disabled or enabled at a fire alarm, checked by fire locks. + var/fire_detect = TRUE + ///A list of all fire locks in this area. Used by fire alarm panels when resetting fire locks or activating all in an area + var/list/firedoors + ///A list of firelocks currently active. Used by fire alarms when setting their icons. + var/list/active_firelocks + ///A list of all fire alarms in this area. Used by firelocks and burglar alarms to change icon state. + var/list/firealarms = list() ///Alarm type to count of sources. Not usable for ^ because we handle fires differently var/list/active_alarms = list() - ///We use this just for fire alarms, because they're area based right now so one alarm going poof shouldn't prevent you from clearing your alarms listing + ///We use this just for fire alarms, because they're area based right now so one alarm going poof shouldn't prevent you from clearing your alarms listing. Fire alarms and fire locks will set and clear alarms. var/datum/alarm_handler/alarm_manager + /// The current alarm fault status + var/fault_status = AREA_FAULT_NONE + /// The source machinery for the area's fault status + var/fault_location + ///List of all lights in our area + var/list/lights = list() var/lightswitch = TRUE var/vacuum = null @@ -90,13 +103,16 @@ flags_1 = CAN_BE_DIRTY_1 - var/list/firedoors var/list/cameras - var/list/firealarms - var/firedoors_last_closed_on = 0 /// typecache to limit the areas that atoms in this area can smooth with, used for shuttles IIRC var/list/canSmoothWithAreas + /// List of all air vents in the area + var/list/obj/machinery/atmospherics/components/unary/vent_pump/air_vents = list() + + /// List of all air scrubbers in the area + var/list/obj/machinery/atmospherics/components/unary/vent_scrubber/air_scrubbers = list() + var/list/power_usage var/lighting_colour_tube = "#FFF6ED" @@ -342,83 +358,26 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/Destroy() if(GLOB.areas_by_type[type] == src) GLOB.areas_by_type[type] = null - GLOB.sortedAreas -= src - GLOB.areas -= src - if(fire) - STOP_PROCESSING(SSobj, src) + //this is not initialized until get_sorted_areas() is called so we have to do a null check + if(!isnull(GLOB.sortedAreas)) + GLOB.sortedAreas -= src + //just for sanity sake cause why not + if(!isnull(GLOB.areas)) + GLOB.areas -= src + //machinery cleanup + STOP_PROCESSING(SSobj, src) QDEL_NULL(alarm_manager) + firedoors = null + //atmos cleanup + firealarms = null + air_vents = null + air_scrubbers = null + //turf cleanup + contained_turfs = null + turfs_to_uncontain = null + //parent cleanup return ..() -/** - * Try to close all the firedoors in the area - */ -/area/proc/ModifyFiredoors(opening) - if(firedoors) - firedoors_last_closed_on = world.time - for(var/FD in firedoors) - var/obj/machinery/door/firedoor/D = FD - var/cont = !D.welded - if(cont && opening) //don't open if adjacent area is on fire - for(var/I in D.affecting_areas) - var/area/A = I - if(A.fire) - cont = FALSE - break - if(cont && D.is_operational) - if(D.operating) - D.nextstate = opening ? FIREDOOR_OPEN : FIREDOOR_CLOSED - else if(!(D.density ^ opening)) - INVOKE_ASYNC(D, (opening ? TYPE_PROC_REF(/obj/machinery/door/firedoor, open) : TYPE_PROC_REF(/obj/machinery/door/, close))) - -/** - * Generate an firealarm alert for this area - * - * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world - * - * Also starts the area processing on SSobj - */ -/area/proc/firealert(obj/source) - if(always_unpowered == 1) //no fire alarms in space/asteroid - return - - if(!fire) - set_fire_alarm_effect() - ModifyFiredoors(FALSE) - for(var/item in firealarms) - var/obj/machinery/firealarm/F = item - F.update_appearance() - alarm_manager.send_alarm(ALARM_FIRE, source) - START_PROCESSING(SSobj, src) - - - -/** - * Reset the firealarm alert for this area - * - * resets the alert sent to all ai players, alert consoles, drones and alarm monitor programs - * in the world - * - * Also cycles the icons of all firealarms and deregisters the area from processing on SSOBJ - */ -/area/proc/firereset(obj/source) - if(fire) - unset_fire_alarm_effects() - ModifyFiredoors(TRUE) - STOP_PROCESSING(SSobj, src) - for(var/item in firealarms) - var/obj/machinery/firealarm/F = item - F.update_appearance() - alarm_manager.clear_alarm(ALARM_FIRE, source) - STOP_PROCESSING(SSobj, src) - - -/** - * If 100 ticks has elapsed, toggle all the firedoors closed again - */ -/area/process() - if(firedoors_last_closed_on + 100 < world.time) //every 10 seconds - ModifyFiredoors(FALSE) - /** * Close and lock a door passed into this proc * @@ -441,37 +400,25 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(always_unpowered) //no burglar alarms in space/asteroid return //Trigger alarm effect - set_fire_alarm_effect() + set_fire_effect(TRUE) for(var/obj/machinery/door/door in src) close_and_lock_door(door) /** - * Trigger the fire alarm visual affects in an area - * - * Updates the fire light on fire alarms in the area and sets all lights to emergency mode - */ -/area/proc/set_fire_alarm_effect() - fire = TRUE - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - for(var/alarm in firealarms) - var/obj/machinery/firealarm/F = alarm - F.update_fire_light(fire) - for(var/obj/machinery/light/L in src) - L.update(TRUE, TRUE, TRUE) - -/** - * unset the fire alarm visual affects in an area - * - * Updates the fire light on fire alarms in the area and sets all lights to emergency mode - */ -/area/proc/unset_fire_alarm_effects() - fire = FALSE - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - for(var/alarm in firealarms) - var/obj/machinery/firealarm/F = alarm - F.update_fire_light(fire) - for(var/obj/machinery/light/L in src) - L.update(TRUE, TRUE, TRUE) + * Set the fire alarm visual affects in an area + * + * Allows interested parties (lights and fire alarms) to react + */ +/area/proc/set_fire_effect(new_fire, fault_type, fault_source) + if(new_fire == fire) + return + fire = new_fire + fault_status = fault_type + if(fire) + fault_location = fault_source + else + fault_location = null + SEND_SIGNAL(src, COMSIG_AREA_FIRE_CHANGED, fire) /area/proc/set_pressure_alarm_effect() //Just like fire alarm but blue vacuum = TRUE diff --git a/code/game/atom_defense.dm b/code/game/atom_defense.dm index 852eb92ece7a8..3b930cc611b63 100644 --- a/code/game/atom_defense.dm +++ b/code/game/atom_defense.dm @@ -112,7 +112,8 @@ ///what happens when the atom's integrity reaches zero. /atom/proc/atom_destruction(damage_flag) - return + SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_DESTRUCTION, damage_flag) ///changes max_integrity while retaining current health percentage, returns TRUE if the atom got broken. /atom/proc/modify_max_integrity(new_max, can_break = TRUE, damage_type = BRUTE) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b14d82b1bde7b..b50aa592f9eb1 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -119,6 +119,9 @@ ///A string of hex format colors to be used by greyscale sprites, ex: "#0054aa#badcff" var/greyscale_colors + ///Holds merger groups currently active on the atom. Do not access directly, use GetMergeGroup() instead. + var/list/datum/merger/mergers + ///AI controller that controls this atom. type on init, then turned into an instance during runtime var/datum/ai_controller/ai_controller @@ -477,25 +480,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom) /atom/proc/assume_air(datum/gas_mixture/giver) return null -/atom/proc/assume_air_moles(datum/gas_mixture/giver, moles) - return null - -/atom/proc/assume_air_ratio(datum/gas_mixture/giver, ratio) - return null - ///Remove air from this atom /atom/proc/remove_air(amount) return null -/atom/proc/remove_air_ratio(ratio) - return null - -/atom/proc/transfer_air(datum/gas_mixture/taker, amount) - return null - -/atom/proc/transfer_air_ratio(datum/gas_mixture/taker, ratio) - return null - ///Return the current air environment in this atom /atom/proc/return_air() if(loc) @@ -1981,7 +1969,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom) /atom/proc/plasma_ignition(strength, mob/user, reagent_reaction) var/turf/T = get_turf(src) var/datum/gas_mixture/environment = T.return_air() - if(environment.get_moles(GAS_O2) >= PLASMA_MINIMUM_OXYGEN_NEEDED) //Flashpoint ignition can only occur with at least this much oxygen present + if(GET_MOLES(/datum/gas/oxygen, environment) >= PLASMA_MINIMUM_OXYGEN_NEEDED) //Flashpoint ignition can only occur with at least this much oxygen present //no reason to alert admins or create an explosion if there's not enough power to actually make an explosion if(strength > 1) if(user) @@ -2046,3 +2034,14 @@ if (UNLINT(target.base_luminosity != new_value)) {\ /atom/movable/proc/get_orbitable() return src + +/// Gets a merger datum representing the connected blob of objects in the allowed_types argument +/atom/proc/GetMergeGroup(id, list/allowed_types) + RETURN_TYPE(/datum/merger) + var/datum/merger/candidate + if(mergers) + candidate = mergers[id] + if(!candidate) + new /datum/merger(id, allowed_types, src) + candidate = mergers[id] + return candidate diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6cb7b65f6789b..856fb6b6b7d75 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -111,9 +111,9 @@ if(loc) //Restore air flow if we were blocking it (movables with ATMOS_PASS_PROC will need to do this manually if necessary) - if(((CanAtmosPass == ATMOS_PASS_DENSITY && density) || CanAtmosPass == ATMOS_PASS_NO) && isturf(loc)) - CanAtmosPass = ATMOS_PASS_YES - air_update_turf(TRUE) + if(((can_atmos_pass == ATMOS_PASS_DENSITY && density) || can_atmos_pass == ATMOS_PASS_NO) && isturf(loc)) + can_atmos_pass = ATMOS_PASS_YES + air_update_turf(TRUE, FALSE) loc.handle_atom_del(src) if(opacity) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 3217233bbeda9..45d20e0251e24 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -406,12 +406,12 @@ if(QDELETED(temp_vent)) continue if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] + var/datum/pipenet/temp_vent_parent = temp_vent.parents[1] if(!temp_vent_parent) continue // No parent vent // Stops Aliens getting stuck in small networks. // See: Security, Virology - if(length(temp_vent_parent.other_atmosmch) > 20) + if(length(temp_vent_parent.other_atmos_machines) > 20) vents += temp_vent if(!length(vents)) log_game("DYNAMIC: [ruletype] ruleset [name] ready() failed due to no valid spawn locations.") @@ -704,11 +704,11 @@ if(QDELETED(temp_vent)) continue if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] + var/datum/pipenet/temp_vent_parent = temp_vent.parents[1] if(!temp_vent_parent) continue // No parent vent - if(length(temp_vent_parent.other_atmosmch) > 20) - vents += temp_vent // Makes sure the pipeline is large enough + if(length(temp_vent_parent.other_atmos_machines) > 20) + vents += temp_vent // Makes sure the pipenet is large enough if(!length(vents)) log_game("DYNAMIC: [ruletype] ruleset [name] ready() failed due to no valid spawn locations.") return FALSE diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index c1f1242b603c6..200ff74446f94 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -137,14 +137,18 @@ Class Procs: var/tgui_id // ID of TGUI interface var/ui_style // ID of custom TGUI style (optional) - ///Is this machine currently in the atmos machinery queue? - var/atmos_processing = FALSE ///Is this machine currently in the atmos machinery queue, but also interacting with turf air? var/interacts_with_air = FALSE /// Maximum time an EMP will disable this machine for var/emp_disable_time = 2 MINUTES + ///Is this machine currently in the atmos machinery queue? + var/atmos_processing = FALSE + + /// Disables some optimizations + var/always_area_sensitive = FALSE + armor_type = /datum/armor/obj_machinery /datum/armor/obj_machinery @@ -192,7 +196,9 @@ Class Procs: /obj/machinery/LateInitialize() . = ..() power_change() - RegisterSignal(src, COMSIG_MOVABLE_ENTERED_AREA, PROC_REF(power_change)) + if(use_power == NO_POWER_USE) + return + setup_area_power_relationship() /obj/machinery/Destroy() GLOB.machines.Remove(src) @@ -203,6 +209,59 @@ Class Procs: QDEL_NULL(circuit) return ..() +/** + * proc to call when the machine starts to require power after a duration of not requiring power + * sets up power related connections to its area if it exists and becomes area sensitive + * does not affect power usage itself + * + * Returns TRUE if it triggered a full registration, FALSE otherwise + * We do this so machinery that want to sidestep the area sensitiveity optimization can + */ +/obj/machinery/proc/setup_area_power_relationship() + var/area/our_area = get_area(src) + if(our_area) + RegisterSignal(our_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) + + if(HAS_TRAIT_FROM(src, TRAIT_AREA_SENSITIVE, INNATE_TRAIT)) // If we for some reason have not lost our area sensitivity, there's no reason to set it back up + return FALSE + + become_area_sensitive(INNATE_TRAIT) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(on_enter_area)) + RegisterSignal(src, COMSIG_EXIT_AREA, PROC_REF(on_exit_area)) + return TRUE + +/** + * proc to call when the machine stops requiring power after a duration of requiring power + * saves memory by removing the power relationship with its area if it exists and loses area sensitivity + * does not affect power usage itself + */ +/obj/machinery/proc/remove_area_power_relationship() + var/area/our_area = get_area(src) + if(our_area) + UnregisterSignal(our_area, COMSIG_AREA_POWER_CHANGE) + + if(always_area_sensitive) + return + + lose_area_sensitivity(INNATE_TRAIT) + UnregisterSignal(src, COMSIG_ENTER_AREA) + UnregisterSignal(src, COMSIG_EXIT_AREA) + +/obj/machinery/proc/on_enter_area(datum/source, area/area_to_register) + SIGNAL_HANDLER + // If we're always area sensitive, and this is called while we have no power usage, do nothing and return + if(always_area_sensitive && use_power == NO_POWER_USE) + return + power_change() + RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) + +/obj/machinery/proc/on_exit_area(datum/source, area/area_to_unregister) + SIGNAL_HANDLER + // If we're always area sensitive, and this is called while we have no power usage, do nothing and return + if(always_area_sensitive && use_power == NO_POWER_USE) + return + UnregisterSignal(area_to_unregister, COMSIG_AREA_POWER_CHANGE) + /obj/machinery/proc/locate_machinery() return @@ -367,7 +426,6 @@ Class Procs: /obj/machinery/can_interact(mob/user) var/silicon = issilicon(user) var/admin_ghost = IsAdminGhost(user) - var/living = ishuman(user) // /mob/living/carbon/HUMANS, not /mob/living. if((machine_stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE)) // Check if the machine is broken, and if we can still interact with it if so return FALSE @@ -377,10 +435,16 @@ Class Procs: return FALSE if(silicon || admin_ghost) // If we are an AI or adminghsot, make sure the machine allows silicons to interact - if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON)) - return FALSE + if(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) + return TRUE + + var/is_dextrous = FALSE + if(isanimal(user)) + var/mob/living/simple_animal/user_as_animal = user + if (user_as_animal.dextrous) + is_dextrous = TRUE - else if(living) // If we are a living human + if(is_dextrous || user.can_hold_items()) // If we are a living mob with hand slots or a dextrous simple animal. var/mob/living/L = user if(interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SILICON) // First make sure the machine doesn't require silicon interaction @@ -565,7 +629,6 @@ Class Procs: transfer_fingerprints_to(new_frame) /obj/machinery/atom_break(damage_flag) - SHOULD_CALL_PARENT(TRUE) . = ..() if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) set_machine_stat(machine_stat | BROKEN) @@ -616,14 +679,15 @@ Class Procs: /** * * turns: The amount of times to turn -90 degrees. Pointless to set this to anything above 4 */ -/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/I, turns = 1) +/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/wrench, turns = 1) turns *= -90 - if(panel_open && I.tool_behaviour == TOOL_WRENCH) - I.play_tool_sound(src, 50) + if(panel_open && wrench.tool_behaviour == TOOL_WRENCH) + wrench.play_tool_sound(src, 50) setDir(turn(dir,turns)) to_chat(user, span_notice("You rotate [src].")) - return 1 - return 0 + SEND_SIGNAL(src, COMSIG_MACHINERY_DEFAULT_ROTATE_WRENCH, user, wrench) + return TRUE + return FALSE /obj/proc/can_be_unfasten_wrench(mob/user, silent) //if we can unwrench this object; returns SUCCESSFUL_UNFASTEN and FAILED_UNFASTEN, which are both TRUE, or CANT_UNFASTEN, which isn't. if(!(isfloorturf(loc) || istype(loc, /turf/open/indestructible)) && !anchored) diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 76100cebd76c3..c3f8474a7bdbe 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -1,87 +1,25 @@ #define AIRLOCK_CONTROL_RANGE 5 -// This code allows for airlocks to be controlled externally by setting an id_tag and comm frequency (disables ID access) +// This code allows for airlocks to be controlled externally by setting an id_tag (disables ID access) /obj/machinery/door/airlock - var/frequency - var/datum/radio_frequency/radio_connection smoothing_groups = list(SMOOTH_GROUP_AIRLOCK) -/obj/machinery/door/airlock/receive_signal(datum/signal/signal) - if(!signal) - return - - if(id_tag != signal.data["tag"] || !signal.data["command"]) - return - - switch(signal.data["command"]) - if("open") - open(1) - - if("close") - close(1) - - if("unlock") - locked = FALSE - update_icon() - - if("lock") - locked = TRUE - update_icon() - - if("secure_open") - locked = FALSE - update_icon() - - sleep(2) - open(1) - - locked = TRUE - update_icon() - - if("secure_close") - locked = FALSE - close(1) - - locked = TRUE - sleep(2) - update_icon() - - send_status() - - -/obj/machinery/door/airlock/proc/send_status() - if(radio_connection) - var/datum/signal/signal = new(list( - "tag" = id_tag, - "timestamp" = world.time, - "door_status" = density ? "closed" : "open", - "lock_status" = locked ? "locked" : "unlocked" - )) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) - - -/obj/machinery/door/airlock/open(surpress_send) - . = ..() - if(!surpress_send) - send_status() - - -/obj/machinery/door/airlock/close(surpress_send) - . = ..() - if(!surpress_send) - send_status() - - -/obj/machinery/door/airlock/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - if(new_frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) - -/obj/machinery/door/airlock/Destroy() - if(frequency) - SSradio.remove_object(src,frequency) - return ..() +/// Forces the airlock to unbolt and open +/obj/machinery/door/airlock/proc/secure_open() + locked = FALSE + update_icon() + stoplag(0.2 SECONDS) + open(forced = TRUE) + locked = TRUE + update_icon() + +/// Forces the airlock to close and bolt +/obj/machinery/door/airlock/proc/secure_close() + locked = FALSE + close(forced = TRUE) + locked = TRUE + stoplag(0.2 SECONDS) + update_icon() /obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' @@ -92,9 +30,6 @@ power_channel = AREA_USAGE_ENVIRON var/master_tag - var/frequency = FREQ_AIRLOCK_CONTROL - - var/datum/radio_frequency/radio_connection var/on = TRUE // Reviewer: I can't find any way to turn this thing off but it stays var/alert = FALSE @@ -124,12 +59,10 @@ . = ..() if(.) return - var/datum/signal/signal = new(list( - "tag" = master_tag, - "command" = "cycle" - )) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) + var/obj/machinery/airlock_controller/airlock_controller = GLOB.objects_by_id_tag[master_tag] + airlock_controller?.cycle() + flick("airlock_sensor_cycle", src) /obj/machinery/airlock_sensor/process() @@ -140,25 +73,4 @@ alert = !alert update_icon() - var/datum/signal/signal = new(list( - "tag" = id_tag, - "timestamp" = world.time, - "pressure" = num2text(pressure) - )) - - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) - -/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) - -/obj/machinery/airlock_sensor/Initialize(mapload) - . = ..() - set_frequency(frequency) - -/obj/machinery/airlock_sensor/Destroy() - SSradio.remove_object(src,frequency) - return ..() - #undef AIRLOCK_CONTROL_RANGE diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm deleted file mode 100644 index 0b951c1d04b12..0000000000000 --- a/code/game/machinery/airlock_cycle_control.dm +++ /dev/null @@ -1,878 +0,0 @@ -// Embedded controller is great and all, but it is really unwieldy to map with. In addition, you can't build it in-game. -// This serves to make it really easy to make it really easy to make cycling airlocks both in-game and in the map editor. -// Instead of editing vars, this involves placing a couple of mapping helpers. - -// also can I say how much I hate the whole radio control thing in this game. It's not even exposed to the player at all. -// All it does is making coding a massive pain in the rear end. - -// Anyways for a functioning airlock, you need an interior and an exterior door. Vents are optional. -// If setup right, you can even make an airlock that cycles between two rooms of different atmospheres! -// Perfect for the plasmaman atmos tech. - -// NOTE FOR MAPPERS: -// PLEASE DON'T PUT THIS ON THE SAME TILE AS A VENT IF THE AIRLOCK IS BIGGER THAN 1X1. -// (If this is a 1x2 airlock and there is a pressurizing and a depressurizing vent -// then put the depressurizing vent under the controller) - -#define AIRLOCK_CYCLESTATE_INOPEN 0 -#define AIRLOCK_CYCLESTATE_INOPENING 1 -#define AIRLOCK_CYCLESTATE_INCLOSING 2 -#define AIRLOCK_CYCLESTATE_CLOSED 3 -#define AIRLOCK_CYCLESTATE_OUTCLOSING 4 -#define AIRLOCK_CYCLESTATE_OUTOPENING 5 -#define AIRLOCK_CYCLESTATE_OUTOPEN 6 -#define AIRLOCK_CYCLESTATE_DOCKED -1 -#define AIRLOCK_CYCLESTATE_ERROR -2 - -#define AIRLOCK_CYCLEROLE_INT_PRESSURIZE 1 -#define AIRLOCK_CYCLEROLE_INT_DEPRESSURIZE 2 -#define AIRLOCK_CYCLEROLE_EXT_PRESSURIZE 4 -#define AIRLOCK_CYCLEROLE_EXT_DEPRESSURIZE 8 - -/obj/item/electronics/advanced_airlock_controller - name = "airlock controller electronics" - custom_price = 5 - icon_state = "airalarm_electronics" - -/obj/item/wallframe/advanced_airlock_controller - name = "airlock controller frame" - desc = "Used for building advanced airlock controllers." - icon = 'icons/obj/monitors.dmi' - icon_state = "aac_bitem" - result_path = /obj/machinery/advanced_airlock_controller - -/obj/machinery/advanced_airlock_controller - name = "advanced airlock controller" - desc = "A machine designed to control the operation of cycling airlocks" - icon = 'icons/obj/monitors.dmi' - icon_state = "aac" - use_power = IDLE_POWER_USE - idle_power_usage = 4 - active_power_usage = 8 - power_channel = AREA_USAGE_ENVIRON - req_access = list(ACCESS_ATMOSPHERICS) - max_integrity = 250 - integrity_failure = 0.2 - armor_type = /datum/armor/machinery_advanced_airlock_controller - resistance_flags = FIRE_PROOF - layer = ABOVE_WINDOW_LAYER - - var/cyclestate = AIRLOCK_CYCLESTATE_INOPEN - var/interior_pressure = ONE_ATMOSPHERE - var/exterior_pressure = 0 - - var/locked = TRUE - var/aidisabled = 0 - var/shorted = 0 - var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone - var/config_error_str = "Needs Scan" - var/scan_on_late_init = FALSE - var/depressurization_margin = 10 // use a lower value to reduce cross-contamination - var/overlays_hash = null - var/skip_delay = 150 - var/skip_timer = 0 - var/is_skipping = FALSE - - var/list/airlocks = list() - var/list/vents = list() - var/obj/vis_target = null - - -/datum/armor/machinery_advanced_airlock_controller - energy = 100 - bio = 100 - rad = 100 - fire = 90 - acid = 30 - -/obj/machinery/advanced_airlock_controller/lavaland - exterior_pressure = WARNING_LOW_PRESSURE + 10 - depressurization_margin = ONE_ATMOSPHERE - skip_delay = 30 - -/obj/machinery/advanced_airlock_controller/mix_chamber - depressurization_margin = 0.15 // The minimum - We really don't want contamination. - -/obj/machinery/advanced_airlock_controller/directional //NSV13 makes directinal versions of advanced airlock controllers mapping QOL - -/obj/machinery/advanced_airlock_controller/directional/north - pixel_y = 24 - -/obj/machinery/advanced_airlock_controller/directional/south - pixel_y = -24 - -/obj/machinery/advanced_airlock_controller/directional/east - pixel_x = 24 - -/obj/machinery/advanced_airlock_controller/directional/west - pixel_x = -24 - -/obj/machinery/advanced_airlock_controller/New(loc, ndir, nbuild) - ..() - wires = new /datum/wires/advanced_airlock_controller(src) - if(ndir) - setDir(ndir) - - if(nbuild) - buildstage = 0 - panel_open = TRUE - pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) - pixel_y = (dir & 3)? (dir == 1 ? -24 : 24) : 0 - - update_icon() - -/obj/machinery/advanced_airlock_controller/Destroy() - qdel(wires) - wires = null - cut_links() - SSair.start_processing_machine(src) - return ..() - -/obj/machinery/advanced_airlock_controller/Initialize(mapload) - . = ..() - SSair.stop_processing_machine(src) - scan_on_late_init = mapload - if(mapload && (. != INITIALIZE_HINT_QDEL)) - return INITIALIZE_HINT_LATELOAD - -/obj/machinery/advanced_airlock_controller/LateInitialize(mapload) - . = ..() - if(scan_on_late_init) - scan(TRUE) - update_error_status() - update_docked_status(FALSE) - for(var/A in airlocks) - var/obj/machinery/door/airlock/airlock = A - if(airlock.density && (cyclestate == AIRLOCK_CYCLESTATE_CLOSED || (airlocks[A] && cyclestate == AIRLOCK_CYCLESTATE_INOPEN) || (!airlocks[A] && cyclestate == AIRLOCK_CYCLESTATE_OUTOPEN))) - airlock.bolt() - -/obj/machinery/advanced_airlock_controller/update_icon(use_hash = FALSE) - var/turf/location = get_turf(src) - if(!location) - return - var/pressure = 0 - if(location) - var/datum/gas_mixture/environment = location.return_air() - if(environment) - pressure = environment.return_pressure() - var/maxpressure = (exterior_pressure && (cyclestate == AIRLOCK_CYCLESTATE_OUTCLOSING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPENING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPEN)) ? exterior_pressure : interior_pressure - var/pressure_bars - if(maxpressure == 0) - //1 is the lowest value found in monitors.dmi - pressure_bars = 1 - else - pressure_bars = round(pressure / maxpressure * 5 + 0.01) - - var/new_overlays_hash = "[pressure_bars]-[cyclestate]-[buildstage]-[panel_open]-[machine_stat]-[shorted]-[locked]-[vis_target]" - if(use_hash && new_overlays_hash == overlays_hash) - return - overlays_hash = new_overlays_hash - - cut_overlays() - if(panel_open) - switch(buildstage) - if(2) - icon_state = "aac_b3" - if(1) - icon_state = "aac_b2" - if(0) - icon_state = "aac_b1" - return - - icon_state = "aac" - - if((machine_stat & (NOPOWER|BROKEN)) || shorted) - return - - var/is_exterior_pressure = (cyclestate == AIRLOCK_CYCLESTATE_OUTCLOSING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPENING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPEN) - add_overlay("aac_[is_exterior_pressure ? "ext" : "int"]p_[pressure_bars]") - add_overlay("aac_cyclestate_[cyclestate]") - if(obj_flags & EMAGGED) - add_overlay("aac_emagged") - else if(!locked) - add_overlay("aac_unlocked") - - if(vis_target) - var/f_dx = ((vis_target.pixel_x - pixel_x) / world.icon_size) + (vis_target.x - x) - var/f_dy = ((vis_target.pixel_y - pixel_y) / world.icon_size) + (vis_target.y - y) - var/dist = sqrt(f_dx*f_dx+f_dy*f_dy) - var/s_dx = f_dy/dist - var/s_dy = -f_dx/dist - var/matrix/TR = new - TR.Translate(0, 16) - TR.Multiply(new /matrix(s_dx, f_dx, 0, s_dy, f_dy, 0)) - var/mutable_appearance/M = mutable_appearance(icon, "hologram-line", FLOAT_LAYER, ABOVE_LIGHTING_PLANE) - M.transform = TR - add_overlay(M) - -/obj/machinery/advanced_airlock_controller/proc/reset(wire) - switch(wire) - if(WIRE_POWER) - if(!wires.is_cut(WIRE_POWER)) - shorted = FALSE - update_icon() - if(WIRE_AI) - if(!wires.is_cut(WIRE_AI)) - aidisabled = FALSE - -/obj/machinery/advanced_airlock_controller/proc/shock(mob/user, prb) - if((machine_stat & (NOPOWER))) // unpowered, no shock - return 0 - if(!prob(prb)) - return 0 //you lucked out, no shock for you - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, src) - s.start() //sparks always. - if (electrocute_mob(user, get_area(src), src, 1, TRUE)) - return 1 - else - return 0 - -/obj/machinery/advanced_airlock_controller/proc/update_docked_status(process_on_changed = FALSE) - if(cyclestate == AIRLOCK_CYCLESTATE_ERROR) - return - var/is_docked = FALSE - for(var/A in airlocks) - var/obj/machinery/door/airlock/airlock = A - if(!airlocks[A]) // only exterior airlocks are checked for docks - continue - var/turf/T = get_turf(airlock) - if(!T) - continue - for(var/cdir in GLOB.cardinals) - var/turf/T2 = get_step(T, cdir) - if(!T2) - continue - if(T2.loc != T.loc && (locate(/obj/machinery/door/airlock) in T2)) - is_docked = TRUE - break - if(is_docked) - break - if(is_docked && cyclestate != AIRLOCK_CYCLESTATE_DOCKED) - cyclestate = AIRLOCK_CYCLESTATE_DOCKED - if(process_on_changed) - process_atmos() - if(!is_docked && cyclestate == AIRLOCK_CYCLESTATE_DOCKED) - cyclestate = AIRLOCK_CYCLESTATE_INOPENING - reset_skip() - for(var/airlock in airlocks) - coerce_door(airlock, TRUE) - if(process_on_changed) - process_atmos() - -/obj/machinery/advanced_airlock_controller/proc/update_error_status() - if(!airlocks.len) - cyclestate = AIRLOCK_CYCLESTATE_ERROR - return - var/has_interior = FALSE - var/has_exterior = FALSE - for(var/A in airlocks) - if(airlocks[A] == 1) - has_exterior = TRUE - if(airlocks[A] == 0) - has_interior = TRUE - if(!has_interior || !has_exterior) - if(!has_interior) - config_error_str = "No interior door" - else if(!has_exterior) - config_error_str = "No exterior door" - cyclestate = AIRLOCK_CYCLESTATE_ERROR - return - if(cyclestate == AIRLOCK_CYCLESTATE_ERROR) - cyclestate = AIRLOCK_CYCLESTATE_CLOSED - update_docked_status() - -/obj/machinery/advanced_airlock_controller/proc/coerce_door(obj/machinery/door/airlock/door, target_density = 0) - if(door.density == target_density && !door.operating) - door.bolt() - return TRUE - if(door.operating || door.welded || !door.hasPower() || door.wires.is_cut(WIRE_BOLTS)) - return FALSE - door.unbolt() - if(door.density != target_density) - if(target_density) - spawn(0) - door.close() - door.bolt() - else - spawn(0) - door.open() - door.bolt() - return FALSE - -/obj/machinery/advanced_airlock_controller/proc/unbolt_door(obj/machinery/door/airlock/door) - if(!door.wires.is_cut(WIRE_BOLTS)) - door.unbolt() - -/obj/machinery/advanced_airlock_controller/process() - process_atmos() - -/obj/machinery/advanced_airlock_controller/process_atmos() - if((machine_stat & (NOPOWER|BROKEN)) || shorted) - update_icon(TRUE) - return - - var/turf/location = get_turf(src) - if(!location) - update_icon(TRUE) - return - var/pressure = 0 - if(location) - var/datum/gas_mixture/environment = location.return_air() - if(environment) - pressure = environment.return_pressure() - - update_error_status() - var/doors_valid = TRUE - var/vents_valid = TRUE - switch(cyclestate) - if(AIRLOCK_CYCLESTATE_ERROR) - return - if(AIRLOCK_CYCLESTATE_CLOSED) - return - if(AIRLOCK_CYCLESTATE_DOCKED) - for(var/airlock in airlocks) - unbolt_door(airlock) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - if(vents[vent] & AIRLOCK_CYCLEROLE_INT_PRESSURIZE) - vent.pump_direction = 1 - vent.pressure_checks = 1 - vent.external_pressure_bound = interior_pressure - vent.on = TRUE - vent.update_icon() - else - vent.on = FALSE - vent.update_icon() - return - if(AIRLOCK_CYCLESTATE_INCLOSING) - for(var/airlock in airlocks) - doors_valid = doors_valid && coerce_door(airlock, TRUE) - if(doors_valid || is_skipping) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - if(vents[vent] & AIRLOCK_CYCLEROLE_INT_DEPRESSURIZE) - vent.pump_direction = 0 - vent.pressure_checks = 1 - vent.external_pressure_bound = 0 - vents_valid = FALSE - vent.on = TRUE - vent.update_icon() - else - vent.on = FALSE - vent.update_icon() - if(pressure < depressurization_margin) - vents_valid = TRUE - if((doors_valid && vents_valid) || is_skipping) - cyclestate = AIRLOCK_CYCLESTATE_OUTOPENING - reset_skip() - if(AIRLOCK_CYCLESTATE_OUTCLOSING) - for(var/airlock in airlocks) - doors_valid = doors_valid && coerce_door(airlock, TRUE) - if(doors_valid || is_skipping) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - if(vents[vent] & AIRLOCK_CYCLEROLE_EXT_DEPRESSURIZE) - vent.pump_direction = 0 - vent.pressure_checks = 1 - vent.external_pressure_bound = 0 - vents_valid = FALSE - vent.on = TRUE - vent.update_icon() - else - vent.on = FALSE - vent.update_icon() - if(pressure < depressurization_margin) - vents_valid = TRUE - if(vents_valid || is_skipping) - cyclestate = AIRLOCK_CYCLESTATE_INOPENING - reset_skip() - if(AIRLOCK_CYCLESTATE_INOPENING) - for(var/airlock in airlocks) - if(airlocks[airlock]) - doors_valid = doors_valid && coerce_door(airlock, 1) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - if(vents[vent] & AIRLOCK_CYCLEROLE_INT_PRESSURIZE) - vent.pump_direction = 1 - vent.pressure_checks = 1 - vent.external_pressure_bound = interior_pressure - vents_valid = FALSE - vent.on = TRUE - vent.update_icon() - else - vent.on = FALSE - vent.update_icon() - if(pressure > interior_pressure - 0.5) - vents_valid = TRUE - if(vents_valid || is_skipping) - for(var/airlock in airlocks) - if(!airlocks[airlock]) - doors_valid = doors_valid && coerce_door(airlock, 0) - if(doors_valid || is_skipping) - cyclestate = AIRLOCK_CYCLESTATE_INOPEN - reset_skip() - if(AIRLOCK_CYCLESTATE_OUTOPENING) - for(var/airlock in airlocks) - if(!airlocks[airlock]) - doors_valid = doors_valid && coerce_door(airlock, 1) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - if(vents[vent] & AIRLOCK_CYCLEROLE_EXT_PRESSURIZE) - vent.pump_direction = 1 - vent.pressure_checks = 1 - vent.external_pressure_bound = exterior_pressure - vents_valid = FALSE - vent.on = TRUE - vent.update_icon() - else - vent.on = FALSE - vent.update_icon() - if(pressure > exterior_pressure - 0.5) - vents_valid = TRUE - if(vents_valid || is_skipping) - for(var/airlock in airlocks) - if(airlocks[airlock]) - doors_valid = doors_valid && coerce_door(airlock, 0) - if(doors_valid || is_skipping) - cyclestate = AIRLOCK_CYCLESTATE_OUTOPEN - reset_skip() - if(AIRLOCK_CYCLESTATE_INOPEN) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - vent.on = FALSE - vent.update_icon() - if(AIRLOCK_CYCLESTATE_OUTOPEN) - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - vent.on = FALSE - vent.update_icon() - update_icon(TRUE) - -/obj/machinery/advanced_airlock_controller/attackby(obj/item/W, mob/user, params) - switch(buildstage) - if(2) - if(W.tool_behaviour == TOOL_WIRECUTTER && panel_open && wires.is_all_cut()) - W.play_tool_sound(src) - to_chat(user, span_notice("You cut the final wires.")) - new /obj/item/stack/cable_coil(loc, 5) - buildstage = 1 - update_icon() - return - else if(W.tool_behaviour == TOOL_SCREWDRIVER) // Opening that up. - W.play_tool_sound(src) - panel_open = !panel_open - to_chat(user, span_notice("The wires have been [panel_open ? "exposed" : "unexposed"].")) - update_icon() - return - else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/modular_computer/tablet/pda))// trying to unlock the interface with an ID card - togglelock(user) - return - else if(panel_open && is_wire_tool(W)) - wires.interact(user) - return - if(1) - if(W.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user.name] removes the electronics from [src.name].",\ - span_notice("You start prying out the circuit...")) - W.play_tool_sound(src) - if (W.use_tool(src, user, 20)) - if (buildstage == 1) - to_chat(user, span_notice("You remove the airlock controller electronics.")) - new /obj/item/electronics/advanced_airlock_controller( src.loc ) - playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) - buildstage = 0 - update_icon() - return - - if(istype(W, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/cable = W - if(cable.get_amount() < 5) - to_chat(user, span_warning("You need five lengths of cable to wire the airlock controller!")) - return - user.visible_message("[user.name] wires the airlock controller.", \ - span_notice("You start wiring the airlock controller...")) - if (do_after(user, 20, target = src)) - if (cable.get_amount() >= 5 && buildstage == 1) - cable.use(5) - to_chat(user, span_notice("You wire the airlock controller.")) - wires.repair() - aidisabled = 0 - locked = FALSE - cyclestate = AIRLOCK_CYCLESTATE_ERROR - cut_links() - shorted = 0 - buildstage = 2 - update_icon() - return - if(0) - if(istype(W, /obj/item/electronics/advanced_airlock_controller)) - if(user.temporarilyRemoveItemFromInventory(W)) - to_chat(user, span_notice("You insert the circuit.")) - buildstage = 1 - update_icon() - qdel(W) - return - - if(istype(W, /obj/item/electroadaptive_pseudocircuit)) - var/obj/item/electroadaptive_pseudocircuit/P = W - if(!P.adapt_circuit(user, 25)) - return - user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ - span_notice("You adapt an airlock controller circuit and slot it into the assembly.")) - buildstage = 1 - update_icon() - return - - if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, span_notice("You detach \the [src] from the wall.")) - W.play_tool_sound(src) - new /obj/item/wallframe/advanced_airlock_controller( user.loc ) - qdel(src) - return - - return ..() - -/obj/machinery/advanced_airlock_controller/proc/cut_links() - for(var/obj/machinery/door/airlock/A in airlocks) - if(A.aac == src) - A.aac = null - for(var/V in vents) - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - if(vent.aac == src) - vent.aac = null - airlocks.Cut() - vents.Cut() - -/obj/machinery/advanced_airlock_controller/proc/scan(assume_roles = FALSE) - cut_links() - config_error_str = "Unknown error (bug coders)" - - var/turf/open/initial_turf = get_turf(src) - if(!istype(initial_turf)) - config_error_str = "Scan blocked by wall" - return - var/list/turfs = list() - turfs[initial_turf] = 1 - for(var/I = 1; I <= turfs.len; I++) - var/turf/open/T = turfs[I] - if(assume_roles) - T.ImmediateCalculateAdjacentTurfs() - for(var/turf/open/T2 in T.atmos_adjacent_turfs) - if(get_dist(initial_turf, T2) > 5) - config_error_str = "Airlock too big" - return - if(locate(/obj/machinery/door/airlock) in T2) - continue - turfs[T2] = 1 - if(turfs.len > 16) // I will allow a 4x4 airlock for a shitty poor-man's spacepod bay. - config_error_str = "Airlock too big" - for(var/cdir in GLOB.cardinals) - var/turf/T2 = get_step(T, cdir) - for(var/obj/machinery/door/airlock/A in T2) - if(!A.aac || A.aac == src) - A.aac = src - airlocks[A] = 0 - if(assume_roles) - for(var/adir in GLOB.cardinals) - var/turf/check_turf = get_step(T2, adir) - if(check_turf.loc != T2.loc) - airlocks[A] = 1 - break - for(var/obj/machinery/atmospherics/components/unary/vent_pump/vent in T) - if(!vent.aac || vent.aac == src) - vent.aac = src - vents[vent] = 0 - if(assume_roles) - if(istype(vent, /obj/machinery/atmospherics/components/unary/vent_pump/siphon)) - vents[vent] = AIRLOCK_CYCLEROLE_INT_DEPRESSURIZE | AIRLOCK_CYCLEROLE_EXT_DEPRESSURIZE - else - vents[vent] = AIRLOCK_CYCLEROLE_INT_PRESSURIZE - for(var/obj/machinery/atmospherics/components/binary/dp_vent_pump/vent in T) - if(!vent.aac || vent.aac == src) - vent.aac = src - vents[vent] = 0 - if(assume_roles) - vents[vent] = AIRLOCK_CYCLEROLE_INT_DEPRESSURIZE | AIRLOCK_CYCLEROLE_EXT_DEPRESSURIZE | AIRLOCK_CYCLEROLE_INT_PRESSURIZE - if(!airlocks.len) - config_error_str = "No airlocks" - return - config_error_str = null - -/obj/machinery/advanced_airlock_controller/ui_status(mob/user) - if(user.has_unlimited_silicon_privilege && aidisabled) - to_chat(user, "AI control has been disabled.") - else if(!shorted) - return ..() - return UI_CLOSE - - -/obj/machinery/advanced_airlock_controller/ui_state(mob/user) - return GLOB.default_state - -/obj/machinery/advanced_airlock_controller/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "AdvancedAirlockController") - ui.set_autoupdate(TRUE) // Pressure display, mode changes as part of the cycle process - ui.open() - -/obj/machinery/advanced_airlock_controller/ui_data(mob/user) - var/turf/T = get_turf(src) - var/pressure = 0 - if(T) - var/datum/gas_mixture/environment = T.return_air() - if(environment) - pressure = environment.return_pressure() - - var/data = list( - "locked" = locked, - "siliconUser" = user.has_unlimited_silicon_privilege, - "emagged" = (obj_flags & EMAGGED ? 1 : 0), - "cyclestate" = cyclestate, - "pressure" = pressure, - "maxpressure" = (exterior_pressure && (cyclestate == AIRLOCK_CYCLESTATE_OUTCLOSING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPENING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPEN)) ? exterior_pressure : interior_pressure, - "vents" = list(), - "airlocks" = list(), - "skip_timer" = (world.time - skip_timer), - "skip_delay" = skip_delay, - "vis_target" = "\ref[vis_target]" - ) - - if((locked && !user.has_unlimited_silicon_privilege) || (user.has_unlimited_silicon_privilege && aidisabled)) - return data - - data["config_error_str"] = config_error_str - data["interior_pressure"] = interior_pressure - data["exterior_pressure"] = exterior_pressure - data["depressurization_margin"] = depressurization_margin - - for(var/V in vents) - // it could also be a dpvent. - var/obj/machinery/atmospherics/components/unary/vent_pump/vent = V - data["vents"] += list(list( - "role" = vents[vent], - "vent_id" = "\ref[vent]", - "name" = vent.name - )) - for(var/A in airlocks) - var/obj/machinery/door/airlock/airlock = A - var/access_str = "None" - airlock.gen_access() - if(islist(airlock.req_access) && airlock.req_access.len) - access_str = airlock.req_access.len > 1 ? "All of " : "" - for(var/I in 1 to airlock.req_access.len) - if(I != 1) - access_str += ", " - access_str += get_access_desc(airlock.req_access[I]) - if(islist(airlock.req_one_access) && airlock.req_one_access.len) - access_str = airlock.req_one_access.len > 1 ? "One of " : "" - for(var/I in 1 to airlock.req_one_access.len) - if(I != 1) - access_str += ", " - access_str += get_access_desc(airlock.req_one_access[I]) - - data["airlocks"] += list(list( - "role" = airlocks[airlock], - "airlock_id" = "\ref[airlock]", - "name" = airlock.name, - "access" = access_str - )) - return data - -/obj/machinery/advanced_airlock_controller/ui_close() - . = ..() - vis_target = null - -/obj/machinery/advanced_airlock_controller/ui_act(action, params) - if(..() || buildstage != 2) - return - // these actions can be done by anyone - switch(action) - if("cycle") - var/is_allowed = TRUE - for(var/obj/machinery/door/airlock/A in airlocks) - if(!A.allowed(usr)) - if(is_allowed) - is_allowed = FALSE - to_chat(usr, span_danger("Access denied.")) - if(A.density) - spawn() - A.do_animate("deny") - if(is_allowed) - cycle_to(text2num(params["exterior"])) - . = TRUE - if("skip") - if((world.time - skip_timer) >= skip_delay && (cyclestate == AIRLOCK_CYCLESTATE_OUTCLOSING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPENING || cyclestate == AIRLOCK_CYCLESTATE_INOPENING || cyclestate == AIRLOCK_CYCLESTATE_INCLOSING)) - is_skipping = TRUE - . = TRUE - if(!. && ((locked && !usr.has_unlimited_silicon_privilege) || (usr.has_unlimited_silicon_privilege && aidisabled))) - return - switch(action) - if("lock") - if(usr.has_unlimited_silicon_privilege && !wires.is_cut(WIRE_IDSCAN)) - locked = !locked - . = TRUE - vis_target = null - if("toggle_role") - var/vent = locate(params["vent_id"]) - if(vent == null || vents[vent] == null) - return - var/curr_role = vents[vent] - var/role_to_toggle = text2num(params["val"]) & 15 - if(curr_role & role_to_toggle) - vents[vent] = curr_role & ~(role_to_toggle) - else - vents[vent] = curr_role | role_to_toggle - . = TRUE - if("set_airlock_role") - var/airlock = locate(params["airlock_id"]) - if(airlock == null || airlocks[airlock] == null) - return - airlocks[airlock] = !!text2num(params["val"]) - . = TRUE - if("clear_vis") - vis_target = null - . = TRUE - if("set_vis_vent") - var/vent = locate(params["vent_id"]) - if(vent == null || vents[vent] == null) - return - vis_target = vent - . = TRUE - if("set_vis_airlock") - var/airlock = locate(params["airlock_id"]) - if(airlock == null || airlocks[airlock] == null) - return - vis_target = airlock - . = TRUE - if("scan") - scan() - . = TRUE - if("interior_pressure") - interior_pressure = clamp(text2num(params["pressure"]), 0, ONE_ATMOSPHERE) - . = TRUE - if("exterior_pressure") - exterior_pressure = clamp(text2num(params["pressure"]), 0, ONE_ATMOSPHERE) - . = TRUE - if("depressurization_margin") - depressurization_margin = clamp(text2num(params["pressure"]), 0.15, 40) - . = TRUE - if("skip_delay") - skip_delay = clamp(text2num(params["skip_delay"]), 0, 1200) - . = TRUE - - if(.) - update_icon(TRUE) - -/obj/machinery/advanced_airlock_controller/proc/request_from_door(airlock) - var/role = airlocks[airlock] - if(role == null) - return - cycle_to(role) - -/obj/machinery/advanced_airlock_controller/proc/cycle_to(exterior) - if(!exterior) - if(cyclestate == AIRLOCK_CYCLESTATE_OUTOPEN || cyclestate == AIRLOCK_CYCLESTATE_CLOSED || cyclestate == AIRLOCK_CYCLESTATE_OUTOPENING) - cyclestate = AIRLOCK_CYCLESTATE_OUTCLOSING - reset_skip() - process_atmos() - else if(cyclestate == AIRLOCK_CYCLESTATE_INCLOSING) - cyclestate = AIRLOCK_CYCLESTATE_INOPENING - reset_skip() - process_atmos() - else - if(cyclestate == AIRLOCK_CYCLESTATE_INOPEN || cyclestate == AIRLOCK_CYCLESTATE_CLOSED || cyclestate == AIRLOCK_CYCLESTATE_INOPENING) - cyclestate = AIRLOCK_CYCLESTATE_INCLOSING - reset_skip() - else if(cyclestate == AIRLOCK_CYCLESTATE_OUTCLOSING) - cyclestate = AIRLOCK_CYCLESTATE_OUTOPENING - reset_skip() - -/obj/machinery/advanced_airlock_controller/proc/reset_skip() - is_skipping = FALSE - skip_timer = world.time - -/obj/machinery/advanced_airlock_controller/AltClick(mob/user) - if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc)) - return - else - togglelock(user) - -/obj/machinery/advanced_airlock_controller/proc/togglelock(mob/living/user) - if(machine_stat & (NOPOWER|BROKEN)) - to_chat(user, span_warning("It does nothing!")) - else - if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) - locked = !locked - update_icon() - to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the airlock controller interface.")) - else - to_chat(user, span_danger("Access denied.")) - return - -/obj/machinery/advanced_airlock_controller/power_change() - ..() - update_icon() - -/obj/machinery/advanced_airlock_controller/on_emag(mob/user) - ..() - visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You emag [src], disabling its safeties.")) - playsound(src, "sparks", 50, 1) - -/obj/machinery/advanced_airlock_controller/atom_break(damage_flag) - ..() - update_icon() - -/obj/machinery/advanced_airlock_controller/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/iron(loc, 2) - var/obj/item/I = new /obj/item/electronics/advanced_airlock_controller(loc) - if(!disassembled) - I.take_damage(I.max_integrity * 0.5, sound_effect = FALSE) - new /obj/item/stack/cable_coil(loc, 3) - qdel(src) - -/obj/machinery/door/airlock - var/obj/machinery/advanced_airlock_controller/aac - -/obj/machinery/door/airlock/Initialize(mapload) - . = ..() - update_aac_docked() -/obj/machinery/door/airlock/Destroy() - var/turf/T = get_turf(src) - . = ..() - if(aac) - aac.airlocks -= src - aac = null - if(T) - update_aac_docked(T) - -/obj/machinery/door/airlock/proc/update_aac_docked(atom/point = src) - if(aac) - aac.update_docked_status(TRUE) - var/turf/our_turf = get_turf(point) - if(!our_turf) - return - for(var/cdir in GLOB.cardinals) - var/turf/T = get_step(point, cdir) - if(!T || (T.loc == our_turf.loc)) - continue - for(var/obj/machinery/door/airlock/A in T) - if(A.aac) - A.aac.update_docked_status(TRUE) - -#undef AIRLOCK_CYCLESTATE_INOPEN -#undef AIRLOCK_CYCLESTATE_INOPENING -#undef AIRLOCK_CYCLESTATE_INCLOSING -#undef AIRLOCK_CYCLESTATE_CLOSED -#undef AIRLOCK_CYCLESTATE_OUTCLOSING -#undef AIRLOCK_CYCLESTATE_OUTOPENING -#undef AIRLOCK_CYCLESTATE_OUTOPEN -#undef AIRLOCK_CYCLESTATE_DOCKED -#undef AIRLOCK_CYCLESTATE_ERROR - -#undef AIRLOCK_CYCLEROLE_INT_PRESSURIZE -#undef AIRLOCK_CYCLEROLE_INT_DEPRESSURIZE -#undef AIRLOCK_CYCLEROLE_EXT_PRESSURIZE -#undef AIRLOCK_CYCLEROLE_EXT_DEPRESSURIZE diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 566f59ef6acba..8ca3d0cd44df1 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -168,7 +168,7 @@ // We want to simulate the clone not being in contact with // the atmosphere, so we'll put them in a constant pressure // nitrogen. They don't need to breathe while cloning anyway. - var/static/datum/gas_mixture/immutable/cloner/GM //global so that there's only one instance made for all cloning pods + var/static/datum/gas_mixture/immutable/planetary/cloner/GM //global so that there's only one instance made for all cloning pods if(!GM) GM = new return GM diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fbd07e46a765a..8faad134e1e8e 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -167,6 +167,8 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( var/gameover = FALSE var/blocked = FALSE //Player cannot attack/heal while set var/turtle = 0 + ///unique to the emag mode, acts as a time limit where the player dies when it reaches 0. + var/bomb_cooldown = 19 /obj/machinery/computer/arcade/battle/Reset() var/name_action @@ -277,7 +279,8 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) if(obj_flags & EMAGGED) - new /obj/effect/spawner/newbomb/timer(loc) + bomb_cooldown = initial(bomb_cooldown) + new /obj/effect/spawner/newbomb/plasma(loc, /obj/item/assembly/timer) new /obj/item/clothing/head/collectable/petehat(loc) message_admins("[ADMIN_LOOKUPFLW(usr)] has outbombed Cuban Pete and been awarded a bomb.") log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.") diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index be69e0a206fab..182f4545aca89 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -4,21 +4,10 @@ circuit = /obj/item/circuitboard/computer/atmos_alert icon_screen = "alert:0" icon_keyboard = "atmos_key" - var/list/priority_alarms = list() - var/list/minor_alarms = list() - var/receive_frequency = FREQ_ATMOS_ALARMS - var/datum/radio_frequency/radio_connection - light_color = LIGHT_COLOR_CYAN -/obj/machinery/computer/atmos_alert/Initialize(mapload) - . = ..() - set_frequency(receive_frequency) - -/obj/machinery/computer/atmos_alert/Destroy() - SSradio.remove_object(src, receive_frequency) - return ..() - + var/list/priority_alarms = list() + var/list/minor_alarms = list() /obj/machinery/computer/atmos_alert/ui_state(mob/user) return GLOB.default_state @@ -27,6 +16,7 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "AtmosAlertConsole") + ui.set_autoupdate(TRUE) ui.open() /obj/machinery/computer/atmos_alert/ui_data(mob/user) @@ -58,30 +48,29 @@ if(.) update_icon() -/obj/machinery/computer/atmos_alert/proc/set_frequency(new_frequency) - SSradio.remove_object(src, receive_frequency) - receive_frequency = new_frequency - radio_connection = SSradio.add_object(src, receive_frequency, RADIO_ATMOSIA) - -/obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) - if(!signal) - return - - var/zone = signal.data["zone"] - var/severity = signal.data["alert"] - - if(!zone || !severity) - return +/obj/machinery/computer/atmos_alert/process() + . = ..() + if (!.) + return FALSE + var/alarm_count = priority_alarms.len + minor_alarms.len + priority_alarms.Cut() + minor_alarms.Cut() + for (var/obj/machinery/airalarm/air_alarm as anything in GLOB.air_alarms) + if (air_alarm.z != z || (air_alarm.machine_stat & (NOPOWER|BROKEN))) + continue + switch (air_alarm.danger_level) + if (AIR_ALARM_ALERT_NONE) + continue + if (AIR_ALARM_ALERT_WARNING) + minor_alarms += get_area_name(air_alarm, format_text = TRUE) + if (AIR_ALARM_ALERT_HAZARD) + priority_alarms += get_area_name(air_alarm, format_text = TRUE) + + // Either we got new alarms, or we have no alarms anymore + if ((alarm_count == 0) != (minor_alarms.len + priority_alarms.len == 0)) + update_icon() - minor_alarms -= zone - priority_alarms -= zone - if(severity == "severe") - priority_alarms += zone - else if (severity == "minor") - minor_alarms += zone - update_icon() - ui_update() - return + return TRUE /obj/machinery/computer/atmos_alert/update_icon() ..() diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm new file mode 100644 index 0000000000000..58398d59b11d3 --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm @@ -0,0 +1,209 @@ +/// Gas tank air sensor. +/// These always hook to monitors, be mindful of them +/obj/machinery/air_sensor + name = "gas sensor" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "gsensor1" + resistance_flags = FIRE_PROOF + power_channel = AREA_USAGE_ENVIRON + active_power_usage = 1 + var/on = TRUE + + /// The unique string that represents which atmos chamber to associate with. + var/chamber_id + /// The inlet[injector] controlled by this sensor + var/inlet_id + /// The outlet[vent pump] controlled by this sensor + var/outlet_id + /// The air alarm connected to this sensor + var/obj/machinery/airalarm/connected_airalarm + +/obj/machinery/air_sensor/Initialize(mapload) + id_tag = assign_random_name() + + //this global list of air sensors is available to all station monitering consoles round start and to new consoles made during the round + if(mapload) + GLOB.map_loaded_sensors[chamber_id] = id_tag + inlet_id = CHAMBER_INPUT_FROM_ID(chamber_id) + outlet_id = CHAMBER_OUTPUT_FROM_ID(chamber_id) + + return ..() + +/obj/machinery/air_sensor/Destroy() + reset() + return ..() + +/obj/machinery/air_sensor/return_air() + if(!on) + return + . = ..() + use_power = active_power_usage + +/obj/machinery/air_sensor/process() + //update appearance according to power state + if(machine_stat & NOPOWER) + if(on) + on = FALSE + update_icon() + else if(!on) + on = TRUE + update_icon() + +/obj/machinery/air_sensor/examine(mob/user) + . = ..() + . += span_notice("Use a multitool to link it to an injector, vent, or air alarm.") + . += span_notice("You can use a screwdriver to reset its ports.") + . += span_notice("Click with hand to turn it off.") + +/obj/machinery/air_sensor/attack_hand(mob/living/user, list/modifiers) + . = ..() + + //switched off version of this air sensor but still anchored to the ground + var/obj/item/air_sensor/sensor = new(drop_location(), inlet_id, outlet_id) + sensor.set_anchored(TRUE) + sensor.balloon_alert(user, "sensor turned off") + + //delete self + qdel(src) + +/obj/machinery/air_sensor/update_icon_state() + icon_state = "gsensor[on]" + return ..() + +/obj/machinery/air_sensor/proc/reset() + inlet_id = null + outlet_id = null + if(connected_airalarm) + connected_airalarm.disconnect_sensor() + // if air alarm and sensor were linked at roundstart we allow them to link to new devices + connected_airalarm.allow_link_change = TRUE + connected_airalarm = null + +///click with multi tool to disconnect everything +/obj/machinery/air_sensor/screwdriver_act(mob/living/user, obj/item/tool) + . = ..() + balloon_alert(user, "reset ports") + reset() + return TRUE + +REGISTER_BUFFER_HANDLER(/obj/machinery/air_sensor) + +DEFINE_BUFFER_HANDLER(/obj/machinery/air_sensor) + if(istype(buffer, /obj/machinery/atmospherics/components/unary/outlet_injector)) + var/obj/machinery/atmospherics/components/unary/outlet_injector/input = buffer + inlet_id = input.id_tag + FLUSH_BUFFER(buffer) + balloon_alert(user, "connected to input") + else if(istype(buffer, /obj/machinery/atmospherics/components/unary/vent_pump)) + var/obj/machinery/atmospherics/components/unary/vent_pump/output = buffer + output.disconnect_from_area() + output.pump_direction = ATMOS_DIRECTION_SIPHONING + output.pressure_checks = ATMOS_INTERNAL_BOUND + output.internal_pressure_bound = 4000 + output.external_pressure_bound = 0 + //finally assign it to this sensor + outlet_id = output.id_tag + FLUSH_BUFFER(buffer) + balloon_alert(user, "connected to output") + else if (TRY_STORE_IN_BUFFER(buffer_parent, src)) + to_chat(user, span_notice("You register [src] in [buffer_parent]'s buffer.")) + balloon_alert(user, "added to multitool buffer") + return COMPONENT_BUFFER_RECEIVED + return NONE + +/** + * A portable version of the /obj/machinery/air_sensor + * Wrenching it & turning it on will convert it back to /obj/machinery/air_sensor + * Unwelding /obj/machinery/air_sensor will turn it back to /obj/item/air_sensor + * The logic is same as meters + */ +/obj/item/air_sensor + name = "Air Sensor" + desc = "A device designed to detect gases and their concentration in an area." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "gsensor0" + custom_materials = list(/datum/material/iron = 100, /datum/material/glass = 100) + /// The injector linked with this sensor + var/input_id + /// The vent pump linked with this sensor + var/output_id + +/obj/item/air_sensor/Initialize(mapload, inlet, outlet) + . = ..() + input_id = inlet + output_id = outlet + +/obj/item/air_sensor/examine(mob/user) + . = ..() + if(anchored) + . += span_notice("It's wrenched in place") + else + . += span_notice("It should be wrenched in place to turn it on.") + . += span_notice("It could be welded apart.") + . += span_notice("Click with hand to turn it on.") + +/obj/item/air_sensor/attack_hand(mob/user, list/modifiers) + . = ..() + if(!anchored) + return + + //List of air sensor's by name + var/list/available_sensors = list() + for(var/chamber_id in GLOB.station_gas_chambers) + //don't let it conflict with existing distro & waste moniter meter's + if(chamber_id == ATMOS_GAS_MONITOR_DISTRO) + continue + if(chamber_id == ATMOS_GAS_MONITOR_WASTE) + continue + available_sensors += GLOB.station_gas_chambers[chamber_id] + + //make the choice + var/chamber_name = tgui_input_list(user, "Select Sensor Purpose", "Select Sensor ID", available_sensors) + if(isnull(chamber_name)) + return + + //map chamber name back to id + var/target_chamber + for(var/chamber_id in GLOB.station_gas_chambers) + if(GLOB.station_gas_chambers[chamber_id] != chamber_name) + continue + target_chamber = chamber_id + break + + //build the sensor from the subtypes of sensor's available + var/static/list/chamber_subtypes = null + if(isnull(chamber_subtypes)) + chamber_subtypes = subtypesof(/obj/machinery/air_sensor) + for(var/obj/machinery/air_sensor/sensor as anything in chamber_subtypes) + if(initial(sensor.chamber_id) != target_chamber) + continue + + //make real air sensor in its place + var/obj/machinery/air_sensor/new_sensor = new sensor(get_turf(src)) + new_sensor.inlet_id = input_id + new_sensor.outlet_id = output_id + new_sensor.balloon_alert(user, "sensor turned on") + qdel(src) + + break + +/obj/item/air_sensor/wrench_act(mob/living/user, obj/item/tool) + if(default_unfasten_wrench(user, tool) == SUCCESSFUL_UNFASTEN) + return TRUE + +/obj/item/air_sensor/welder_act(mob/living/user, obj/item/tool) + if(!tool.tool_start_check(user, amount = 1)) + return TRUE + + loc.balloon_alert(user, "dismantling sensor") + if(!tool.use_tool(src, user, 2 SECONDS, volume = 30, amount = 1)) + return TRUE + loc.balloon_alert(user, "sensor dismanteled") + + deconstruct(TRUE) + return TRUE + +/obj/item/air_sensor/deconstruct(disassembled) + . = ..() + new /obj/item/analyzer(loc) + new /obj/item/stack/sheet/iron(loc, 1) diff --git a/code/game/machinery/computer/atmos_computers/_atmos_control.dm b/code/game/machinery/computer/atmos_computers/_atmos_control.dm new file mode 100644 index 0000000000000..d67e63f0d387f --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/_atmos_control.dm @@ -0,0 +1,244 @@ + +///////////////////////////////////////////////////////////// +// GENERAL AIR CONTROL (a.k.a atmos computer) +///////////////////////////////////////////////////////////// +/obj/machinery/computer/atmos_control + name = "atmospherics monitoring" + desc = "Used to monitor the station's atmospherics sensors." + icon_screen = "tank" + icon_keyboard = "atmos_key" + circuit = /obj/item/circuitboard/computer/atmos_control + light_color = LIGHT_COLOR_CYAN + + /// Which sensors do we want to listen to. + /// Assoc of list[chamber_id] = readable_chamber_name + var/list/atmos_chambers + + /// Used when control = FALSE to store the original atmos chambers so they dont get lost when reconnecting + var/list/always_displayed_chambers + + /// Whether we can actually adjust the chambers or not. + var/control = TRUE + /// Whether we are allowed to reconnect. + var/reconnecting = TRUE + + /// Was this computer multitooled before. If so copy the list connected_sensors as it now maintain's its own sensors independent of the map loaded one's + var/was_multi_tooled = FALSE + + /// list of all sensors[key is chamber id, value is id of air sensor linked to this chamber] monitered by this computer + var/list/connected_sensors + +/obj/machinery/computer/atmos_control/Initialize(mapload) + . = ..() + AddComponent(/datum/component/buffer) + + //all newly constructed/round start computers by default have access to this list + connected_sensors = GLOB.map_loaded_sensors + + //special case for the station monitering console. We dont want to loose these chambers during reconnecting + if(!control && !isnull(atmos_chambers)) + always_displayed_chambers = atmos_chambers.Copy() + +/obj/machinery/computer/atmos_control/examine(mob/user) + . = ..() + . += span_notice("Use a multitool to link a air sensor to this computer") + +/// Reconnect only works for station based chambers. +/obj/machinery/computer/atmos_control/proc/reconnect(mob/user) + if(!reconnecting) + return FALSE + + // We only prompt the user with the sensors that are actually available. + var/available_devices = list() + + for (var/chamber_identifier in connected_sensors) + //this sensor was destroyed at the time of reconnecting + var/obj/machinery/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber_identifier]] + if(QDELETED(sensor)) + continue + + //non master computers don't have access to these station moniters. Only done to give master computer's special access to these chambers and make them feel special or something + if(chamber_identifier == ATMOS_GAS_MONITOR_DISTRO) + continue + if(chamber_identifier == ATMOS_GAS_MONITOR_WASTE) + continue + + available_devices[GLOB.station_gas_chambers[chamber_identifier]] = chamber_identifier + + // As long as we dont put any funny chars in the strings it should match. + var/new_name = tgui_input_list(user, "Select the device set", "Reconnect", available_devices) + if(isnull(new_name)) + return FALSE + var/new_id = available_devices[new_name] + if(isnull(new_id)) + return FALSE + + atmos_chambers = list() + //these are chambers we always want to display even after reconnecting + if(always_displayed_chambers) + for(var/chamber_id in always_displayed_chambers) + atmos_chambers[chamber_id] = always_displayed_chambers[chamber_id] + atmos_chambers[new_id] = new_name + + name = new_name + (control ? " Control" : " Monitor") + + return TRUE + +REGISTER_BUFFER_HANDLER(/obj/machinery/computer/atmos_control) + +DEFINE_BUFFER_HANDLER(/obj/machinery/computer/atmos_control) + if (istype(buffer,/obj/machinery/air_sensor)) + var/obj/machinery/air_sensor/sensor = buffer + to_chat(user, span_notice("You link [src] with [buffer] in [buffer_parent] buffer.")) + if(!was_multi_tooled) + connected_sensors = connected_sensors.Copy() + was_multi_tooled = TRUE + //register the sensor's unique ID with its assositated chamber + connected_sensors[sensor.chamber_id] = sensor.id_tag + user.balloon_alert(user, "sensor connected to [src]") + return COMPONENT_BUFFER_RECEIVED + return NONE + + +/obj/machinery/computer/atmos_control/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosControlConsole", name) + ui.open() + ui.set_autoupdate(TRUE) // Gas sensors + +/obj/machinery/computer/atmos_control/ui_static_data(mob/user) + var/data = list() + data["maxInput"] = MAX_TRANSFER_RATE + data["maxOutput"] = MAX_OUTPUT_PRESSURE + data["control"] = control + data["reconnecting"] = reconnecting + return data + +/obj/machinery/computer/atmos_control/ui_data(mob/user) + var/data = list() + + data["chambers"] = list() + for(var/chamber_id in atmos_chambers) + var/list/chamber_info = list() + chamber_info["id"] = chamber_id + chamber_info["name"] = atmos_chambers[chamber_id] + + var/obj/machinery/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber_id]] + if(!QDELETED(sensor)) + chamber_info["gasmix"] = gas_mixture_parser(sensor.return_air()) + + if(istype(sensor, /obj/machinery/air_sensor)) //distro & waste loop are not air sensors and don't have these functions + var/obj/machinery/air_sensor/air_sensor = sensor + + var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[air_sensor.inlet_id || ""] + if (!QDELETED(input)) + chamber_info["input_info"] = list( + "active" = input.on, + "amount" = input.volume_rate, + ) + + var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[air_sensor.outlet_id || ""] + if (!QDELETED(output)) + chamber_info["output_info"] = list( + "active" = output.on, + "amount" = output.internal_pressure_bound, + ) + + data["chambers"] += list(chamber_info) + return data + +/obj/machinery/computer/atmos_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(. || !(control || reconnecting)) + return + + var/chamber = params["chamber"] + + switch(action) + if("toggle_input") + if (!(chamber in atmos_chambers)) + return TRUE + + var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]] + if(QDELETED(sensor)) + return TRUE + + var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[sensor.inlet_id || ""] + if(QDELETED(input)) + return TRUE + + input.on = !input.on + input.update_icon() + if("toggle_output") + if (!(chamber in atmos_chambers)) + return TRUE + + var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]] + if(QDELETED(sensor)) + return TRUE + + var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[sensor.outlet_id || ""] + if(QDELETED(output)) + return TRUE + + output.on = !output.on + output.update_icon() + if("adjust_input") + if (!(chamber in atmos_chambers)) + return TRUE + + var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]] + if(QDELETED(sensor)) + return TRUE + + var/obj/machinery/atmospherics/components/unary/outlet_injector/input = GLOB.objects_by_id_tag[sensor.inlet_id || ""] + if(QDELETED(input)) + return TRUE + + var/target = text2num(params["rate"]) + if(isnull(target)) + return TRUE + target = clamp(target, 0, MAX_TRANSFER_RATE) + + input.volume_rate = clamp(target, 0, min(input.airs[1].volume, MAX_TRANSFER_RATE)) + if("adjust_output") + if (!(chamber in atmos_chambers)) + return TRUE + + var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[connected_sensors[chamber]] + if(QDELETED(sensor)) + return TRUE + + var/obj/machinery/atmospherics/components/unary/vent_pump/output = GLOB.objects_by_id_tag[sensor.outlet_id || ""] + if(QDELETED(output)) + return TRUE + + var/target = text2num(params["rate"]) + if(isnull(target)) + return TRUE + target = clamp(target, 0, ATMOS_PUMP_MAX_PRESSURE) + + output.internal_pressure_bound = target + if("reconnect") + reconnect(usr) + + return TRUE + +///////////////////////////////////////////////////////////// +// LARGE TANK CONTROL +///////////////////////////////////////////////////////////// + +/obj/machinery/computer/atmos_control/nocontrol + control = FALSE + circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol + +/obj/machinery/computer/atmos_control/noreconnect + reconnecting = FALSE + circuit = /obj/item/circuitboard/computer/atmos_control/noreconnect + +/// Vegetable +/obj/machinery/computer/atmos_control/fixed + control = FALSE + reconnecting = FALSE + circuit = /obj/item/circuitboard/computer/atmos_control/fixed diff --git a/code/game/machinery/computer/atmos_computers/air_sensors.dm b/code/game/machinery/computer/atmos_computers/air_sensors.dm new file mode 100644 index 0000000000000..2ec1c0f0957c0 --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/air_sensors.dm @@ -0,0 +1,67 @@ +/obj/machinery/air_sensor/plasma_tank + name = "plasma tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_PLAS + +/obj/machinery/air_sensor/oxygen_tank + name = "oxygen tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_O2 + +/obj/machinery/air_sensor/nitrogen_tank + name = "nitrogen tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_N2 + +/obj/machinery/air_sensor/mix_tank + name = "mix tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_MIX + +/obj/machinery/air_sensor/nitrous_tank + name = "nitrous oxide tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_N2O + +/obj/machinery/air_sensor/air_tank + name = "air mix tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_AIR + +/obj/machinery/air_sensor/carbon_tank + name = "carbon dioxide tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_CO2 + +/obj/machinery/air_sensor/bz_tank + name = "bz tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_BZ + +/obj/machinery/air_sensor/hypernoblium_tank + name = "hypernoblium tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_HYPERNOBLIUM + +/obj/machinery/air_sensor/nitryl_tank + name = "nitryl tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_NITRYL + +/obj/machinery/air_sensor/pluoxium_tank + name = "pluoxium tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_PLUOXIUM + +/obj/machinery/air_sensor/tritium_tank + name = "tritium tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_TRITIUM + +/obj/machinery/air_sensor/water_vapor_tank + name = "water vapor tank gas sensor" + chamber_id = ATMOS_GAS_MONITOR_H2O + +/obj/machinery/air_sensor/incinerator_tank + name = "incinerator chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_INCINERATOR + +/obj/machinery/air_sensor/toxins_burn_chamber + name = "toxins burn chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_TOXINS_BURN + +/obj/machinery/air_sensor/toxins_freezer_chamber + name = "toxins freezer chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_TOXINS_FREEZER + +/obj/machinery/air_sensor/engine_chamber + name = "supermatter engine chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_ENGINE diff --git a/code/game/machinery/computer/atmos_computers/atmos_controls.dm b/code/game/machinery/computer/atmos_computers/atmos_controls.dm new file mode 100644 index 0000000000000..c4f130ed386e0 --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/atmos_controls.dm @@ -0,0 +1,82 @@ +/obj/machinery/computer/atmos_control/nocontrol/master + name = "station atmospherics monitoring" + circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol/master + atmos_chambers = list(ATMOS_GAS_MONITOR_DISTRO = "Distribution Loop", ATMOS_GAS_MONITOR_WASTE = "Waste Loop") + +/obj/machinery/computer/atmos_control/oxygen_tank + name = "Oxygen Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/oxygen_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_O2 = "Oxygen Supply") + +/obj/machinery/computer/atmos_control/plasma_tank + name = "Plasma Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/plasma_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_PLAS = "Plasma Supply") + +/obj/machinery/computer/atmos_control/air_tank + name = "Mixed Air Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/air_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_AIR = "Mixed Air Supply") + +/obj/machinery/computer/atmos_control/nitrous_tank + name = "Nitrous Oxide Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/nitrous_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_N2O = "Nitrous Oxide Supply") + +/obj/machinery/computer/atmos_control/nitrogen_tank + name = "Nitrogen Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/nitrogen_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_N2 = "Nitrogen Supply") + +/obj/machinery/computer/atmos_control/carbon_tank + name = "Carbon Dioxide Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/carbon_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_CO2 = "Carbon Dioxide Supply") + +/obj/machinery/computer/atmos_control/bz_tank + name = "BZ Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/bz_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_BZ = "BZ Supply") + +/obj/machinery/computer/atmos_control/hypernoblium_tank + name = "Hypernoblium Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/hypernoblium_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_HYPERNOBLIUM = "Hypernoblium Supply") + +/obj/machinery/computer/atmos_control/nitryl_tank + name = "Nitryl Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/nitryl_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_NITRYL = "Nitryl Supply") + +/obj/machinery/computer/atmos_control/pluoxium_tank + name = "Pluoxium Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/pluoxium_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_PLUOXIUM = "Pluoxium Supply") + +/obj/machinery/computer/atmos_control/tritium_tank + name = "Tritium Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/tritium_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_TRITIUM = "Tritium Supply") + +/obj/machinery/computer/atmos_control/water_vapor + name = "Water Vapor Supply Control" + circuit = /obj/item/circuitboard/computer/atmos_control/water_vapor + atmos_chambers = list(ATMOS_GAS_MONITOR_H2O = "Water Vapor Supply") + +/obj/machinery/computer/atmos_control/mix_tank + name = "Mix Chamber Control" + circuit = /obj/item/circuitboard/computer/atmos_control/mix_tank + atmos_chambers = list(ATMOS_GAS_MONITOR_MIX = "Mix Chamber") + +/obj/machinery/computer/atmos_control/nocontrol/incinerator + name = "Incinerator Chamber Monitor" + circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol/incinerator + atmos_chambers = list(ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber") + +/obj/machinery/computer/atmos_control/toxinsmix + name = "Toxins Chamber Control" + circuit = /obj/item/circuitboard/computer/atmos_control/toxinsmix + atmos_chambers = list( + ATMOS_GAS_MONITOR_TOXINS_BURN = "Toxins Burn Chamber", + ATMOS_GAS_MONITOR_TOXINS_FREEZER = "Toxins Freezer Chamber", + ) diff --git a/code/game/machinery/computer/atmos_computers/inlets.dm b/code/game/machinery/computer/atmos_computers/inlets.dm new file mode 100644 index 0000000000000..8cf98da32f697 --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/inlets.dm @@ -0,0 +1,81 @@ +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored + on = TRUE + volume_rate = MAX_TRANSFER_RATE + /// The air sensor type this injector is linked to + var/chamber_id + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/Initialize(mapload) + id_tag = CHAMBER_INPUT_FROM_ID(chamber_id) + return ..() + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer2 + piping_layer = 2 + icon_state = "inje_map-2" + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer4 + piping_layer = 4 + icon_state = "inje_map-4" + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input + name = "plasma tank input injector" + chamber_id = ATMOS_GAS_MONITOR_PLAS + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input + name = "oxygen tank input injector" + chamber_id = ATMOS_GAS_MONITOR_O2 + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input + name = "nitrogen tank input injector" + chamber_id = ATMOS_GAS_MONITOR_N2 + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input + name = "mix tank input injector" + chamber_id = ATMOS_GAS_MONITOR_MIX + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input + name = "nitrous oxide tank input injector" + chamber_id = ATMOS_GAS_MONITOR_N2O + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input + name = "air mix tank input injector" + chamber_id = ATMOS_GAS_MONITOR_AIR + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input + name = "carbon dioxide tank input injector" + chamber_id = ATMOS_GAS_MONITOR_CO2 + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/bz_input + name = "bz tank input injector" + chamber_id = ATMOS_GAS_MONITOR_BZ + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/hypernoblium_input + name = "hypernoblium tank input injector" + chamber_id = ATMOS_GAS_MONITOR_HYPERNOBLIUM + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitryl_input + name = "nitryl tank input injector" + chamber_id = ATMOS_GAS_MONITOR_NITRYL + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/pluoxium_input + name = "pluoxium tank input injector" + chamber_id = ATMOS_GAS_MONITOR_PLUOXIUM + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/tritium_input + name = "tritium tank input injector" + chamber_id = ATMOS_GAS_MONITOR_TRITIUM + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/water_vapor_input + name = "water vapor tank input injector" + chamber_id = ATMOS_GAS_MONITOR_H2O + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input + name = "incinerator chamber input injector" + chamber_id = ATMOS_GAS_MONITOR_INCINERATOR + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_burn_chamber_input + name = "toxins burn chamber input injector" + chamber_id = ATMOS_GAS_MONITOR_TOXINS_BURN + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/toxins_freezer_chamber_input + name = "toxins freezer chamber input injector" + chamber_id = ATMOS_GAS_MONITOR_TOXINS_FREEZER diff --git a/code/game/machinery/computer/atmos_computers/meters.dm b/code/game/machinery/computer/atmos_computers/meters.dm new file mode 100644 index 0000000000000..9cfe3072a69cc --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/meters.dm @@ -0,0 +1,23 @@ +/obj/machinery/meter/monitored + /// The unique string that represents which atmos chamber to associate with. + var/chamber_id + +/obj/machinery/meter/monitored/Initialize(mapload, new_piping_layer) + id_tag = assign_random_name() + if(mapload) + GLOB.map_loaded_sensors[chamber_id] = id_tag + . = ..() + +/obj/machinery/meter/monitored/layer2 + target_layer = 2 + +/obj/machinery/meter/monitored/layer4 + target_layer = 4 + +/obj/machinery/meter/monitored/waste_loop + name = "waste loop gas flow meter" + chamber_id = ATMOS_GAS_MONITOR_WASTE + +/obj/machinery/meter/monitored/distro_loop + name = "distribution loop gas flow meter" + chamber_id = ATMOS_GAS_MONITOR_DISTRO diff --git a/code/game/machinery/computer/atmos_computers/outlets.dm b/code/game/machinery/computer/atmos_computers/outlets.dm new file mode 100644 index 0000000000000..7f96aab652548 --- /dev/null +++ b/code/game/machinery/computer/atmos_computers/outlets.dm @@ -0,0 +1,84 @@ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored + on = TRUE + icon_state = "vent_map_siphon_on-3" + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/Initialize(mapload) + id_tag = CHAMBER_OUTPUT_FROM_ID(chamber_id) + . = ..() + //we dont want people messing with these special vents using the air alarm interface + disconnect_from_area() + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output + name = "plasma tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_PLAS + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output + name = "oxygen tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_O2 + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output + name = "nitrogen tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_N2 + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output + name = "mix tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_MIX + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output + name = "nitrous oxide tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_N2O + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output + name = "carbon dioxide tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_CO2 + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/bz_output + name = "bz tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_BZ + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/hypernoblium_output + name = "hypernoblium tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_HYPERNOBLIUM + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitryl_output + name = "nitryl tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_NITRYL + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/pluoxium_output + name = "pluoxium tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_PLUOXIUM + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/tritium_output + name = "tritium tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_TRITIUM + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/water_vapor_output + name = "water vapor tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_H2O + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/incinerator_output + name = "incinerator chamber output inlet" + chamber_id = ATMOS_GAS_MONITOR_INCINERATOR + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/toxins_burn_chamber_output + name = "toxins burn chamber output inlet" + chamber_id = ATMOS_GAS_MONITOR_TOXINS_BURN + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/toxins_freezer_chamber_output + name = "toxins freezer chamber output inlet" + chamber_id = ATMOS_GAS_MONITOR_TOXINS_FREEZER + +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored + on = TRUE + icon_state = "vent_map_siphon_on-3" + +// Same as the rest, but bigger volume. +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/Initialize(mapload) + id_tag = CHAMBER_OUTPUT_FROM_ID(chamber_id) + . = ..() + //we dont want people messing with these special vents using the air alarm interface + disconnect_from_area() + +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output + name = "air mix tank output inlet" + chamber_id = ATMOS_GAS_MONITOR_AIR diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm deleted file mode 100644 index 0c4cad563d5bc..0000000000000 --- a/code/game/machinery/computer/atmos_control.dm +++ /dev/null @@ -1,382 +0,0 @@ -///////////////////////////////////////////////////////////// -// AIR SENSOR (found in gas tanks) -///////////////////////////////////////////////////////////// - -/obj/machinery/air_sensor - name = "gas sensor" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "gsensor1" - resistance_flags = FIRE_PROOF - interacts_with_air = TRUE - - var/on = TRUE - var/frequency = FREQ_ATMOS_STORAGE - var/datum/radio_frequency/radio_connection - -/obj/machinery/air_sensor/atmos/plasma_tank - name = "plasma tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_PLASMA -/obj/machinery/air_sensor/atmos/toxins_mixing_tank - name = "toxins mixing gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB -/obj/machinery/air_sensor/atmos/oxygen_tank - name = "oxygen tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_O2 -/obj/machinery/air_sensor/atmos/nitrogen_tank - name = "nitrogen tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_N2 -/obj/machinery/air_sensor/atmos/mix_tank - name = "mix tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_MIX -/obj/machinery/air_sensor/atmos/nitrous_tank - name = "nitrous oxide tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_N2O -/obj/machinery/air_sensor/atmos/air_tank - name = "air mix tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_AIR -/obj/machinery/air_sensor/atmos/carbon_tank - name = "carbon dioxide tank gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_CO2 -/obj/machinery/air_sensor/atmos/incinerator_tank - name = "incinerator chamber gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_INCINERATOR -/obj/machinery/air_sensor/atmos/toxins_waste - name = "toxins waste sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_TOXINS_WASTE -/obj/machinery/air_sensor/atmos/sm_core - name = "supermatter gas sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_SM -/obj/machinery/air_sensor/atmos/sm_waste - name = "supermatter waste sensor" - id_tag = ATMOS_GAS_MONITOR_SENSOR_SM_WASTE - -/obj/machinery/air_sensor/update_icon() - icon_state = "gsensor[on]" - -/obj/machinery/air_sensor/process_atmos() - if(on) - var/datum/gas_mixture/air_sample = return_air() - - var/datum/signal/signal = new(list( - "sigtype" = "status", - "id_tag" = id_tag, - "timestamp" = world.time, - "pressure" = air_sample.return_pressure(), - "temperature" = air_sample.return_temperature(), - "gases" = list() - )) - var/total_moles = air_sample.total_moles() - if(total_moles) - for(var/gas_id in air_sample.get_gases()) - var/gas_name = GLOB.gas_data.names[gas_id] - signal.data["gases"][gas_name] = air_sample.get_moles(gas_id) / total_moles * 100 - - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - -/obj/machinery/air_sensor/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) - -/obj/machinery/air_sensor/Initialize(mapload) - . = ..() - SSair.start_processing_machine(src) - set_frequency(frequency) - -/obj/machinery/air_sensor/Destroy() - SSair.stop_processing_machine(src) - SSradio.remove_object(src, frequency) - return ..() - -///////////////////////////////////////////////////////////// -// GENERAL AIR CONTROL (a.k.a atmos computer) -///////////////////////////////////////////////////////////// -GLOBAL_LIST_EMPTY(atmos_air_controllers) - -/obj/machinery/computer/atmos_control - name = "atmospherics monitoring" - desc = "Used to monitor the station's atmospherics sensors." - icon_screen = "tank" - icon_keyboard = "atmos_key" - circuit = /obj/item/circuitboard/computer/atmos_control - - - - var/frequency = FREQ_ATMOS_STORAGE - var/list/sensors = list( - ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank", - ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank", - ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank", - ATMOS_GAS_MONITOR_SENSOR_PLASMA = "Plasma Tank", - ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank", - ATMOS_GAS_MONITOR_SENSOR_AIR = "Mixed Air Tank", - ATMOS_GAS_MONITOR_SENSOR_MIX = "Mix Tank", - ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION = "Distribution Loop", - ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE = "Atmos Waste Loop", - ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber", - ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber", - ATMOS_GAS_MONITOR_SENSOR_TOXINS_WASTE = "Toxins Waste Tank", - ATMOS_GAS_MONITOR_SENSOR_SM = "Supermatter Core", - ATMOS_GAS_MONITOR_SENSOR_SM_WASTE = "Supermatter Waste Tank", - ) - var/list/sensor_information = list() - var/datum/radio_frequency/radio_connection - - light_color = LIGHT_COLOR_CYAN - -/obj/machinery/computer/atmos_control/Initialize(mapload) - . = ..() - GLOB.atmos_air_controllers += src - set_frequency(frequency) - -/obj/machinery/computer/atmos_control/Destroy() - GLOB.atmos_air_controllers -= src - SSradio.remove_object(src, frequency) - return ..() - - -/obj/machinery/computer/atmos_control/ui_state(mob/user) - return GLOB.default_state - -/obj/machinery/computer/atmos_control/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "AtmosControlConsole") - ui.open() - ui.set_autoupdate(TRUE) // Gas sensors - -/obj/machinery/computer/atmos_control/ui_data(mob/user) - var/data = list() - - data["sensors"] = list() - for(var/id_tag in sensors) - var/long_name = sensors[id_tag] - var/list/info = sensor_information[id_tag] - if(!info) - continue - data["sensors"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "pressure" = info["pressure"], - "temperature" = info["temperature"], - "gases" = info["gases"] - )) - return data - -/obj/machinery/computer/atmos_control/receive_signal(datum/signal/signal) - if(!signal) - return - - var/id_tag = signal.data["id_tag"] - if(!id_tag || !sensors.Find(id_tag)) - return - - sensor_information[id_tag] = signal.data - -/obj/machinery/computer/atmos_control/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) - -///////////////////////////////////////////////////////////// -// LARGE TANK CONTROL -///////////////////////////////////////////////////////////// - -/obj/machinery/computer/atmos_control/tank - var/input_tag - var/output_tag - frequency = FREQ_ATMOS_STORAGE - circuit = /obj/item/circuitboard/computer/atmos_control/tank - - var/list/input_info - var/list/output_info - - - - -/obj/machinery/computer/atmos_control/tank/oxygen_tank - name = "Oxygen Supply Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_O2 - output_tag = ATMOS_GAS_MONITOR_OUTPUT_O2 - sensors = list(ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/oxygen_tank - -/obj/machinery/computer/atmos_control/tank/plasma_tank - name = "Plasma Supply Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_PLASMA - output_tag = ATMOS_GAS_MONITOR_OUTPUT_PLASMA - sensors = list(ATMOS_GAS_MONITOR_SENSOR_PLASMA = "Plasma Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/plasma_tank - -/obj/machinery/computer/atmos_control/tank/air_tank - name = "Mixed Air Supply Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_AIR - output_tag = ATMOS_GAS_MONITOR_OUTPUT_AIR - sensors = list(ATMOS_GAS_MONITOR_SENSOR_AIR = "Air Mix Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/air_tank - -/obj/machinery/computer/atmos_control/tank/mix_tank - name = "Gas Mix Tank Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_MIX - output_tag = ATMOS_GAS_MONITOR_OUTPUT_MIX - sensors = list(ATMOS_GAS_MONITOR_SENSOR_MIX = "Gas Mix Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/mix_tank - -/obj/machinery/computer/atmos_control/tank/nitrous_tank - name = "Nitrous Oxide Supply Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_N2O - output_tag = ATMOS_GAS_MONITOR_OUTPUT_N2O - sensors = list(ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/nitrous_tank - -/obj/machinery/computer/atmos_control/tank/nitrogen_tank - name = "Nitrogen Supply Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_N2 - output_tag = ATMOS_GAS_MONITOR_OUTPUT_N2 - sensors = list(ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/nitrogen_tank - -/obj/machinery/computer/atmos_control/tank/carbon_tank - name = "Carbon Dioxide Supply Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_CO2 - output_tag = ATMOS_GAS_MONITOR_OUTPUT_CO2 - sensors = list(ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/carbon_tank - -/obj/machinery/computer/atmos_control/tank/incinerator - name = "Incinerator Air Control" - input_tag = ATMOS_GAS_MONITOR_INPUT_INCINERATOR - output_tag = ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR - sensors = list(ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/incinerator - -/obj/machinery/computer/atmos_control/tank/sm - name = "Supermatter Air Monitor" - input_tag = ATMOS_GAS_MONITOR_INPUT_SM - output_tag = ATMOS_GAS_MONITOR_OUTPUT_SM - sensors = list(ATMOS_GAS_MONITOR_SENSOR_SM = "Supermatter Core") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/incinerator - -/obj/machinery/computer/atmos_control/tank/sm_waste - name = "Supermatter Air Monitor" - input_tag = ATMOS_GAS_MONITOR_INPUT_SM_WASTE - output_tag = ATMOS_GAS_MONITOR_OUTPUT_SM_WASTE - sensors = list(ATMOS_GAS_MONITOR_SENSOR_SM_WASTE = "Supermatter Waste") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/sm_waste - -/obj/machinery/computer/atmos_control/tank/toxins_mixing_tank - name = "Toxin Chamber Air Monitor" - input_tag = ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB - output_tag = ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB - sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/incinerator - -/obj/machinery/computer/atmos_control/tank/toxins_waste_tank - name = "Toxin Waste Air Monitor" - input_tag = ATMOS_GAS_MONITOR_INPUT_TOXINS_WASTE - output_tag = ATMOS_GAS_MONITOR_OUTPUT_TOXINS_WASTE - sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOXINS_WASTE = "Toxins Waste Chamber") - circuit = /obj/item/circuitboard/computer/atmos_control/tank/toxins_waste - -// This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this -/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user) - var/list/IO = list() - var/datum/radio_frequency/freq = SSradio.return_frequency(frequency) - - var/list/devices = list() - var/list/device_refs = freq.devices["_default"] - for(var/datum/weakref/device_ref as anything in device_refs) - var/atom/device = device_ref.resolve() - if(!device) - device_refs -= device_ref - continue - devices += device - - for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices) - var/list/text = splittext(U.id_tag, "_") - IO |= text[1] - for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices) - var/list/text = splittext(U.id, "_") - IO |= text[1] - if(!IO.len) - to_chat(user, span_alert("No machinery detected.")) - var/S = input("Select the device set: ", "Selection", IO[1]) as anything in sort_list(IO) - if(src) - src.input_tag = "[S]_in" - src.output_tag = "[S]_out" - name = "[uppertext(S)] Supply Control" - var/list/new_devices = freq.devices["atmosia"] - sensors.Cut() - for(var/obj/machinery/air_sensor/U in new_devices) - var/list/text = splittext(U.id_tag, "_") - if(text[1] == S) - sensors = list("[S]_sensor" = "[S] Tank") - break - - for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices) - U.broadcast_status() - for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices) - U.broadcast_status() - -/obj/machinery/computer/atmos_control/tank/ui_state(mob/user) - return GLOB.default_state - -/obj/machinery/computer/atmos_control/tank/ui_interact(mob/user, datum/tgui/ui = null) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "AtmosControlConsole") - ui.set_autoupdate(TRUE) // Gas sensors - ui.open() - -/obj/machinery/computer/atmos_control/tank/ui_data(mob/user) - var/list/data = ..() - data["tank"] = TRUE - data["inputting"] = input_info ? input_info["power"] : FALSE - data["inputRate"] = input_info ? input_info["volume_rate"] : 0 - data["maxInputRate"] = input_info ? MAX_TRANSFER_RATE : 0 - data["outputting"] = output_info ? output_info["power"] : FALSE - data["outputPressure"] = output_info ? output_info["internal"] : 0 - data["maxOutputPressure"] = output_info ? MAX_OUTPUT_PRESSURE : 0 - return data - -/obj/machinery/computer/atmos_control/tank/ui_act(action, params) - if(..() || !radio_connection) - return - var/datum/signal/signal = new(list("sigtype" = "command", "user" = usr)) - switch(action) - if("reconnect") - reconnect(usr) - . = TRUE - if("input") - signal.data += list("tag" = input_tag, "power_toggle" = TRUE) - . = TRUE - if("rate") - var/target = text2num(params["rate"]) - if(!isnull(target)) - target = clamp(target, 0, MAX_TRANSFER_RATE) - signal.data += list("tag" = input_tag, "set_volume_rate" = target) - . = TRUE - if("output") - signal.data += list("tag" = output_tag, "power_toggle" = TRUE) - . = TRUE - if("pressure") - var/target = text2num(params["pressure"]) - if(!isnull(target)) - target = clamp(target, 0, MAX_OUTPUT_PRESSURE) - signal.data += list("tag" = output_tag, "set_internal_pressure" = target) - . = TRUE - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - -/obj/machinery/computer/atmos_control/tank/receive_signal(datum/signal/signal) - if(!signal) - return - - var/id_tag = signal.data["tag"] - - if(input_tag == id_tag) - input_info = signal.data - else if(output_tag == id_tag) - output_info = signal.data - else - ..(signal) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 027b09a8dff54..3b139e772e8e3 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -146,7 +146,7 @@ new_computer.component_parts += movable_part new_computer.RefreshParts() - new_computer.on_construction() + new_computer.on_construction(user) qdel(src) return diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index c1ed15532a559..30c80c8c0a729 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -207,7 +207,7 @@ new_machine.component_parts += new_part new_machine.RefreshParts() - new_machine.on_construction() + new_machine.on_construction(user) qdel(src) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b8592c3eb0755..337ff727a38f9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -84,6 +84,10 @@ var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass" var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock + + /// Airlock pump that overrides airlock controlls when set up for cycling + var/obj/machinery/atmospherics/components/unary/airlock_pump/cycle_pump + /* Note mask_file needed some change due to the change from 513 to 514(the behavior of alpha filters seems to have changed) thats the reason why the mask dmi file for normal airlocks is not 32x32 but 64x64 and for the large airlocks instead of 64x32 its now 96x64 due to the fix to this problem*/ var/mask_file = 'icons/obj/doors/mask_32x32_doors.dmi' // because filters aren't allowed to have icon_states :( @@ -117,8 +121,6 @@ wire_security_level = max(wire_security_level, A.airlock_hack_difficulty) wires = set_wires(wire_security_level) - if(frequency) - set_frequency(frequency) if(glass) airlock_material = "glass" if(security_level > AIRLOCK_SECURITY_IRON) @@ -375,9 +377,6 @@ for(var/obj/machinery/door/airlock/otherlock as anything in close_others) otherlock.close_others -= src close_others.Cut() - if(id_tag) - for(var/obj/machinery/doorButtons/D in GLOB.machines) - D.removeMe(src) qdel(note) for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.remove_from_hud(src) @@ -388,28 +387,6 @@ note = null update_icon() -/obj/machinery/door/airlock/Bumped(atom/movable/AM) - if(operating) - return - if(ismecha(AM)) - var/obj/vehicle/sealed/mecha/mecha = AM - if(density) - if(mecha.occupants) - //Occupants are a list. Bump vars are stored on mobs, so we check those instead of mecha.occupants - for(var/mob/living/mecha_mobs in mecha.occupants) - if(world.time - mecha_mobs.last_bumped <= 10) - return - mecha_mobs.last_bumped = world.time - if(locked && (allowed(mecha.occupants) || check_access_list(mecha.operation_req_access)) && aac) - aac.request_from_door(src) - return - if(mecha.occupants && (src.allowed(mecha.occupants) || src.check_access_list(mecha.operation_req_access))) - open() - else - do_animate("deny") - return - . = ..() - /obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(isElectrified()) @@ -442,9 +419,6 @@ cyclelinkedairlock.delayed_close_requested = TRUE else addtimer(CALLBACK(cyclelinkedairlock, PROC_REF(close)), 2) - if(locked && aac && allowed(user)) - aac.request_from_door(src) - return ..() /obj/machinery/door/airlock/proc/isElectrified() @@ -844,9 +818,6 @@ /obj/machinery/door/airlock/attack_hand(mob/user) if(SEND_SIGNAL(src, COMSIG_AIRLOCK_TOUCHED, user) & COMPONENT_PREVENT_OPEN) . = TRUE - else if(locked && aac && allowed(user)) - aac.request_from_door(src) - . = TRUE else . = ..() if(.) @@ -1226,7 +1197,7 @@ sleep(open_speed - 1) density = FALSE z_flags &= ~(Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) - air_update_turf(1) + air_update_turf(TRUE, FALSE) sleep(1) layer = OPEN_DOOR_LAYER update_icon(AIRLOCK_OPEN, 1) @@ -1271,12 +1242,12 @@ if(air_tight) set_density(TRUE) z_flags |= (Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) - air_update_turf(1) + air_update_turf(TRUE, TRUE) sleep(1) if(!air_tight) set_density(TRUE) z_flags |= (Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) - air_update_turf(1) + air_update_turf(TRUE, TRUE) sleep(open_speed - 1) if(!safe) crush() @@ -1667,3 +1638,13 @@ /obj/machinery/door/airlock/proc/set_wires(wire_security_level) return new /datum/wires/airlock(src, wire_security_level) +/obj/machinery/door/airlock/proc/set_cycle_pump(obj/machinery/atmospherics/components/unary/airlock_pump/pump) + RegisterSignal(pump, COMSIG_PARENT_QDELETING, PROC_REF(unset_cycle_pump)) + cycle_pump = pump + +/obj/machinery/door/airlock/proc/unset_cycle_pump() + SIGNAL_HANDLER + if(locked) + unbolt() + say("Link broken, unbolting.") + cycle_pump = null diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 973eb196d23ce..c5aa09c8aa1e3 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -69,7 +69,6 @@ /obj/machinery/door/airlock/glass/incinerator autoclose = FALSE - frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE req_access = list(ACCESS_SYNDICATE) @@ -108,7 +107,6 @@ /obj/machinery/door/airlock/research/glass/incinerator autoclose = FALSE - frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE req_access = list(ACCESS_TOX) @@ -219,16 +217,20 @@ icon = 'icons/obj/doors/airlocks/station/plasma.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_plasma -/obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - if(plasma_ignition(6)) - PlasmaBurn() +/obj/machinery/door/airlock/plasma/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) /obj/machinery/door/airlock/plasma/bullet_act(obj/projectile/Proj) if(!(Proj.nodamage) && Proj.damage_type == BURN) if(plasma_ignition(6, Proj?.firer)) PlasmaBurn() . = ..() +/obj/machinery/door/airlock/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > 300) + +/obj/machinery/door/airlock/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + PlasmaBurn() /obj/machinery/door/airlock/plasma/proc/PlasmaBurn() var/obj/structure/door_assembly/DA @@ -240,9 +242,6 @@ DA.update_icon() DA.update_name() -/obj/machinery/door/airlock/plasma/BlockThermalConductivity() //we don't stop the heat~ - return 0 - /obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params) if(C.is_hot() > 300)//If the temperature of the object is over 300, then ignite if(plasma_ignition(6, user)) @@ -326,7 +325,6 @@ /obj/machinery/door/airlock/public/glass/incinerator autoclose = FALSE - frequency = FREQ_AIRLOCK_CONTROL heat_proof = TRUE req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm deleted file mode 100644 index 4e0fe2b2f3caa..0000000000000 --- a/code/game/machinery/doors/alarmlock.dm +++ /dev/null @@ -1,43 +0,0 @@ -/obj/machinery/door/airlock/alarmlock - name = "glass alarm airlock" - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' - opacity = FALSE - assemblytype = /obj/structure/door_assembly/door_assembly_public - glass = TRUE - - var/datum/radio_frequency/air_connection - var/air_frequency = FREQ_ATMOS_ALARMS - autoclose = FALSE - -/obj/machinery/door/airlock/alarmlock/Initialize(mapload) - . = ..() - air_connection = new - -/obj/machinery/door/airlock/alarmlock/Destroy() - SSradio.remove_object(src,air_frequency) - air_connection = null - return ..() - -/obj/machinery/door/airlock/alarmlock/Initialize(mapload) - . = ..() - SSradio.remove_object(src, air_frequency) - air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM) - open() - -/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) - ..() - if(machine_stat & (NOPOWER|BROKEN)) - return - - var/alarm_area = signal.data["zone"] - var/alert = signal.data["alert"] - - if(alarm_area == get_area_name(src)) - switch(alert) - if("severe") - autoclose = TRUE - close() - if("minor", "clear") - autoclose = FALSE - open() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 685d6f52226e8..984237ea73245 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -13,7 +13,7 @@ z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP max_integrity = 350 armor_type = /datum/armor/machinery_door - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY flags_1 = PREVENT_CLICK_UNDER_1 ricochet_chance_mod = 0.8 damage_deflection = 10 @@ -57,7 +57,7 @@ . = ..() set_init_door_layer() update_freelook_sight() - air_update_turf(1) + air_update_turf(TRUE, TRUE) GLOB.airlocks += src spark_system = new /datum/effect_system/spark_spread spark_system.set_up(2, 1, src) @@ -93,6 +93,7 @@ if(spark_system) qdel(spark_system) spark_system = null + air_update_turf(TRUE, FALSE) return ..() /obj/machinery/door/Bumped(atom/movable/AM) @@ -128,7 +129,8 @@ /obj/machinery/door/Move() var/turf/T = loc . = ..() - move_update_air(T) + if(density) //Gotta be closed my friend + move_update_air(T) /obj/machinery/door/CanAllowThrough(atom/movable/mover, border_dir) . = ..() @@ -199,31 +201,6 @@ /obj/machinery/door/proc/try_to_crowbar(obj/item/I, mob/user) return -/obj/machinery/door/proc/is_holding_pressure() - var/turf/open/T = loc - if(!T) - return FALSE - if(!density) - return FALSE - // alrighty now we check for how much pressure we're holding back - var/min_moles = T.air.total_moles() - var/max_moles = min_moles - // okay this is a bit hacky. First, we set density to 0 and recalculate our adjacent turfs - density = FALSE - T.ImmediateCalculateAdjacentTurfs() - // then we use those adjacent turfs to figure out what the difference between the lowest and highest pressures we'd be holding is - for(var/turf/open/T2 in T.atmos_adjacent_turfs) - if((flags_1 & ON_BORDER_1) && get_dir(src, T2) != dir) - continue - var/moles = T2.air.total_moles() - if(moles < min_moles) - min_moles = moles - if(moles > max_moles) - max_moles = moles - density = TRUE - T.ImmediateCalculateAdjacentTurfs() // alright lets put it back - return max_moles - min_moles > 20 - /obj/machinery/door/attackby(obj/item/I, mob/user, params) if(user.a_intent != INTENT_HARM && (I.tool_behaviour == TOOL_CROWBAR || istype(I, /obj/item/fireaxe))) try_to_crowbar(I, user) @@ -306,7 +283,7 @@ update_appearance() set_opacity(0) operating = FALSE - air_update_turf(1) + air_update_turf(TRUE, FALSE) update_freelook_sight() if(autoclose) spawn(autoclose) @@ -340,7 +317,7 @@ if(visible && !glass) set_opacity(1) operating = FALSE - air_update_turf(1) + air_update_turf(TRUE, TRUE) update_freelook_sight() if(safe) CheckForMobs() @@ -398,11 +375,6 @@ if(!glass && GLOB.cameranet) GLOB.cameranet.updateVisibility(src, 0) -/obj/machinery/door/BlockThermalConductivity() // All non-glass airlocks block heat, this is intended. - if(opacity || heat_proof) - return 1 - return 0 - /obj/machinery/door/morgue icon = 'icons/obj/doors/doormorgue.dmi' diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index f1f6c96ebf02b..eca1898a5ab0b 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -1,11 +1,8 @@ -#define CONSTRUCTION_COMPLETE 0 //No construction done - functioning as normal #define CONSTRUCTION_PANEL_OPEN 1 //Maintenance panel is open, still functioning -#define CONSTRUCTION_WIRES_EXPOSED 2 //Cover plate is removed, wires are available -#define CONSTRUCTION_GUTTED 3 //Wires are removed, circuit ready to remove -#define CONSTRUCTION_NOCIRCUIT 4 //Circuit board removed, can safely weld apart +#define CONSTRUCTION_NO_CIRCUIT 2 //Circuit board removed, can safely weld apart +#define DEFAULT_STEP_TIME 20 /// default time for each step +#define REACTIVATION_DELAY (3 SECONDS) // Delay on reactivation, used to prevent dumb crowbar things. Just trust me -#define RECLOSE_DELAY 5 SECONDS // How long until a firelock tries to shut itself if it's blocking a vacuum. -#define FIRE_ALARM 2 /obj/machinery/door/firedoor name = "firelock" desc = "A convenable firelock. It has a card reader and a set of indicator lights on the side." @@ -30,13 +27,44 @@ open_speed = 2 req_one_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) processing_flags = START_PROCESSING_MANUALLY - var/emergency_close_timer = 0 - var/nextstate = null + assemblytype = /obj/structure/firelock_frame + + COOLDOWN_DECLARE(activation_cooldown) + + ///X offset for the overlay lights, so that they line up with the thin border firelocks + var/light_xoffset = 0 + ///Y offset for the overlay lights, so that they line up with the thin border firelocks + var/light_yoffset = 0 + + var/boltslocked = TRUE + ///List of areas we handle. See calculate_affecting_areas() var/list/affecting_areas - var/list/access_log - var/process_ticker //Ratelimit process to one check ~5 process ticks - + ///For the few times we affect only the area we're actually in. Set during Init. If we get moved, we don't update, but this is consistant with fire alarms and also kinda funny so call it intentional. + var/area/my_area + ///List of problem turfs with bad temperature + var/list/turf/issue_turfs + ///Tracks if the firelock is being held open by a crowbar. If so, we don't close until they walk away + var/being_held_open = FALSE + ///Should the firelock ignore atmosphere when choosing to stay open/closed? + var/ignore_alarms = FALSE + ///Type of alarm we're under. See code/defines/firealarm.dm for the list. This var being null means there is no alarm. + var/alarm_type = null + ///Is this firelock active/closed? + var/active = FALSE + ///The merger_id and merger_typecache variables are used to make rows of firelocks activate at the same time. + var/merger_id = "firelocks" + var/static/list/merger_typecache + + ///Overlay object for the warning lights. This and some plane settings allows the lights to glow in the dark. + var/mutable_appearance/warn_lights + + ///looping sound datum for our fire alarm siren. + var/datum/looping_sound/firealarm/soundloop + ///Keeps track of if we're playing the alarm sound loop (as only one firelock per group should be). Used during power changes. + var/is_playing_alarm = FALSE + ///Delay before we deactivate the firelock after detecting the air is fine. + var/activation_delay /datum/armor/door_firedoor melee = 30 @@ -50,7 +78,42 @@ /obj/machinery/door/firedoor/Initialize(mapload) . = ..() - CalculateAffectingAreas() + id_tag = assign_random_name() + soundloop = new(src, FALSE) + calculate_affecting_areas() + my_area = get_area(src) + if(name == initial(name)) + update_name() + if(!merger_typecache) + merger_typecache = typecacheof(/obj/machinery/door/firedoor) + + RegisterSignal(src, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_power_restore)) + RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_loss)) + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/door/firedoor/LateInitialize() + . = ..() + RegisterSignal(src, COMSIG_MERGER_ADDING, PROC_REF(merger_adding)) + RegisterSignal(src, COMSIG_MERGER_REMOVING, PROC_REF(merger_removing)) + GetMergeGroup(merger_id, merger_typecache) + register_adjacent_turfs() + + if(alarm_type) // Fucking subtypes fucking mappers fucking hhhhhhhh + start_activation_process(alarm_type) + +/** + * Sets the offset for the warning lights. + * + * Used for special firelocks with light overlays that don't line up to their sprite. + */ +/obj/machinery/door/firedoor/proc/adjust_lights_starting_offset() + return + +/obj/machinery/door/firedoor/Destroy() + remove_from_areas() + unregister_adjacent_turfs(loc) + QDEL_NULL(soundloop) + return ..() /obj/machinery/door/firedoor/examine(mob/user) . = ..() @@ -62,33 +125,288 @@ . += span_notice("It is welded shut. The floor bolts have been locked by screws.") else . += span_notice("The bolt locks have been unscrewed, but the bolts themselves are still wrenched to the floor.") + if(obj_flags & EMAGGED) + . += span_warning("Its access panel is smoking slightly.") + +/obj/machinery/door/firedoor/update_name(updates) + . = ..() + name = "[get_area_name(my_area)] [initial(name)] [id_tag]" + +/** + * Calculates what areas we should worry about. + * + * This proc builds a list of areas we are in and areas we border + * and writes it to affecting_areas. + */ +/obj/machinery/door/firedoor/proc/calculate_affecting_areas() + var/list/new_affecting_areas = get_adjacent_open_areas(src) | get_area(src) + if(compare_list(new_affecting_areas, affecting_areas)) + return //No changes needed -/obj/machinery/door/firedoor/proc/CalculateAffectingAreas() remove_from_areas() - affecting_areas = get_adjacent_open_areas(src) | get_area(src) - for(var/I in affecting_areas) - var/area/A = I - LAZYADD(A.firedoors, src) + affecting_areas = new_affecting_areas + for(var/area/place in affecting_areas) + LAZYADD(place.firedoors, src) + if(active) + add_as_source() -/obj/machinery/door/firedoor/closed - icon_state = "door_closed" - opacity = TRUE - density = TRUE - z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP - processing_flags = START_PROCESSING_ON_INIT +/obj/machinery/door/firedoor/proc/remove_from_areas() + remove_as_source() + for(var/area/place in affecting_areas) + LAZYREMOVE(place.firedoors, src) -//see also turf/AfterChange for adjacency shennanigans +/obj/machinery/door/firedoor/proc/merger_adding(obj/machinery/door/firedoor/us, datum/merger/new_merger) + SIGNAL_HANDLER + if(new_merger.id != merger_id) + return + RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, PROC_REF(refresh_shared_turfs)) -/obj/machinery/door/firedoor/proc/remove_from_areas() - if(affecting_areas) - for(var/I in affecting_areas) - var/area/A = I - LAZYREMOVE(A.firedoors, src) +/obj/machinery/door/firedoor/proc/merger_removing(obj/machinery/door/firedoor/us, datum/merger/old_merger) + SIGNAL_HANDLER + if(old_merger.id != merger_id) + return + UnregisterSignal(old_merger, COMSIG_MERGER_REFRESH_COMPLETE) -/obj/machinery/door/firedoor/Destroy() - remove_from_areas() - affecting_areas.Cut() - return ..() +/obj/machinery/door/firedoor/proc/refresh_shared_turfs(datum/source, list/leaving_members, list/joining_members) + SIGNAL_HANDLER + var/datum/merger/temp_group = source + if(temp_group.origin != src) + return + var/list/shared_problems = list() // We only want to do this once, this is a nice way of pulling that off + for(var/obj/machinery/door/firedoor/firelock as anything in temp_group.members) + firelock.issue_turfs = shared_problems + for(var/dir in GLOB.cardinals) + var/turf/checked_turf = get_step(get_turf(firelock), dir) + if(!checked_turf) + continue + if(isclosedturf(checked_turf)) + continue + process_results(checked_turf) + +/obj/machinery/door/firedoor/proc/register_adjacent_turfs() + if(!loc) + return + + var/turf/our_turf = get_turf(loc) + RegisterSignal(our_turf, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS, PROC_REF(process_results)) + for(var/dir in GLOB.cardinals) + var/turf/checked_turf = get_step(our_turf, dir) + + if(!checked_turf) + continue + + RegisterSignal(checked_turf, COMSIG_TURF_CHANGE, PROC_REF(adjacent_change)) + RegisterSignal(checked_turf, COMSIG_TURF_EXPOSE, PROC_REF(process_results)) + if(!isopenturf(checked_turf)) + continue + process_results(checked_turf) + +/obj/machinery/door/firedoor/proc/unregister_adjacent_turfs(atom/old_loc) + if(!loc) + return + + var/turf/our_turf = get_turf(old_loc) + UnregisterSignal(our_turf, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) + for(var/dir in GLOB.cardinals) + var/turf/checked_turf = get_step(our_turf, dir) + + if(!checked_turf) + continue + + UnregisterSignal(checked_turf, COMSIG_TURF_CHANGE) + UnregisterSignal(checked_turf, COMSIG_TURF_EXPOSE) + +// If a turf adjacent to us changes, recalc our affecting areas when it's done yeah? +/obj/machinery/door/firedoor/proc/adjacent_change(turf/changed, path, list/new_baseturfs, flags, list/post_change_callbacks) + SIGNAL_HANDLER + post_change_callbacks += CALLBACK(src, PROC_REF(calculate_affecting_areas)) + post_change_callbacks += CALLBACK(src, PROC_REF(process_results), changed) //check the atmosphere of the changed turf so we don't hold onto alarm if a wall is built + +/obj/machinery/door/firedoor/proc/check_atmos(turf/checked_turf) + var/datum/gas_mixture/environment = checked_turf.return_air() + if(!environment) + stack_trace("We tried to check a gas_mixture that doesn't exist for its firetype, what are you DOING") + return + + if(environment.temperature >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + return FIRELOCK_ALARM_TYPE_HOT + if(environment.temperature <= BODYTEMP_COLD_DAMAGE_LIMIT) + return FIRELOCK_ALARM_TYPE_COLD + return + +/obj/machinery/door/firedoor/proc/process_results(datum/source) + SIGNAL_HANDLER + + for(var/area/place in affecting_areas) + if(!place.fire_detect) //if any area is set to disable detection + return + + var/turf/checked_turf = source + var/result = check_atmos(checked_turf) + + if(result && TURF_SHARES(checked_turf)) + issue_turfs |= checked_turf + if(alarm_type) // If you've already got an alarm, go away + return + // Store our alarm type, in case we can't activate for some reason + alarm_type = result + if(!ignore_alarms) + start_activation_process(result) + if(activation_delay) + deltimer(activation_delay) + activation_delay = null + else if(length(issue_turfs)) + issue_turfs -= checked_turf + if(length(issue_turfs) && alarm_type != FIRELOCK_ALARM_TYPE_GENERIC) + return + alarm_type = null + if(!ignore_alarms) + activation_delay = addtimer(CALLBACK(src, PROC_REF(start_deactivation_process)), 5 SECONDS, TIMER_STOPPABLE) + + + +/** + * Begins activation process of us and our neighbors. + * + * This proc will call activate() on every fire lock (including us) listed + * in the merge group datum. Returns without doing anything if we're already active, cause of course + * + * Arguments: + * code should be one of three defined alarm types, or can be not supplied. Will dictate the color of the fire alarm lights, and defaults to "firelock_alarm_type_generic" +*/ +/obj/machinery/door/firedoor/proc/start_activation_process(code = FIRELOCK_ALARM_TYPE_GENERIC) + if(active) + return //We're already active + soundloop.start() + is_playing_alarm = TRUE + my_area.fault_status = AREA_FAULT_AUTOMATIC + my_area.fault_location = name + var/datum/merger/merge_group = GetMergeGroup(merger_id, merger_typecache) + for(var/obj/machinery/door/firedoor/buddylock as anything in merge_group.members) + buddylock.activate(code) + +/** + * Begins deactivation process of us and our neighbors. + * + * This proc will call reset() on every fire lock (including us) listed + * in the merge group datum. sets our alarm type to null, signifying no alarm. + */ +/obj/machinery/door/firedoor/proc/start_deactivation_process() + soundloop.stop() + is_playing_alarm = FALSE + my_area.fault_status = AREA_FAULT_NONE + my_area.fault_location = null + var/datum/merger/merge_group = GetMergeGroup(merger_id, merger_typecache) + for(var/obj/machinery/door/firedoor/buddylock as anything in merge_group.members) + buddylock.reset() + +/** + * Proc that handles activation of the firelock and all this details + * + * Sets active and alarm type to properly represent our state. + * Also calls set_status() on all fire alarms in all affected areas, tells + * the area the firelock sits in to report the event (AI, alarm consoles, etc) + * and finally calls correct_state(), which will handle opening or closing + * this fire lock. + */ +/obj/machinery/door/firedoor/proc/activate(code = FIRELOCK_ALARM_TYPE_GENERIC) + SIGNAL_HANDLER + if(active) + return //Already active + if(ignore_alarms && code != FIRELOCK_ALARM_TYPE_GENERIC) + return + if(code != FIRELOCK_ALARM_TYPE_GENERIC && !COOLDOWN_FINISHED(src, activation_cooldown)) // Non generic activation, subject to crowbar safety + // Properly activate once the timeleft's up + addtimer(CALLBACK(src, PROC_REF(activate), code), COOLDOWN_TIMELEFT(src, activation_cooldown)) + return + active = TRUE + alarm_type = code + add_as_source() + update_icon() //Sets the door lights even if the door doesn't move. + correct_state() + + +/// Adds this fire door as a source of trouble to all of its areas +/obj/machinery/door/firedoor/proc/add_as_source() + for(var/area/place in affecting_areas) + LAZYADD(place.active_firelocks, src) + if(LAZYLEN(place.active_firelocks) != 1) + continue + //if we're the first to activate in this particular area + place.set_fire_effect(TRUE, AREA_FAULT_AUTOMATIC, name) //bathe in red + if(place == my_area) + // We'll limit our reporting to just the area we're on. If the issue affects bordering areas, they can report it themselves + place.alarm_manager.send_alarm(ALARM_FIRE, place) + +/** + * Proc that handles reset steps + * + * Clears the alarm state and attempts to open the firelock. + */ +/obj/machinery/door/firedoor/proc/reset() + SIGNAL_HANDLER + alarm_type = null + active = FALSE + remove_as_source() + soundloop.stop() + is_playing_alarm = FALSE + update_icon() //Sets the door lights even if the door doesn't move. + correct_state() + +/** + * Open the firedoor without resetting existing alarms + * + * * delay - Reconsider if this door should be open or closed after some period + * + */ +/obj/machinery/door/firedoor/proc/crack_open(delay) + active = FALSE + ignore_alarms = TRUE + if(!length(issue_turfs)) // Generic alarms get out + alarm_type = null + + soundloop.stop() + is_playing_alarm = FALSE + remove_as_source() + update_icon() //Sets the door lights even if the door doesn't move. + correct_state() + + /// Please be called 3 seconds after the LAST open, rather then 3 seconds after the first + addtimer(CALLBACK(src, PROC_REF(release_constraints)), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + +/** + * Reset our temporary alarm ignoring + * Consider if we should close ourselves/our neighbors or not + */ +/obj/machinery/door/firedoor/proc/release_constraints() + ignore_alarms = FALSE + if(!alarm_type || active) // If we have no alarm type, or are already active, go away + return + // Do we even care about temperature? + for(var/area/place in affecting_areas) + if(!place.fire_detect) // If any area is set to disable detection + return + // Otherwise, reactivate ourselves + start_activation_process(alarm_type) + +/// Removes this firedoor from all areas it's serving as a source of problems for +/obj/machinery/door/firedoor/proc/remove_as_source() + for(var/area/place in affecting_areas) + if(!LAZYLEN(place.active_firelocks)) // If it has no active firelocks, do nothing + continue + LAZYREMOVE(place.active_firelocks, src) + if(LAZYLEN(place.active_firelocks)) // If we were the last firelock still active, clear the area effects + continue + place.set_fire_effect(FALSE, AREA_FAULT_NONE, name) + if(place == my_area) + place.alarm_manager.clear_alarm(ALARM_FIRE, place) + +/obj/machinery/door/firedoor/on_emag(mob/user) + ..() + obj_flags |= EMAGGED + playsound(src, 'sound/machines/terminal_error.ogg', 50, 1) + do_sparks(5, TRUE, src) + INVOKE_ASYNC(src, PROC_REF(open)) /obj/machinery/door/firedoor/Bumped(atom/movable/AM) if(panel_open || operating) @@ -100,9 +418,19 @@ /obj/machinery/door/firedoor/bumpopen(mob/living/user) return FALSE //No bumping to open, not even in mechs -/obj/machinery/door/firedoor/power_change() - . = ..() - INVOKE_ASYNC(src, PROC_REF(latetoggle)) + +/obj/machinery/door/firedoor/proc/on_power_loss() + SIGNAL_HANDLER + + soundloop.stop() + +/obj/machinery/door/firedoor/proc/on_power_restore() + SIGNAL_HANDLER + + correct_state() + + if(is_playing_alarm) + soundloop.start() /obj/machinery/door/firedoor/attack_hand(mob/user) . = ..() @@ -131,80 +459,46 @@ C.play_tool_sound(src) user.visible_message(span_notice("[user] starts undoing [src]'s bolts..."), \ span_notice("You start unfastening [src]'s floor bolts...")) - if(!C.use_tool(src, user, 50)) + if(!C.use_tool(src, user, DEFAULT_STEP_TIME)) return playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) user.visible_message(span_notice("[user] unfastens [src]'s bolts."), \ span_notice("You undo [src]'s floor bolts.")) deconstruct(TRUE) - return + return TRUE if(C.tool_behaviour == TOOL_SCREWDRIVER) user.visible_message(span_notice("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts."), \ span_notice("You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.")) C.play_tool_sound(src) boltslocked = !boltslocked return - if(C.tool_behaviour == TOOL_MULTITOOL) - if(!access_log) - to_chat(user, span_warning("\the [C] beeps, 'Access Log Empty.'")) - return - to_chat(user, span_notice("\the [C] beeps, 'Dumping access log...'")) - for(var/entry in access_log) - to_chat(user, span_noticerobot("[entry]")) - return ..() -/obj/machinery/door/firedoor/try_to_activate_door(obj/item/I, mob/user) - if(!density || welded) +/obj/machinery/door/firedoor/try_to_activate_door(obj/item/attacked_item, mob/user) + if(!density || welded || !attacked_item) return - var/obj/item/card/id/id_card = I.GetID() + var/obj/item/card/id/id_card = attacked_item.GetID() if(istype(id_card)) - if((check_safety(user) == TRUE) || check_access(id_card)) - log_opening(id_card, user, check_safety(user)) + if((alarm_type == FIRELOCK_ALARM_TYPE_GENERIC) || check_access(id_card)) playsound(src, 'sound/machines/beep.ogg', 50, 1) open() return else - log_opening(id_card, user, -1) to_chat(user, span_danger("Access Denied, User not authorized to override alarms or pressure checks.")) playsound(src, 'sound/machines/terminal_error.ogg', 50, 1) return to_chat(user, span_warning("You try to pull the card reader. Nothing happens.")) -/obj/machinery/door/firedoor/on_emag(mob/user) - ..() - playsound(src, 'sound/machines/terminal_error.ogg', 50, 1) - do_sparks(5, TRUE, src) - open() - -/obj/machinery/door/firedoor/proc/log_opening(obj/item/card/id/I, mob/user, safe) - var/safestate = "UNK_STATE:" - switch(safe) - if(-1)//Rejected - safestate = "USR_NOACC:" - if(FALSE)//Unsafe, Atmos - safestate = "OVER_SENS:" - if(TRUE)//Safe. - safestate = "SAFE_OPEN:" - if(FIRE_ALARM) - safestate = "OVER_ALRM:" - LAZYADD(access_log, "[safestate]|N:[I.registered_name]|A:[I.assignment]|T_OFFSET:[DisplayTimeText(world.time - SSticker.round_start_time)]") - if(length(access_log) > 20) //Unless this is getting spammed this shouldn't happen. - access_log.Remove(access_log[1]) - if(!check_safety(user)) - log_game("[key_name(user)] has opened a firelock with a pressure difference or a fire alarm at [AREACOORD(loc)], using [I]") - user.log_message("has opened a firelock with a pressure difference or a fire alarm at [AREACOORD(loc)], using [I]", LOG_ATTACK) - - /obj/machinery/door/firedoor/try_to_weld(obj/item/weldingtool/W, mob/user) if(!W.tool_start_check(user, amount=0)) return user.visible_message(span_notice("[user] starts [welded ? "unwelding" : "welding"] [src]."), span_notice("You start welding [src].")) - if(W.use_tool(src, user, 40, volume=50)) + if(W.use_tool(src, user, DEFAULT_STEP_TIME, volume=50)) welded = !welded to_chat(user, span_danger("[user] [welded?"welds":"unwelds"] [src]."), span_notice("You [welded ? "weld" : "unweld"] [src].")) update_icon() + correct_state() /obj/machinery/door/firedoor/try_to_crowbar(obj/item/crowbar, mob/user) @@ -213,45 +507,32 @@ if(density) if(!(machine_stat & NOPOWER)) - LAZYADD(access_log, "MOTOR_ERR:|MOTOR CONTROLLER REPORTED BACKDRIVE|T_OFFSET:[DisplayTimeText(world.time - SSticker.round_start_time)]") - if(length(access_log) > 20) //Unless this is getting spammed this shouldn't happen. - access_log.Remove(access_log[1]) - to_chat(user, span_warning("You begin forcing open \the [src], the motors whine...")) + to_chat(user, span_warning("You begin forcing open the [src], the motors whine...")) playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) if(!crowbar.use_tool(src, user, 10 SECONDS)) return else - to_chat(user, span_notice("You begin forcing open \the [src], the motors don't resist...")) + to_chat(user, span_notice("You begin forcing open the [src], the motors don't resist...")) playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) if(!crowbar.use_tool(src, user, 1 SECONDS)) return - if(!check_safety(user)) + if(!(alarm_type != FIRELOCK_ALARM_TYPE_GENERIC)) log_game("[key_name(user)] has opened a firelock with a pressure difference or a fire alarm at [AREACOORD(loc)], using a crowbar") user.log_message("has opened a firelock with a pressure difference or a fire alarm at [AREACOORD(loc)], using a crowbar", LOG_ATTACK) open() + if(active) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) else close() - -/obj/machinery/door/firedoor/proc/check_safety(mob/user, check_alarm = TRUE) - var/area/A = get_area(src) - if(check_alarm && A && A.fire) - return FIRE_ALARM - return !is_holding_pressure() - -/obj/machinery/door/firedoor/allowed(mob/M) - if(check_safety(M))//Passing the mob here is cargo cult programming, I can't see what wants it. - return TRUE - update_icon() - return ..() - - /obj/machinery/door/firedoor/attack_silicon(mob/user) add_fingerprint(user) - if(welded || operating || machine_stat & NOPOWER) + if(welded || operating || machine_stat & NOPOWER || (obj_flags & EMAGGED)) return TRUE if(density) open() + if(alarm_type) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) else close() return TRUE @@ -262,6 +543,8 @@ to_chat(user, span_warning("[src] refuses to budge!")) return open() + if(alarm_type) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) /obj/machinery/door/firedoor/do_animate(animation) switch(animation) @@ -270,202 +553,124 @@ if("closing") flick("door_closing", src) -/obj/machinery/door/firedoor/update_icon() - cut_overlays() - if(density) - icon_state = "door_closed" - if(welded) - add_overlay("welded") - switch(check_safety()) //TODO: Check Global Override here. Find some way to update the icon without making firedoors process? - if(FALSE) //Unsafe, Atmos. - add_overlay("overlay_pressure") - if(FIRE_ALARM) //Unsafe, Alarm. - add_overlay("overlay_alarm") - else - icon_state = "door_open" - if(welded) - add_overlay("welded_open") +/obj/machinery/door/firedoor/update_icon_state() + . = ..() + icon_state = "[base_icon_state]_[density ? "closed" : "open"]" + +/obj/machinery/door/firedoor/update_overlays() + . = ..() + if(welded) + . += density ? "welded" : "welded_open" + if(alarm_type && powered() && !ignore_alarms) + var/mutable_appearance/hazards + hazards = mutable_appearance(icon, "[(obj_flags & EMAGGED) ? "firelock_alarm_type_emag" : alarm_type]") + hazards.pixel_x = light_xoffset + hazards.pixel_y = light_yoffset + . += hazards + hazards = emissive_appearance(icon, "[(obj_flags & EMAGGED) ? "firelock_alarm_type_emag" : alarm_type]", layer, alpha = src.alpha) + hazards.pixel_x = light_xoffset + hazards.pixel_y = light_yoffset + . += hazards + ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) + +/** + * Corrects the current state of the door, based on its activity. + * + * This proc is called after weld and power restore events. Gives the + * illusion that the door is constantly attempting to move without actually + * having to process it. Timers also call this, so that if activity + * changes during the timer, the door doesn't close or open incorrectly. + */ +/obj/machinery/door/firedoor/proc/correct_state() + if(obj_flags & EMAGGED || being_held_open || QDELETED(src)) + return //Unmotivated, indifferent, we have no real care what state we're in anymore. + if(active && !density) //We should be closed but we're not + INVOKE_ASYNC(src, PROC_REF(close)) + return + if(!active && density) //We should be open but we're not + INVOKE_ASYNC(src, PROC_REF(open)) + return /obj/machinery/door/firedoor/open() + if(welded) + return + var/old_activity = active if(density && !operating) //This is hacky but gets the sound to play on time. playsound(src, 'sound/machines/firedoor_open.ogg', 30, 1) . = ..() - if(.) - STOP_PROCESSING(SSmachines, src) - latetoggle() - + if(old_activity != active) //Something changed while we were sleeping + correct_state() //So we should re-evaluate our state /obj/machinery/door/firedoor/close() - if(HAS_TRAIT(loc, TRAIT_FIREDOOR_STOP) || (obj_flags & EMAGGED)) + if(HAS_TRAIT(loc, TRAIT_FIREDOOR_STOP)) return - if(!density && !operating) //This is hacky but gets the sound to play on time. - playsound(src, 'sound/machines/firedoor_close.ogg', 30, 1) + var/old_activity = active . = ..() - if(.) - START_PROCESSING(SSmachines, src) - latetoggle() - -/obj/machinery/door/firedoor/process(delta_time) - process_ticker += delta_time - if(process_ticker < 5*delta_time) - return - process_ticker = 0 - update_icon() - -/obj/machinery/door/firedoor/proc/whack_a_mole(reconsider_immediately = FALSE) - set waitfor = 0 - for(var/cdir in GLOB.cardinals) - if((flags_1 & ON_BORDER_1) && cdir != dir) - continue - whack_a_mole_part(get_step(src, cdir), reconsider_immediately) - if(flags_1 & ON_BORDER_1) - whack_a_mole_part(get_turf(src), reconsider_immediately) - -/obj/machinery/door/firedoor/proc/whack_a_mole_part(turf/start_point, reconsider_immediately) - set waitfor = 0 - var/list/doors_to_close = list() - var/list/turfs = list() - turfs[start_point] = 1 - for(var/i = 1; (i <= turfs.len && i <= 11); i++) // check up to 11 turfs. - var/turf/open/T = turfs[i] - if(istype(T, /turf/open/space)) - return -1 - for(var/T2 in T.atmos_adjacent_turfs) - if(turfs[T2]) - continue - var/is_cut_by_unopen_door = FALSE - for(var/obj/machinery/door/firedoor/FD in T2) - if((FD.flags_1 & ON_BORDER_1) && get_dir(T2, T) != FD.dir) - continue - if(FD.operating || FD == src || FD.welded || FD.density) - continue - doors_to_close += FD - is_cut_by_unopen_door = TRUE - - for(var/obj/machinery/door/firedoor/FD in T) - if((FD.flags_1 & ON_BORDER_1) && get_dir(T, T2) != FD.dir) - continue - if(FD.operating || FD == src || FD.welded || FD.density) - continue - doors_to_close += FD - is_cut_by_unopen_door= TRUE - if(!is_cut_by_unopen_door) - turfs[T2] = 1 - if(turfs.len > 10) - return // too big, don't bother - for(var/obj/machinery/door/firedoor/FD in doors_to_close) - FD.emergency_pressure_stop(FALSE) - if(reconsider_immediately) - var/turf/open/T = FD.loc - if(istype(T)) - T.ImmediateCalculateAdjacentTurfs() - -/obj/machinery/door/firedoor/proc/emergency_pressure_stop(consider_timer = TRUE) - set waitfor = 0 - if(density || operating || welded) - return - if(world.time >= emergency_close_timer || !consider_timer) - close() + if(old_activity != active) //Something changed while we were sleeping + correct_state() //So we should re-evaluate our state /obj/machinery/door/firedoor/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - var/obj/structure/firelock_frame/F = new assemblytype(get_turf(src)) - F.dir = src.dir - if(disassembled) - F.constructionStep = CONSTRUCTION_PANEL_OPEN + var/turf/targetloc = get_turf(src) + if(disassembled || prob(40)) + var/obj/structure/firelock_frame/unbuilt_lock = new assemblytype(targetloc) + if(disassembled) + unbuilt_lock.constructionStep = CONSTRUCTION_PANEL_OPEN + else + unbuilt_lock.constructionStep = CONSTRUCTION_NO_CIRCUIT + unbuilt_lock.update_integrity(unbuilt_lock.max_integrity * 0.5) + unbuilt_lock.update_icon() else - F.constructionStep = CONSTRUCTION_WIRES_EXPOSED - F.update_integrity(F.max_integrity * 0.5) - F.update_icon() + new /obj/item/electronics/firelock (targetloc) qdel(src) +/obj/machinery/door/firedoor/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) + . = ..() + unregister_adjacent_turfs(old_loc) + register_adjacent_turfs() -/obj/machinery/door/firedoor/proc/latetoggle() - if(operating || machine_stat & NOPOWER || !nextstate) - return - switch(nextstate) - if(FIREDOOR_OPEN) - nextstate = null - open() - if(FIREDOOR_CLOSED) - nextstate = null - close() +/obj/machinery/door/firedoor/closed + icon_state = "door_closed" + density = TRUE + alarm_type = FIRELOCK_ALARM_TYPE_GENERIC /obj/machinery/door/firedoor/border_only icon = 'icons/obj/doors/firelocks/edge_Doorfire.dmi' flags_1 = ON_BORDER_1 - CanAtmosPass = ATMOS_PASS_PROC - assemblytype = /obj/structure/firelock_frame/border + can_atmos_pass = ATMOS_PASS_PROC + +/obj/machinery/door/firedoor/border_only/closed + icon_state = "door_closed" + density = TRUE + alarm_type = FIRELOCK_ALARM_TYPE_GENERIC /obj/machinery/door/firedoor/border_only/Initialize(mapload) . = ..() - + adjust_lights_starting_offset() var/static/list/loc_connections = list( COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) -/obj/machinery/door/firedoor/border_only/Destroy() - set_density(FALSE) - air_update_turf(1) - return ..() - -/obj/machinery/door/firedoor/border_only/closed - icon_state = "door_closed" - opacity = TRUE - density = TRUE +/obj/machinery/door/firedoor/border_only/adjust_lights_starting_offset() + light_xoffset = 0 + light_yoffset = 0 + switch(dir) + if(NORTH) + light_yoffset = 2 + if(SOUTH) + light_yoffset = 0 + if(EAST) + light_xoffset = 2 + if(WEST) + light_xoffset = -2 + update_overlays() + update_icon() -/obj/machinery/door/firedoor/border_only/close() - if(density) - return TRUE - if(operating || welded) - return - var/turf/T1 = get_turf(src) - var/turf/T2 = get_step(T1, dir) - for(var/mob/living/M in T1) - if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T2 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force) - var/mob/living/M2 = M.pulling - if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull) - to_chat(M, span_notice("You pull [M.pulling] through [src] right as it closes.")) - M.pulling.forceMove(T1) - M.start_pulling(M2) - for(var/mob/living/M in T2) - if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T1 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force) - var/mob/living/M2 = M.pulling - if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull) - to_chat(M, span_notice("You pull [M.pulling] through [src] right as it closes.")) - M.pulling.forceMove(T2) - M.start_pulling(M2) +/obj/machinery/door/firedoor/border_only/Moved() . = ..() - -/obj/machinery/door/firedoor/border_only/check_safety(mob/user) - var/area/A = get_area(src) - if((!A || !A.fire) && !is_holding_pressure()) - return TRUE - whack_a_mole(TRUE) // WOOP WOOP SIDE EFFECTS - var/turf/T = loc - var/turf/T2 = get_step(T, dir) - if(!T || !T2) - return - var/status1 = check_door_side(T) - var/status2 = check_door_side(T2) - if((status1 == 1 && status2 == -1) || (status1 == -1 && status2 == 1)) - return FALSE - return TRUE - -/obj/machinery/door/firedoor/border_only/proc/check_door_side(turf/open/start_point) - var/list/turfs = list() - turfs[start_point] = 1 - for(var/i = 1; (i <= turfs.len && i <= 11); i++) // check up to 11 turfs. - var/turf/open/T = turfs[i] - if(istype(T, /turf/open/space)) - return -1 - for(var/T2 in T.atmos_adjacent_turfs) - turfs[T2] = 1 - if(turfs.len <= 10) - return 0 // not big enough to matter - return start_point.air.return_pressure() < 20 ? -1 : 1 + adjust_lights_starting_offset() /obj/machinery/door/firedoor/border_only/CanAllowThrough(atom/movable/mover, border_dir) . = ..() @@ -474,10 +679,8 @@ /obj/machinery/door/firedoor/border_only/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER - if(leaving.movement_type & PHASING) return - if(leaving == src) return // Let's not block ourselves. @@ -485,7 +688,7 @@ leaving.Bump(src) return COMPONENT_ATOM_BLOCK_EXIT -/obj/machinery/door/firedoor/border_only/CanAtmosPass(turf/T) +/obj/machinery/door/firedoor/border_only/can_atmos_pass(turf/T, vertical = FALSE) if(get_dir(loc, T) == dir) return !density else @@ -528,204 +731,134 @@ name = "firelock frame" desc = "A partially completed firelock." icon = 'icons/obj/doors/firelocks/doorfire.dmi' - icon_state = "frame1" + icon_state = "frame2" anchored = FALSE density = TRUE z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP - var/constructionStep = CONSTRUCTION_NOCIRCUIT - var/reinforced = 0 + var/constructionStep = CONSTRUCTION_NO_CIRCUIT var/firelock_type = /obj/machinery/door/firedoor /obj/structure/firelock_frame/examine(mob/user) . = ..() switch(constructionStep) if(CONSTRUCTION_PANEL_OPEN) - . += span_notice("It is unbolted from the floor. A small loosely connected metal plate is covering the wires.") - if(!reinforced) + . += span_notice("It is unbolted from the floor. The circuit could be removed with a crowbar.") + if(firelock_type == /obj/machinery/door/firedoor) . += span_notice("It could be reinforced with plasteel.") - if(CONSTRUCTION_WIRES_EXPOSED) - . += span_notice("The maintenance plate has been pried away, and wires are trailing.") - if(CONSTRUCTION_GUTTED) - . += span_notice("The maintenance panel is missing wires and the circuit board is loosely connected.") - if(CONSTRUCTION_NOCIRCUIT) + if(CONSTRUCTION_NO_CIRCUIT) . += span_notice("There are no firelock electronics in the frame. The frame could be cut apart.") - if(obj_flags & EMAGGED) - . += span_warning("Its access panel is smoking slightly.") /obj/structure/firelock_frame/update_icon() ..() icon_state = "frame[constructionStep]" -/obj/structure/firelock_frame/attackby(obj/item/C, mob/user) +/obj/structure/firelock_frame/attackby(obj/item/attacking_object, mob/user) switch(constructionStep) if(CONSTRUCTION_PANEL_OPEN) - if(C.tool_behaviour == TOOL_CROWBAR) - C.play_tool_sound(src) - user.visible_message(span_notice("[user] starts prying something out from [src]..."), \ - span_notice("You begin prying out the wire cover...")) - if(!C.use_tool(src, user, 50)) + if(attacking_object.tool_behaviour == TOOL_CROWBAR) + attacking_object.play_tool_sound(src) + user.visible_message("[user] begins removing the circuit board from [src]...", \ + "You begin prying out the circuit board from [src]...") + if(!attacking_object.use_tool(src, user, DEFAULT_STEP_TIME)) return if(constructionStep != CONSTRUCTION_PANEL_OPEN) return - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - user.visible_message(span_notice("[user] pries out a metal plate from [src], exposing the wires."), \ - span_notice("You remove the cover plate from [src], exposing the wires.")) - constructionStep = CONSTRUCTION_WIRES_EXPOSED + playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE) + user.visible_message("[user] removes [src]'s circuit board.", \ + "You remove the circuit board from [src].") + new /obj/item/electronics/firelock(drop_location()) + constructionStep = CONSTRUCTION_NO_CIRCUIT update_icon() return - if(C.tool_behaviour == TOOL_WRENCH) - var/obj/machinery/door/firedoor/A = locate(/obj/machinery/door/firedoor) in get_turf(src) - if(A && A.dir == src.dir) + if(attacking_object.tool_behaviour == TOOL_WRENCH) + var/obj/machinery/door/firedoor/conflicting = locate(/obj/machinery/door/firedoor) in get_turf(src) + if(conflicting && ((type != /obj/structure/firelock_frame/border) || \ + !istype(conflicting, /obj/machinery/door/firedoor/border_only) || (conflicting.dir == dir))) to_chat(user, span_warning("There's already a firelock there.")) return - C.play_tool_sound(src) - user.visible_message(span_notice("[user] starts bolting down [src]..."), \ - span_notice("You begin bolting [src]...")) - if(!C.use_tool(src, user, 30)) + attacking_object.play_tool_sound(src) + user.visible_message("[user] starts bolting down [src]...", \ + "You begin bolting [src]...") + if(!attacking_object.use_tool(src, user, DEFAULT_STEP_TIME)) return - var/obj/machinery/door/firedoor/D = locate(/obj/machinery/door/firedoor) in get_turf(src) - if(D && D.dir == src.dir) + + conflicting = locate(/obj/machinery/door/firedoor) in get_turf(src) + if(conflicting && ((type != /obj/structure/firelock_frame/border) || \ + !istype(conflicting, /obj/machinery/door/firedoor/border_only) || (conflicting.dir == dir))) + to_chat(user, span_warning("There's already a firelock there.")) return - user.visible_message(span_notice("[user] finishes the firelock."), \ - span_notice("You finish the firelock.")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - var/obj/machinery/door/firedoor/F = new firelock_type(get_turf(src)) - F.dir = src.dir - F.update_icon() + user.visible_message("[user] finishes the firelock.", \ + "You finish the firelock.") + playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE) + var/obj/machinery/door/firedoor/D = new firelock_type(get_turf(src)) + D.setDir(dir) //Border firelocks qdel(src) - return - if(istype(C, /obj/item/stack/sheet/plasteel)) - var/obj/item/stack/sheet/plasteel/P = C - if(reinforced) + return TRUE + if(istype(attacking_object, /obj/item/stack/sheet/plasteel)) + var/obj/item/stack/sheet/plasteel/plasteel_sheet = attacking_object + if(firelock_type == /obj/machinery/door/firedoor/heavy) to_chat(user, span_warning("[src] is already reinforced.")) return - if(P.get_amount() < 2) + if(firelock_type != /obj/machinery/door/firedoor) + to_chat(user, span_warning("[src] cannot be reinforced.")) + return + if(plasteel_sheet.get_amount() < 2) to_chat(user, span_warning("You need more plasteel to reinforce [src].")) return - user.visible_message(span_notice("[user] begins reinforcing [src]..."), \ - span_notice("You begin reinforcing [src]...")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - if(do_after(user, 60, target = src)) - if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P) + user.visible_message("[user] begins reinforcing [src]...", \ + "You begin reinforcing [src]...") + playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE) + if(do_after(user, DEFAULT_STEP_TIME, target = src)) + if(constructionStep != CONSTRUCTION_PANEL_OPEN || firelock_type == /obj/machinery/door/firedoor/heavy || \ + plasteel_sheet.get_amount() < 2 || !plasteel_sheet) return - user.visible_message(span_notice("[user] reinforces [src]."), \ - span_notice("You reinforce [src].")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - P.use(2) - reinforced = TRUE + user.visible_message("[user] reinforces [src].", \ + "You reinforce [src].") + playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE) + plasteel_sheet.use(2) firelock_type = /obj/machinery/door/firedoor/heavy - return - - if(CONSTRUCTION_WIRES_EXPOSED) - if(C.tool_behaviour == TOOL_WIRECUTTER) - C.play_tool_sound(src) - user.visible_message(span_notice("[user] starts cutting the wires from [src]..."), \ - span_notice("You begin removing [src]'s wires...")) - if(!C.use_tool(src, user, 60)) + return QDELING(plasteel_sheet) + if(CONSTRUCTION_NO_CIRCUIT) + if(istype(attacking_object, /obj/item/electronics/firelock)) + user.visible_message("[user] starts adding [attacking_object] to [src]...", \ + "You begin adding a circuit board to [src]...") + playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE) + if(!do_after(user, DEFAULT_STEP_TIME, target = src)) return - if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) - return - user.visible_message(span_notice("[user] removes the wires from [src]."), \ - span_notice("You remove the wiring from [src], exposing the circuit board.")) - new/obj/item/stack/cable_coil(get_turf(src), 5) - constructionStep = CONSTRUCTION_GUTTED - update_icon() - return - if(C.tool_behaviour == TOOL_CROWBAR) - C.play_tool_sound(src) - user.visible_message(span_notice("[user] starts prying a metal plate into [src]..."), \ - span_notice("You begin prying the cover plate back onto [src]...")) - if(!C.use_tool(src, user, 80)) + if(constructionStep != CONSTRUCTION_NO_CIRCUIT) return - if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) - return - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - user.visible_message(span_notice("[user] pries the metal plate into [src]."), \ - span_notice("You pry [src]'s cover plate into place, hiding the wires.")) + qdel(attacking_object) + user.visible_message("[user] adds a circuit to [src].", \ + "You insert and secure [attacking_object].") + playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, TRUE) constructionStep = CONSTRUCTION_PANEL_OPEN update_icon() - return - if(CONSTRUCTION_GUTTED) - if(C.tool_behaviour == TOOL_CROWBAR) - user.visible_message(span_notice("[user] begins removing the circuit board from [src]..."), \ - span_notice("You begin prying out the circuit board from [src]...")) - if(!C.use_tool(src, user, 50, volume=50)) - return - if(constructionStep != CONSTRUCTION_GUTTED) - return - user.visible_message(span_notice("[user] removes [src]'s circuit board."), \ - span_notice("You remove the circuit board from [src].")) - new /obj/item/electronics/firelock(drop_location()) - constructionStep = CONSTRUCTION_NOCIRCUIT - update_icon() - return - if(istype(C, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/B = C - if(B.get_amount() < 5) - to_chat(user, span_warning("You need more wires to add wiring to [src].")) - return - user.visible_message(span_notice("[user] begins wiring [src]..."), \ - span_notice("You begin adding wires to [src]...")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - if(do_after(user, 60, target = src)) - if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B) - return - user.visible_message(span_notice("[user] adds wires to [src]."), \ - span_notice("You wire [src].")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - B.use(5) - constructionStep = CONSTRUCTION_WIRES_EXPOSED - update_icon() - return - if(CONSTRUCTION_NOCIRCUIT) - if(C.tool_behaviour == TOOL_WELDER) - if(!C.tool_start_check(user, amount=1)) + return TRUE + if(attacking_object.tool_behaviour == TOOL_WELDER) + if(!attacking_object.tool_start_check(user, amount=1)) return - user.visible_message(span_notice("[user] begins cutting apart [src]'s frame..."), \ - span_notice("You begin slicing [src] apart...")) + user.visible_message("[user] begins cutting apart [src]'s frame...", \ + "You begin slicing [src] apart...") - if(C.use_tool(src, user, 40, volume=50, amount=1)) - if(constructionStep != CONSTRUCTION_NOCIRCUIT) + if(attacking_object.use_tool(src, user, DEFAULT_STEP_TIME, volume=50)) + if(constructionStep != CONSTRUCTION_NO_CIRCUIT) return - var/turf/T = get_turf(src) - switch(firelock_type) - if(/obj/machinery/door/firedoor/heavy) - user.visible_message(span_notice("[user] cuts apart [src]!"), \ - span_notice("You cut [src] into iron and plasteel.")) - new /obj/item/stack/sheet/plasteel(T, 2) - new /obj/item/stack/sheet/iron(T, 3) - if(/obj/machinery/door/firedoor/window) - user.visible_message(span_notice("[user] cuts apart [src]!"), \ - span_notice("You cut [src] into reinforced glass.")) - new /obj/item/stack/sheet/rglass(T,2) - else - user.visible_message(span_notice("[user] cuts apart [src]!"), \ - span_notice("You cut [src] into iron.")) - new /obj/item/stack/sheet/iron(T, 3) + user.visible_message("[user] cuts apart [src]!", \ + "You cut [src] into metal.") + var/turf/tagetloc = get_turf(src) + new /obj/item/stack/sheet/iron(tagetloc, 3) + if(firelock_type == /obj/machinery/door/firedoor/heavy) + new /obj/item/stack/sheet/plasteel(tagetloc, 2) qdel(src) + return TRUE return - if(istype(C, /obj/item/electronics/firelock)) - user.visible_message(span_notice("[user] starts adding [C] to [src]..."), \ - span_notice("You begin adding a circuit board to [src]...")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - if(!do_after(user, 40, target = src)) - return - if(constructionStep != CONSTRUCTION_NOCIRCUIT) + if(istype(attacking_object, /obj/item/electroadaptive_pseudocircuit)) + var/obj/item/electroadaptive_pseudocircuit/raspberrypi = attacking_object + if(!raspberrypi.adapt_circuit(user, circuit_cost = DEFAULT_STEP_TIME * 1.5)) return - qdel(C) - user.visible_message(span_notice("[user] adds a circuit to [src]."), \ - span_notice("You insert and secure [C].")) - playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - constructionStep = CONSTRUCTION_GUTTED - update_icon() - return - if(istype(C, /obj/item/electroadaptive_pseudocircuit)) - var/obj/item/electroadaptive_pseudocircuit/P = C - if(!P.adapt_circuit(user, 30)) - return - user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ - span_notice("You adapt a firelock circuit and slot it into the assembly.")) - constructionStep = CONSTRUCTION_GUTTED + user.visible_message("[user] fabricates a circuit and places it into [src].", \ + "You adapt a firelock circuit and slot it into the assembly.") + constructionStep = CONSTRUCTION_PANEL_OPEN update_icon() return return ..() @@ -733,7 +866,7 @@ /obj/structure/firelock_frame/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_DECONSTRUCT) return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 16) - else if((constructionStep == CONSTRUCTION_NOCIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) + else if((constructionStep == CONSTRUCTION_NO_CIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) return FALSE @@ -742,7 +875,7 @@ if(RCD_UPGRADE_SIMPLE_CIRCUITS) user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ span_notice("You adapt a firelock circuit and slot it into the assembly.")) - constructionStep = CONSTRUCTION_GUTTED + constructionStep = CONSTRUCTION_PANEL_OPEN update_icon() return TRUE if(RCD_DECONSTRUCT) @@ -753,7 +886,6 @@ /obj/structure/firelock_frame/heavy name = "heavy firelock frame" - reinforced = TRUE firelock_type = /obj/machinery/door/firedoor/heavy /obj/structure/firelock_frame/border @@ -785,11 +917,7 @@ /obj/structure/firelock_frame/window/update_icon() return -#undef CONSTRUCTION_COMPLETE #undef CONSTRUCTION_PANEL_OPEN -#undef CONSTRUCTION_WIRES_EXPOSED -#undef CONSTRUCTION_GUTTED -#undef CONSTRUCTION_NOCIRCUIT - -#undef RECLOSE_DELAY -#undef FIRE_ALARM +#undef CONSTRUCTION_NO_CIRCUIT +#undef DEFAULT_STEP_TIME +#undef REACTIVATION_DELAY diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 990739e4d511d..4f4e657cd2746 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -14,7 +14,7 @@ flags_1 = ON_BORDER_1 opacity = FALSE pass_flags_self = PASSTRANSPARENT - CanAtmosPass = ATMOS_PASS_PROC + can_atmos_pass = ATMOS_PASS_PROC interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN network_id = NETWORK_DOOR_AIRLOCKS z_flags = NONE // reset zblock @@ -68,6 +68,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) /obj/machinery/door/window/ComponentInitialize() . = ..() + AddElement(/datum/element/atmos_sensitive) AddComponent(/datum/component/ntnet_interface) /obj/machinery/door/window/Destroy() @@ -76,6 +77,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) if(atom_integrity == 0) playsound(src, "shatter", 70, 1) electronics = null + var/turf/floor = get_turf(src) + floor.air_update_turf(TRUE, FALSE) return ..() /obj/machinery/door/window/update_icon() @@ -143,7 +146,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) return TRUE -/obj/machinery/door/window/CanAtmosPass(turf/T) +/obj/machinery/door/window/can_atmos_pass(turf/T, vertical = FALSE) if(get_dir(loc, T) == dir) return !density else @@ -189,7 +192,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) icon_state ="[base_state]open" sleep(operationdelay) set_density(FALSE) - air_update_turf(1) + air_update_turf(TRUE, FALSE) update_freelook_sight() if(operating == 1) //emag again @@ -212,7 +215,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) icon_state = base_state set_density(TRUE) - air_update_turf(1) + air_update_turf(TRUE, TRUE) update_freelook_sight() sleep(operationdelay) @@ -255,10 +258,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) C.name = name qdel(src) -/obj/machinery/door/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > T0C + (reinf ? 1600 : 800)) - take_damage(round(exposed_volume / 200), BURN, 0, 0) - ..() +/obj/machinery/door/window/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > T0C + (reinf ? 1600 : 800)) + +/obj/machinery/door/window/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(round(exposed_temperature / 200), BURN, 0, 0) /obj/machinery/door/window/should_emag(mob/user) // Don't allow emag if the door is currently open or moving diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 05b5aa15644e5..4ff9112d93481 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -136,7 +136,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/paper/record_printout) playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) /obj/machinery/doppler_array/proc/sense_explosion(datum/source,turf/epicenter,devastation_range,heavy_impact_range,light_impact_range, - took,orig_dev_range,orig_heavy_range,orig_light_range) + took,orig_dev_range,orig_heavy_range,orig_light_range,explosion_index) SIGNAL_HANDLER if(machine_stat & NOPOWER) diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 00a5886e971b0..d41159f152fb1 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -1,216 +1,282 @@ //States for airlock_control -#define AIRLOCK_STATE_INOPEN -2 -#define AIRLOCK_STATE_PRESSURIZE -1 -#define AIRLOCK_STATE_CLOSED 0 -#define AIRLOCK_STATE_DEPRESSURIZE 1 -#define AIRLOCK_STATE_OUTOPEN 2 - -/datum/computer/file/embedded_program/airlock_controller - var/id_tag - var/exterior_door_tag //Burn chamber facing door - var/interior_door_tag //Station facing door - var/airpump_tag //See: dp_vent_pump.dm - var/sensor_tag //See: /obj/machinery/airlock_sensor - var/sanitize_external //Before the interior airlock opens, do we first drain all gases inside the chamber and then repressurize? - - state = AIRLOCK_STATE_CLOSED - var/target_state = AIRLOCK_STATE_CLOSED - var/sensor_pressure = null +#define AIRLOCK_STATE_INOPEN "inopen" +#define AIRLOCK_STATE_PRESSURIZE "pressurize" +#define AIRLOCK_STATE_CLOSED "closed" +#define AIRLOCK_STATE_DEPRESSURIZE "depressurize" +#define AIRLOCK_STATE_OUTOPEN "outopen" -/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal) - var/receive_tag = signal.data["tag"] - if(!receive_tag) - return +/obj/machinery/airlock_controller + icon = 'icons/obj/airlock_machines.dmi' + icon_state = "airlock_control_standby" + base_icon_state = "airlock_control" - if(receive_tag==sensor_tag) - if(signal.data["pressure"]) - sensor_pressure = text2num(signal.data["pressure"]) + name = "airlock console" + density = FALSE - else if(receive_tag==exterior_door_tag) - memory["exterior_status"] = signal.data["door_status"] + power_channel = AREA_USAGE_ENVIRON - else if(receive_tag==interior_door_tag) - memory["interior_status"] = signal.data["door_status"] + // Setup parameters only + var/exterior_door_tag + var/interior_door_tag + var/airpump_tag + var/sensor_tag + var/sanitize_external - else if(receive_tag==airpump_tag) - if(signal.data["power"]) - memory["pump_status"] = signal.data["direction"] - else - memory["pump_status"] = "off" + var/datum/weakref/interior_door_ref + var/datum/weakref/exterior_door_ref + var/datum/weakref/pump_ref + var/datum/weakref/sensor_ref - else if(receive_tag==id_tag) - switch(signal.data["command"]) - if("cycle") - if(state < AIRLOCK_STATE_CLOSED) - target_state = AIRLOCK_STATE_OUTOPEN - else - target_state = AIRLOCK_STATE_INOPEN + var/last_pressure = null -/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) - switch(command) - if("cycle_closed") - target_state = AIRLOCK_STATE_CLOSED - if("cycle_exterior") - target_state = AIRLOCK_STATE_OUTOPEN - if("cycle_interior") - target_state = AIRLOCK_STATE_INOPEN - if("abort") - target_state = AIRLOCK_STATE_CLOSED + var/state = AIRLOCK_STATE_CLOSED + var/target_state = AIRLOCK_STATE_CLOSED + var/processing = FALSE -/datum/computer/file/embedded_program/airlock_controller/process() - var/process_again = 1 +/obj/machinery/airlock_controller/LateInitialize() + . = ..() + var/obj/machinery/door/interior_door = GLOB.objects_by_id_tag[interior_door_tag] + if (!isnull(interior_door_tag) && !istype(interior_door)) + stack_trace("interior_door_tag is set to [interior_door_tag], which is not a door ([interior_door || "null"])") + interior_door_ref = WEAKREF(interior_door) + + var/obj/machinery/door/exterior_door = GLOB.objects_by_id_tag[exterior_door_tag] + if (!isnull(exterior_door_tag) && !istype(exterior_door)) + stack_trace("exterior_door_tag is set to [exterior_door_tag], which is not a door ([exterior_door || "null"])") + exterior_door_ref = WEAKREF(exterior_door) + + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = GLOB.objects_by_id_tag[airpump_tag] + if (!isnull(airpump_tag) && !istype(pump)) + stack_trace("airpump_tag is set to [airpump_tag], which is not a pump ([pump || "null"])") + pump_ref = WEAKREF(pump) + + var/obj/machinery/airlock_sensor/sensor = GLOB.objects_by_id_tag[sensor_tag] + if (!isnull(sensor_tag) && !istype(sensor)) + stack_trace("sensor_tag is set to [sensor_tag], which is not a sensor ([sensor || "null"])") + sensor_ref = WEAKREF(sensor) + +/obj/machinery/airlock_controller/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AirlockController", src) + ui.set_autoupdate(TRUE) //When we click button, we change UI buttons. + ui.open() + +/obj/machinery/airlock_controller/process(delta_time) + var/process_again = TRUE while(process_again) - process_again = 0 + process_again = FALSE switch(state) - if(AIRLOCK_STATE_INOPEN) // state -2 - if(target_state > state) - if(memory["interior_status"] == "closed") + if(AIRLOCK_STATE_INOPEN) + if(target_state != state) + var/obj/machinery/door/airlock/interior_airlock = interior_door_ref.resolve() + if (isnull(interior_airlock)) + continue + + if(interior_airlock.density) state = AIRLOCK_STATE_CLOSED - process_again = 1 + process_again = TRUE else - post_signal(new /datum/signal(list( - "tag" = interior_door_tag, - "command" = "secure_close" - ))) + interior_airlock.secure_close() else - if(memory["pump_status"] != "off") - post_signal(new /datum/signal(list( - "tag" = airpump_tag, - "power" = 0, - "sigtype" = "command" - ))) + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = pump_ref.resolve() + + if(pump?.on) + pump.on = FALSE + pump.update_icon() if(AIRLOCK_STATE_PRESSURIZE) - if(target_state < state) + if(target_state == AIRLOCK_STATE_INOPEN) + var/sensor_pressure = sensor_pressure() + if (isnull(sensor_pressure)) + continue + if(sensor_pressure >= ONE_ATMOSPHERE*0.95) - if(memory["interior_status"] == "open") - state = AIRLOCK_STATE_INOPEN - process_again = 1 + var/obj/machinery/door/airlock/interior_airlock = interior_door_ref.resolve() + if (isnull(interior_airlock)) + continue + + if(interior_airlock.density) + interior_airlock?.secure_open() else - post_signal(new /datum/signal(list( - "tag" = interior_door_tag, - "command" = "secure_open" - ))) + state = AIRLOCK_STATE_INOPEN + process_again = TRUE else - var/datum/signal/signal = new(list( - "tag" = airpump_tag, - "sigtype" = "command" - )) - if(memory["pump_status"] == "siphon") - signal.data["stabilize"] = 1 - else if(memory["pump_status"] != "release") - signal.data["power"] = 1 - post_signal(signal) - else if(target_state > state) + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = pump_ref.resolve() + if (isnull(pump)) + continue + + if(pump.pump_direction == ATMOS_DIRECTION_SIPHONING) + pump.pressure_checks |= ATMOS_EXTERNAL_BOUND + pump.pump_direction = ATMOS_DIRECTION_RELEASING + else if(!pump.on) + pump.on = TRUE + pump.update_icon() + else state = AIRLOCK_STATE_CLOSED - process_again = 1 + process_again = TRUE if(AIRLOCK_STATE_CLOSED) - if(target_state > state) - if(memory["interior_status"] == "closed") + if(target_state == AIRLOCK_STATE_OUTOPEN) + var/obj/machinery/door/airlock/interior_airlock = interior_door_ref.resolve() + if (isnull(interior_airlock)) + continue + + if(interior_airlock.density) state = AIRLOCK_STATE_DEPRESSURIZE - process_again = 1 + process_again = TRUE else - post_signal(new /datum/signal(list( - "tag" = interior_door_tag, - "command" = "secure_close" - ))) - else if(target_state < state) - if(memory["exterior_status"] == "closed") + interior_airlock?.secure_close() + else if(target_state == AIRLOCK_STATE_INOPEN) + var/obj/machinery/door/airlock/exterior_airlock = exterior_door_ref.resolve() + if (isnull(exterior_airlock)) + continue + + if(exterior_airlock.density) state = AIRLOCK_STATE_PRESSURIZE - process_again = 1 + process_again = TRUE else - post_signal(new /datum/signal(list( - "tag" = exterior_door_tag, - "command" = "secure_close" - ))) - + exterior_airlock?.secure_close() else - if(memory["pump_status"] != "off") - post_signal(new /datum/signal(list( - "tag" = airpump_tag, - "power" = 0, - "sigtype" = "command" - ))) + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = pump_ref.resolve() + if (isnull(pump)) + continue + + if (!pump.on) + pump.on = TRUE + pump.update_icon() if(AIRLOCK_STATE_DEPRESSURIZE) var/target_pressure = ONE_ATMOSPHERE*0.05 if(sanitize_external) target_pressure = ONE_ATMOSPHERE*0.01 + var/sensor_pressure = sensor_pressure() + if (isnull(sensor_pressure)) + continue + if(sensor_pressure <= target_pressure) - if(target_state > state) - if(memory["exterior_status"] == "open") - state = AIRLOCK_STATE_OUTOPEN + if(target_state == AIRLOCK_STATE_OUTOPEN) + var/obj/machinery/door/airlock/exterior_airlock = exterior_door_ref.resolve() + if (isnull(exterior_airlock)) + continue + + if(exterior_airlock.density) + exterior_airlock.secure_open() else - post_signal(new /datum/signal(list( - "tag" = exterior_door_tag, - "command" = "secure_open" - ))) - else if(target_state < state) + state = AIRLOCK_STATE_OUTOPEN + else state = AIRLOCK_STATE_CLOSED - process_again = 1 - else if((target_state < state) && !sanitize_external) + process_again = TRUE + else if((target_state != AIRLOCK_STATE_OUTOPEN) && !sanitize_external) state = AIRLOCK_STATE_CLOSED - process_again = 1 + process_again = TRUE else - var/datum/signal/signal = new(list( - "tag" = airpump_tag, - "sigtype" = "command" - )) - if(memory["pump_status"] == "release") - signal.data["purge"] = 1 - else if(memory["pump_status"] != "siphon") - signal.data["power"] = 1 - post_signal(signal) + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = pump_ref.resolve() + if (isnull(pump)) + continue + + if(pump.pump_direction == ATMOS_DIRECTION_RELEASING) + pump.pressure_checks &= ~ATMOS_EXTERNAL_BOUND + pump.pump_direction = ATMOS_DIRECTION_SIPHONING + else if(!pump.on) + pump.on = TRUE + pump.update_icon() if(AIRLOCK_STATE_OUTOPEN) //state 2 - if(target_state < state) - if(memory["exterior_status"] == "closed") + if(target_state != AIRLOCK_STATE_OUTOPEN) + var/obj/machinery/door/airlock/exterior_airlock = exterior_door_ref.resolve() + if (isnull(exterior_airlock)) + continue + + if(exterior_airlock.density) if(sanitize_external) state = AIRLOCK_STATE_DEPRESSURIZE - process_again = 1 + process_again = TRUE else state = AIRLOCK_STATE_CLOSED - process_again = 1 + process_again = TRUE else - post_signal(new /datum/signal(list( - "tag" = exterior_door_tag, - "command" = "secure_close" - ))) + exterior_airlock.secure_close() else - if(memory["pump_status"] != "off") - post_signal(new /datum/signal(list( - "tag" = airpump_tag, - "power" = 0, - "sigtype" = "command" - ))) + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = pump_ref.resolve() + if (isnull(pump)) + continue - memory["sensor_pressure"] = sensor_pressure - memory["processing"] = state != target_state - //sensor_pressure = null //not sure if we can comment this out. Uncomment in case of problems -rastaf0 + if (pump.on) + pump.on = FALSE + pump.update_icon() - return 1 + processing = state != target_state + update_icon() -/obj/machinery/embedded_controller/radio/airlock_controller - icon = 'icons/obj/airlock_machines.dmi' - icon_state = "airlock_control_standby" +/obj/machinery/airlock_controller/ui_data(mob/user) + var/list/data = list() - name = "airlock console" - density = FALSE + data["airlockState"] = state - frequency = FREQ_AIRLOCK_CONTROL - power_channel = AREA_USAGE_ENVIRON + var/sensor_pressure = sensor_pressure() + data["sensorPressure"] = isnull(sensor_pressure) ? "----" : round(sensor_pressure, 0.1) - // Setup parameters only - var/exterior_door_tag - var/interior_door_tag - var/airpump_tag - var/sensor_tag - var/sanitize_external + var/obj/machinery/door/airlock/interior_airlock = interior_door_ref.resolve() + if (isnull(interior_airlock)) + data["interiorStatus"] = "----" + else + data["interiorStatus"] = interior_airlock.density ? "closed" : "open" + + var/obj/machinery/door/airlock/exterior_airlock = exterior_door_ref.resolve() + if (isnull(exterior_airlock)) + data["exteriorStatus"] = "----" + else + data["exteriorStatus"] = exterior_airlock.density ? "closed" : "open" + + var/obj/machinery/atmospherics/components/binary/dp_vent_pump/pump = pump_ref.resolve() + switch (pump?.pump_direction) + if (null) + data["pumpStatus"] = "----" + if (ATMOS_DIRECTION_RELEASING) + data["pumpStatus"] = "release" + if (ATMOS_DIRECTION_SIPHONING) + data["pumpStatus"] = "siphon" + + return data + +/obj/machinery/airlock_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("cycleClosed") + target_state = AIRLOCK_STATE_CLOSED + if("cycleExterior") + target_state = AIRLOCK_STATE_OUTOPEN + if("cycleInterior") + target_state = AIRLOCK_STATE_INOPEN + if("abort") + target_state = AIRLOCK_STATE_CLOSED + + return TRUE -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix +/// Starts an airlock cycle +/obj/machinery/airlock_controller/proc/cycle() + if (state == AIRLOCK_STATE_INOPEN || state == AIRLOCK_STATE_PRESSURIZE) + target_state = AIRLOCK_STATE_OUTOPEN + else + target_state = AIRLOCK_STATE_INOPEN + +/// Returns the pressure over the pump, or null if it is deleted +/obj/machinery/airlock_controller/proc/sensor_pressure() + var/obj/machinery/airlock_sensor/sensor = sensor_ref.resolve() + if (!isnull(sensor) && !sensor.on) + return last_pressure + + var/datum/gas_mixture/air = sensor?.return_air() + last_pressure = air?.return_pressure() + return last_pressure + +/obj/machinery/airlock_controller/incinerator_toxmix name = "Incinerator Access Console" airpump_tag = INCINERATOR_TOXMIX_DP_VENTPUMP exterior_door_tag = INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR @@ -219,7 +285,7 @@ sanitize_external = TRUE sensor_tag = INCINERATOR_TOXMIX_AIRLOCK_SENSOR -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos +/obj/machinery/airlock_controller/incinerator_atmos name = "Incinerator Access Console" airpump_tag = INCINERATOR_ATMOS_DP_VENTPUMP exterior_door_tag = INCINERATOR_ATMOS_AIRLOCK_EXTERIOR @@ -228,7 +294,7 @@ sanitize_external = TRUE sensor_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava +/obj/machinery/airlock_controller/incinerator_syndicatelava name = "Incinerator Access Console" airpump_tag = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP exterior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR @@ -237,84 +303,12 @@ sanitize_external = TRUE sensor_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR -/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload) - . = ..() - if(!mapload) - return - - var/datum/computer/file/embedded_program/airlock_controller/new_prog = new - - new_prog.id_tag = id_tag - new_prog.exterior_door_tag = exterior_door_tag - new_prog.interior_door_tag = interior_door_tag - new_prog.airpump_tag = airpump_tag - new_prog.sensor_tag = sensor_tag - new_prog.sanitize_external = sanitize_external - - new_prog.master = src - program = new_prog - -/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() - if(on && program) - if(program.memory["processing"]) - icon_state = "airlock_control_process" - else - icon_state = "airlock_control_standby" - else - icon_state = "airlock_control_off" - - -/obj/machinery/embedded_controller/radio/airlock_controller/return_text() - var/state_options = null - - var/state = 0 - var/sensor_pressure = "----" - var/exterior_status = "----" - var/interior_status = "----" - var/pump_status = "----" - var/current_status = "Inactive
 " - if(program) - state = program.state - sensor_pressure = program.memory["sensor_pressure"] ? program.memory["sensor_pressure"] : "----" - exterior_status = program.memory["exterior_status"] ? program.memory["exterior_status"] : "----" - interior_status = program.memory["interior_status"] ? program.memory["interior_status"] : "----" - pump_status = program.memory["pump_status"] ? program.memory["pump_status"] : "----" - - switch(state) - if(AIRLOCK_STATE_INOPEN) - state_options = {"Close Interior Airlock
-Cycle to Exterior Airlock
"} - current_status = "Interior Airlock Open
[span_good("Chamber Pressurized")]" - if(AIRLOCK_STATE_PRESSURIZE) - state_options = "Abort Cycling
" - current_status = "Cycling to Interior Airlock
[span_average("Chamber Pressurizing")]" - if(AIRLOCK_STATE_CLOSED) - state_options = {"Open Interior Airlock
-Open Exterior Airlock
"} - if(AIRLOCK_STATE_DEPRESSURIZE) - state_options = "Abort Cycling
" - current_status = "Cycling to Exterior Airlock
[span_average("Chamber Depressurizing")]" - if(AIRLOCK_STATE_OUTOPEN) - state_options = {"Cycle to Interior Airlock
-Close Exterior Airlock
"} - current_status = "Exterior Airlock Open
[span_bad("Chamber Depressurized")]" - - var/output = {"

Airlock Status

-
-
Current Status:
[current_status]
-
 
-
\> Chamber Pressure:
[sensor_pressure] kPa
-
\> Control Pump:
[pump_status]
-
\> Interior Door:
[interior_status]
-
\> Exterior Door:
[exterior_status]
-
-
-[state_options]"} - - return output +/obj/machinery/airlock_controller/update_icon_state() + icon_state = "[base_icon_state]_[processing ? "process" : "standby"]" + return ..() -#undef AIRLOCK_STATE_INOPEN -#undef AIRLOCK_STATE_PRESSURIZE #undef AIRLOCK_STATE_CLOSED #undef AIRLOCK_STATE_DEPRESSURIZE +#undef AIRLOCK_STATE_INOPEN #undef AIRLOCK_STATE_OUTOPEN +#undef AIRLOCK_STATE_PRESSURIZE diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm deleted file mode 100644 index 22ddbc50a53a4..0000000000000 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ /dev/null @@ -1,95 +0,0 @@ -/datum/computer/file/embedded_program - var/list/memory = list() - var/state - var/obj/machinery/embedded_controller/master - -/datum/computer/file/embedded_program/Destroy() - master = null - . = ..() - -/datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line) - if(master) - master.post_signal(signal, comm_line) - else - qdel(signal) - -/datum/computer/file/embedded_program/proc/receive_user_command(command) - -/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal) - return null - -/datum/computer/file/embedded_program/process() - return 0 - -/obj/machinery/embedded_controller - var/datum/computer/file/embedded_program/program - - name = "embedded controller" - density = FALSE - - var/on = TRUE - -/obj/machinery/embedded_controller/Destroy() - if(program) - QDEL_NULL(program) - . = ..() - -/obj/machinery/embedded_controller/ui_interact(mob/user) - . = ..() - user.set_machine(src) - var/datum/browser/popup = new(user, "computer", name) // Set up the popup browser window - popup.set_content(return_text()) - popup.open() - -/obj/machinery/embedded_controller/update_icon() - -/obj/machinery/embedded_controller/proc/return_text() - -/obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) - return 0 - -/obj/machinery/embedded_controller/receive_signal(datum/signal/signal) - if(istype(signal) && program) - program.receive_signal(signal) - -/obj/machinery/embedded_controller/Topic(href, href_list) - if(..()) - return 0 - - if(program) - program.receive_user_command(href_list["command"]) - addtimer(CALLBACK(program, TYPE_PROC_REF(/datum/computer/file/embedded_program, process)), 5) - - usr.set_machine(src) - addtimer(CALLBACK(src, PROC_REF(updateDialog)), 5) - -/obj/machinery/embedded_controller/process(delta_time) - if(program) - program.process(delta_time) - - update_icon() - src.updateDialog() - -/obj/machinery/embedded_controller/radio - var/frequency - var/datum/radio_frequency/radio_connection - -/obj/machinery/embedded_controller/radio/Destroy() - SSradio.remove_object(src,frequency) - return ..() - -/obj/machinery/embedded_controller/radio/Initialize(mapload) - . = ..() - set_frequency(frequency) - -/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) - signal.transmission_method = TRANSMISSION_RADIO - if(radio_connection) - return radio_connection.post_signal(src, signal) - else - signal = null - -/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency) diff --git a/code/game/machinery/embedded_controller/simple_vent_controller.dm b/code/game/machinery/embedded_controller/simple_vent_controller.dm deleted file mode 100644 index 62fb1ad92663d..0000000000000 --- a/code/game/machinery/embedded_controller/simple_vent_controller.dm +++ /dev/null @@ -1,73 +0,0 @@ -/datum/computer/file/embedded_program/simple_vent_controller - - var/airpump_tag - -/datum/computer/file/embedded_program/simple_vent_controller/receive_user_command(command) - switch(command) - if("vent_inactive") - post_signal(new /datum/signal(list( - "tag" = airpump_tag, - "sigtype" = "command", - "power" = 0 - ))) - - if("vent_pump") - post_signal(new /datum/signal(list( - "tag" = airpump_tag, - "sigtype" = "command", - "stabilize" = 1, - "power" = 1 - ))) - - if("vent_clear") - post_signal(new /datum/signal(list( - "tag" = airpump_tag, - "sigtype" = "command", - "purge" = 1, - "power" = 1 - ))) - -/datum/computer/file/embedded_program/simple_vent_controller/process() - return 0 - - -/obj/machinery/embedded_controller/radio/simple_vent_controller - icon = 'icons/obj/airlock_machines.dmi' - icon_state = "airlock_control_standby" - - name = "vent controller" - density = FALSE - layer = ABOVE_WINDOW_LAYER - - frequency = FREQ_ATMOS_CONTROL - power_channel = AREA_USAGE_ENVIRON - - // Setup parameters only - var/airpump_tag - -/obj/machinery/embedded_controller/radio/simple_vent_controller/Initialize(mapload) - . = ..() - if(!mapload) - return - var/datum/computer/file/embedded_program/simple_vent_controller/new_prog = new - - new_prog.airpump_tag = airpump_tag - new_prog.master = src - program = new_prog - -/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon() - if(on && program) - icon_state = "airlock_control_standby" - else - icon_state = "airlock_control_off" - - -/obj/machinery/embedded_controller/radio/simple_vent_controller/return_text() - var/state_options = null - state_options = {"Deactivate Vent
-Activate Vent / Pump
-Activate Vent / Clear
"} - var/output = {"Vent Control Console
-[state_options]
"} - - return output diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 96bf84a486d97..1c7cf04ebbd7e 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -1,5 +1,3 @@ -#define FIREALARM_COOLDOWN 67 // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms - /obj/item/electronics/firealarm name = "fire alarm electronics" custom_price = 5 @@ -28,17 +26,25 @@ resistance_flags = FIRE_PROOF layer = ABOVE_WINDOW_LAYER zmm_flags = ZMM_MANGLE_PLANES - req_access = null + req_access = list(ACCESS_ATMOSPHERICS) light_power = 0 light_range = 7 light_color = "#ff3232" - var/detecting = 1 - var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone - var/last_alarm = 0 - var/area/myarea = null - var/locked = FALSE //Are we locked? + //Trick to get the glowing overlay visible from a distance + luminosity = 1 + + //We want to use area sensitivity, let us + always_area_sensitive = TRUE + ///Buildstate for contruction steps + var/buildstage = FIRE_ALARM_BUILD_SECURED + ///Our home area, set in Init. Due to loading step order, this seems to be null very early in the server setup process, which is why some procs use `my_area?` for var or list checks. + var/area/my_area = null + ///looping sound datum for our fire alarm siren. + var/datum/looping_sound/firealarm/soundloop + //Is the fire alarm locked? + var/locked = FALSE CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) @@ -50,39 +56,108 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) /obj/machinery/firealarm/Initialize(mapload, dir, building) . = ..() - if (!req_access) - req_access = list(ACCESS_ATMOSPHERICS) + id_tag = assign_random_name() if(building) - buildstage = 0 + buildstage = FIRE_ALARM_BUILD_NO_CIRCUIT panel_open = TRUE - update_appearance() - myarea = get_area(src) - LAZYADD(myarea.firealarms, src) + if(name == initial(name)) + update_name() + my_area = get_area(src) + LAZYADD(my_area.firealarms, src) + + AddElement(/datum/element/atmos_sensitive, mapload) RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_security_level)) + soundloop = new(src, FALSE) + + AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/firealarm)) + update_icon() /obj/machinery/firealarm/Destroy() - myarea.firereset(src) - LAZYREMOVE(myarea.firealarms, src) + if(my_area) + LAZYREMOVE(my_area.firealarms, src) + my_area = null + QDEL_NULL(soundloop) + return ..() + +// Area sensitivity is traditionally tied directly to power use, as an optimization +// But since we want it for fire reacting, we disregard that +/obj/machinery/firealarm/setup_area_power_relationship() + . = ..() + if(!.) + return + var/area/our_area = get_area(src) + RegisterSignal(our_area, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) + handle_fire(our_area, our_area.fire) + +/obj/machinery/firealarm/on_enter_area(datum/source, area/area_to_register) + //were already registered to an area. exit from here first before entering into an new area + if(!isnull(my_area)) + return + . = ..() + + my_area = area_to_register + LAZYADD(my_area.firealarms, src) + + RegisterSignal(area_to_register, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) + handle_fire(area_to_register, area_to_register.fire) + update_icon() + +/obj/machinery/firealarm/update_name(updates) + . = ..() + name = "[get_area_name(my_area)] [initial(name)] [id_tag]" + +/obj/machinery/firealarm/on_exit_area(datum/source, area/area_to_unregister) + //we cannot unregister from an area we never registered to in the first place + if(my_area != area_to_unregister) + return + . = ..() + + UnregisterSignal(area_to_unregister, COMSIG_AREA_FIRE_CHANGED) + LAZYREMOVE(my_area.firealarms, src) + my_area = null + update_icon() + +/obj/machinery/firealarm/proc/handle_fire(area/source, new_fire) + SIGNAL_HANDLER + set_status() + +/** + * Sets the sound state, and then calls update_icon() + * + * This proc exists to be called by areas and firelocks + * so that it may update its icon and start or stop playing + * the alarm sound based on the state of an area variable. + */ +/obj/machinery/firealarm/proc/set_status() + if(!(my_area.fire || LAZYLEN(my_area.active_firelocks)) || (obj_flags & EMAGGED)) + soundloop.stop() + update_icon() + update_overlays() + +/obj/machinery/firealarm/update_icon(updates) + . = ..() + if((my_area?.fire || LAZYLEN(my_area?.active_firelocks)) && !(obj_flags & EMAGGED) && !(machine_stat & (BROKEN|NOPOWER))) + set_light(l_range = 2.5, l_power = 1.5) + else + set_light(l_range = 1.6, l_power = 0) + +/obj/machinery/firealarm/update_icon_state() + if(panel_open) + icon_state = "fire_b[buildstage]" + return ..() + if(machine_stat & BROKEN) + icon_state = "firex" + return ..() + icon_state = "fire0" return ..() /obj/machinery/firealarm/update_overlays() . = ..() - var/area/A = src.loc - A = A.loc if(machine_stat & NOPOWER) return - . += "fire_overlay" - if(is_station_level(z)) - . += "fire_[SSsecurity_level.get_current_level_as_number()]" - . += mutable_appearance(icon, "fire_[SSsecurity_level.get_current_level_as_number()]") - . += emissive_appearance(icon, "fire_[SSsecurity_level.get_current_level_as_number()]", layer, alpha = 255) - ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) - else - . += "fire_[SEC_LEVEL_GREEN]" - . += mutable_appearance(icon, "fire_[SEC_LEVEL_GREEN]") - . += emissive_appearance(icon, "fire_[SEC_LEVEL_GREEN]", layer, alpha = 255) - ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) + if(panel_open) + return if(obj_flags & EMAGGED) . += "fire_emagged" @@ -90,12 +165,24 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) . += emissive_appearance(icon, "fire_emagged", layer, alpha = 255) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) return //If it's emagged, don't do anything else for overlays. - if(locked) - . += "fire_locked" - . += mutable_appearance(icon, "fire_locked", layer + 1) //If we are locked, overlay that over the fire_off - . += emissive_appearance(icon, "fire_locked", layer, alpha = 255) + + if(my_area?.fire_detect) //If this is false, someone disabled it. Leave the light missing, a good hint to anyone paying attention. + if(is_station_level(z)) + . += "fire_[SSsecurity_level.get_current_level_as_number()]" + . += mutable_appearance(icon, "fire_[SSsecurity_level.get_current_level_as_number()]") + . += emissive_appearance(icon, "fire_[SSsecurity_level.get_current_level_as_number()]", layer, alpha = 255) + ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) + else + . += "fire_[SEC_LEVEL_GREEN]" + . += mutable_appearance(icon, "fire_[SEC_LEVEL_GREEN]") + . += emissive_appearance(icon, "fire_[SEC_LEVEL_GREEN]", layer, alpha = 255) + ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) + else + . += mutable_appearance(icon, "fire_off") + . += emissive_appearance(icon, "fire_off", src, alpha = src.alpha) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) - if(detecting && A.fire) + + if(my_area?.fire_detect && my_area?.fire) . += "fire_on" . += mutable_appearance(icon, "fire_on", layer + 2) //If we are locked and there is a fire, overlay the fire detection overlay ontop of the locked one. . += emissive_appearance(icon, "fire_on", layer, alpha = 255) @@ -106,6 +193,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) . += emissive_appearance(icon, "fire_off", layer, alpha = 255) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) + if(locked) + . += "fire_locked" + . += mutable_appearance(icon, "fire_locked", layer + 1) //If we are locked, overlay that over the fire_off + . += emissive_appearance(icon, "fire_locked", layer, alpha = 255) + ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) + + /obj/machinery/firealarm/emp_act(severity) . = ..() @@ -116,11 +210,19 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) alarm() /obj/machinery/firealarm/on_emag(mob/user) - ..() - update_appearance() + . = ..() + if(obj_flags & EMAGGED) + return FALSE + obj_flags |= EMAGGED + update_icon() user?.visible_message(span_warning("Sparks fly out of [src]!"), - span_notice("You emag [src], disabling its thermal sensors.")) + span_notice("You override [src], disabling the speaker.")) + if(user) + balloon_alert(user, "speaker disabled") + user.log_message("emagged [src].", LOG_ATTACK) playsound(src, "sparks", 50, 1) + set_status() + return TRUE /obj/machinery/firealarm/eminence_act(mob/living/simple_animal/eminence/eminence) . = ..() @@ -128,12 +230,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) if(do_after(eminence, 20, target=get_turf(eminence))) attack_hand(eminence) -/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) - if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !machine_stat) - alarm() - try_lock(null, TRUE) - ..() - /** * Signal handler for checking if we should update fire alarm appearance accordingly to a newly set security level * @@ -145,27 +241,57 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) SIGNAL_HANDLER if(is_station_level(z)) - update_appearance() + update_icon() +/** + * Sounds the fire alarm and closes all firelocks in the area. Also tells the area to color the lights red. + * + * Arguments: + * * mob/user is the user that pulled the alarm. + */ /obj/machinery/firealarm/proc/alarm(mob/user) - if(!is_operational || (last_alarm+FIREALARM_COOLDOWN > world.time)) + if(!is_operational) return - last_alarm = world.time - var/area/A = get_area(src) - A.firealert(src) - playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75) - update_appearance() + + if(my_area.fire) + return //area alarm already active + my_area.alarm_manager.send_alarm(ALARM_FIRE, my_area) + // This'll setup our visual effects, so we only need to worry about the alarm + for(var/obj/machinery/door/firedoor/firelock in my_area.firedoors) + firelock.activate(FIRELOCK_ALARM_TYPE_GENERIC) if(user) - log_game("[user] triggered a fire alarm at [COORD(src)]") + balloon_alert(user, "triggered alarm!") + user.log_message("triggered a fire alarm.", LOG_GAME) + my_area.fault_status = AREA_FAULT_MANUAL + my_area.fault_location = name + soundloop.start() //Manually pulled fire alarms will make the sound, rather than the doors. + SEND_SIGNAL(src, COMSIG_FIREALARM_ON_TRIGGER) + use_power = active_power_usage + update_icon() + update_overlays() +/** + * Resets all firelocks in the area. Also tells the area to disable alarm lighting, if it was enabled. + * + * Arguments: + * * mob/user is the user that reset the alarm. + */ /obj/machinery/firealarm/proc/reset(mob/user) if(!is_operational) return - var/area/A = get_area(src) - A.firereset(src) - update_appearance() + my_area.alarm_manager.clear_alarm(ALARM_FIRE, my_area) + // Clears all fire doors and their effects for now + // They'll reclose if there's a problem + for(var/obj/machinery/door/firedoor/firelock in my_area.firedoors) + firelock.crack_open() if(user) - log_game("[user] reset a fire alarm at [COORD(src)]") + balloon_alert(user, "reset alarm") + user.log_message("reset a fire alarm.", LOG_GAME) + soundloop.stop() + SEND_SIGNAL(src, COMSIG_FIREALARM_ON_RESET) + use_power = idle_power_usage + update_icon() + update_overlays() /obj/machinery/firealarm/proc/try_lock(mob/user, force_lock = FALSE) if(allowed(user) || !user || force_lock) @@ -179,10 +305,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) else balloon_alert(user, "Access Denied!") playsound(src, 'sound/machines/terminal_error.ogg', 50, 1) - update_appearance() + update_icon() /obj/machinery/firealarm/AltClick(mob/user) - try_lock(user) + if(can_interact(user)) + try_lock(user) /obj/machinery/firealarm/attack_hand(mob/user) if(buildstage != 2) @@ -198,6 +325,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) reset(user) else alarm(user) + update_icon() /obj/machinery/firealarm/attack_silicon(mob/user) return attack_hand(user) @@ -207,15 +335,14 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) if(istype(W, /obj/item/card/id)||istype(W, /obj/item/modular_computer/tablet/pda)) // trying to unlock the cover with an ID card try_lock(user) - if(W.tool_behaviour == TOOL_SCREWDRIVER && buildstage == 2) + if(W.tool_behaviour == TOOL_SCREWDRIVER) W.play_tool_sound(src) panel_open = !panel_open to_chat(user, span_notice("The wires have been [panel_open ? "exposed" : "unexposed"].")) - update_appearance() + update_icon() return if(panel_open) - if(W.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) @@ -230,21 +357,17 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) return switch(buildstage) - if(2) + if(FIRE_ALARM_BUILD_SECURED) if(W.tool_behaviour == TOOL_MULTITOOL) - detecting = !detecting - if (src.detecting) - user.visible_message("[user] has reconnected [src]'s detecting unit!", span_notice("You reconnect [src]'s detecting unit.")) - else - user.visible_message("[user] has disconnected [src]'s detecting unit!", span_notice("You disconnect [src]'s detecting unit.")) + toggle_fire_detect(user) return else if(W.tool_behaviour == TOOL_WIRECUTTER) - buildstage = 1 + buildstage = AIR_ALARM_BUILD_NO_WIRES W.play_tool_sound(src) new /obj/item/stack/cable_coil(user.loc, 5) - to_chat(user, span_notice("You cut the wires from \the [src].")) - update_appearance() + to_chat(user, span_notice("You cut the wires from the [src].")) + update_icon() return else if(W.force) //hit and turn it on @@ -254,16 +377,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) alarm() return - if(1) + if(FIRE_ALARM_BUILD_NO_WIRES) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.get_amount() < 5) to_chat(user, span_warning("You need more cable for this!")) else coil.use(5) - buildstage = 2 - to_chat(user, span_notice("You wire \the [src].")) - update_appearance() + buildstage = AIR_ALARM_BUILD_COMPLETE + to_chat(user, span_notice("You wire the [src].")) + update_icon() return else if(W.tool_behaviour == TOOL_CROWBAR) @@ -277,15 +400,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) else to_chat(user, span_notice("You pry out the circuit.")) new /obj/item/electronics/firealarm(user.loc) - buildstage = 0 - update_appearance() + buildstage = FIRE_ALARM_BUILD_NO_CIRCUIT + update_icon() return - if(0) + if(FIRE_ALARM_BUILD_NO_CIRCUIT) if(istype(W, /obj/item/electronics/firealarm)) to_chat(user, span_notice("You insert the circuit.")) qdel(W) - buildstage = 1 - update_appearance() + buildstage = FIRE_ALARM_BUILD_NO_WIRES + update_icon() return else if(istype(W, /obj/item/electroadaptive_pseudocircuit)) @@ -294,8 +417,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) return user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ span_notice("You adapt a fire alarm circuit and slot it into the assembly.")) - buildstage = 1 - update_appearance() + buildstage = AIR_ALARM_BUILD_NO_WIRES + update_icon() return else if(W.tool_behaviour == TOOL_WRENCH) @@ -309,10 +432,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) return ..() -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) - /obj/machinery/firealarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) - if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) + if((buildstage == FIRE_ALARM_BUILD_NO_CIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) return FALSE @@ -321,15 +442,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) if(RCD_UPGRADE_SIMPLE_CIRCUITS) user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ span_notice("You adapt a fire alarm circuit and slot it into the assembly.")) - buildstage = 1 - update_appearance() + buildstage = FIRE_ALARM_BUILD_NO_WIRES + update_icon() return TRUE return FALSE /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() if(.) //damage received - if(atom_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0) + if(atom_integrity > 0 && !(machine_stat & BROKEN) && buildstage != FIRE_ALARM_BUILD_NO_CIRCUIT) if(prob(33)) alarm() @@ -339,29 +460,47 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) ..() /obj/machinery/firealarm/atom_break(damage_flag) - if(buildstage == 0) //can't break the electronics if there isn't any inside. + if(buildstage == FIRE_ALARM_BUILD_NO_CIRCUIT) //can't break the electronics if there isn't any inside. return - . = ..() - if(.) - LAZYREMOVE(myarea.firealarms, src) + return ..() + /obj/machinery/firealarm/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/iron(loc, 1) - if(!(machine_stat & BROKEN)) - var/obj/item/I = new /obj/item/electronics/firealarm(loc) + if(buildstage > FIRE_ALARM_BUILD_NO_CIRCUIT) + var/obj/item/item = new /obj/item/electronics/firealarm(loc) if(!disassembled) - I.update_integrity(I.max_integrity * 0.5) - new /obj/item/stack/cable_coil(loc, 3) + item.update_integrity(item.max_integrity * 0.5) + if(buildstage > FIRE_ALARM_BUILD_NO_WIRES) + new /obj/item/stack/cable_coil(loc, 3) qdel(src) -/obj/machinery/firealarm/proc/update_fire_light(fire) - if(fire == !!light_power) - return // do nothing if we're already active - if(fire) - set_light(l_power = 0.8) + +// Allows users to examine the state of the thermal sensor +/obj/machinery/firealarm/examine(mob/user) + . = ..() + if((my_area?.fire || LAZYLEN(my_area?.active_firelocks))) + . += "The local area hazard light is flashing." + . += "The fault location display is [my_area.fault_location] ([my_area.fault_status == AREA_FAULT_AUTOMATIC ? "Automatic Detection" : "Manual Trigger"])." else - set_light(l_power = 0) + . += "The local area thermal detection light is [my_area.fire_detect ? "lit" : "unlit"]." + if(is_station_level(z)) + . += "The station security alert level is [SSsecurity_level.get_current_level_as_text()]." + . += "Activate to activate/reset all firelocks in this area." + +/obj/machinery/firealarm/proc/toggle_fire_detect(mob/user) + my_area.fire_detect = !my_area.fire_detect + for(var/obj/machinery/firealarm/fire_panel in my_area.firealarms) + fire_panel.update_icon() + // Used to force all the firelocks to update, if the zone is not manually activated + if (my_area.fault_status != AREA_FAULT_MANUAL) + reset() // Don't send user to prevent double balloon_alert() and the action is already logged in this proc. + if (user) + balloon_alert(user, "thermal sensors [my_area.fire_detect ? "enabled" : "disabled"]") + user.log_message("[ my_area.fire_detect ? "enabled" : "disabled" ] firelock sensors using [src].", LOG_GAME) + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) /* * Return of Party button @@ -378,21 +517,77 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) /obj/machinery/firealarm/partyalarm/reset() if (machine_stat & (NOPOWER|BROKEN)) return - var/area/A = get_area(src) - if (!A || !A.party) + var/area/area = get_area(src) + if (!area || !area.party) return - A.party = FALSE - A.cut_overlay(party_overlay) + area.party = FALSE + area.cut_overlay(party_overlay) /obj/machinery/firealarm/partyalarm/alarm() if (machine_stat & (NOPOWER|BROKEN)) return - var/area/A = get_area(src) - if (!A || A.party || A.name == "Space") + var/area/area = get_area(src) + if (!area || area.party || area.name == "Space") return - A.party = TRUE + area.party = TRUE if (!party_overlay) party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party") - A.add_overlay(party_overlay) + area.add_overlay(party_overlay) + +/////////////////////// CIRCUITS ////////////////////////////////////// + +/obj/item/circuit_component/firealarm + display_name = "Fire Alarm" + desc = "Allows you to interface with the Fire Alarm." + + var/datum/port/input/alarm_trigger + var/datum/port/input/reset_trigger + + /// Returns a boolean value of 0 or 1 if the fire alarm is on or not. + var/datum/port/output/is_on + /// Returns when the alarm is turned on + var/datum/port/output/triggered + /// Returns when the alarm is turned off + var/datum/port/output/reset + + var/obj/machinery/firealarm/attached_alarm + +/obj/item/circuit_component/firealarm/populate_ports() + alarm_trigger = add_input_port("Set", PORT_TYPE_SIGNAL) + reset_trigger = add_input_port("Reset", PORT_TYPE_SIGNAL) + + is_on = add_output_port("Is On", PORT_TYPE_NUMBER) + triggered = add_output_port("Triggered", PORT_TYPE_SIGNAL) + reset = add_output_port("Reset", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/firealarm/register_usb_parent(atom/movable/parent) + . = ..() + if(istype(parent, /obj/machinery/firealarm)) + attached_alarm = parent + RegisterSignal(parent, COMSIG_FIREALARM_ON_TRIGGER, PROC_REF(on_firealarm_triggered)) + RegisterSignal(parent, COMSIG_FIREALARM_ON_RESET, PROC_REF(on_firealarm_reset)) + +/obj/item/circuit_component/firealarm/unregister_usb_parent(atom/movable/parent) + attached_alarm = null + UnregisterSignal(parent, COMSIG_FIREALARM_ON_TRIGGER) + UnregisterSignal(parent, COMSIG_FIREALARM_ON_RESET) + return ..() + +/obj/item/circuit_component/firealarm/proc/on_firealarm_triggered(datum/source) + SIGNAL_HANDLER + is_on.set_output(1) + triggered.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/firealarm/proc/on_firealarm_reset(datum/source) + SIGNAL_HANDLER + is_on.set_output(0) + reset.set_output(COMPONENT_SIGNAL) + + +/obj/item/circuit_component/firealarm/input_received(datum/port/input/port) + if(COMPONENT_TRIGGERED_BY(alarm_trigger, port)) + attached_alarm?.alarm() + + if(COMPONENT_TRIGGERED_BY(reset_trigger, port)) + attached_alarm?.reset() -#undef FIREALARM_COOLDOWN diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index a4918dbf95728..2bca643240e62 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -16,17 +16,61 @@ Buildable meters throwforce = 7 icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi' icon_state = "simple" - item_state = "buildpipe" + icon_state_preview = "manifold4w" w_class = WEIGHT_CLASS_NORMAL + ///Piping layer that we are going to be on var/piping_layer = PIPING_LAYER_DEFAULT + ///Type of pipe-object made, selected from the RPD var/RPD_type - /// whether it can be painted + ///Whether it can be painted var/paintable = FALSE + ///Color of the pipe is going to be made from this pipe-object + var/pipe_color + ///Initial direction of the created pipe (either made from the RPD or after unwrenching the pipe) + var/p_init_dir = SOUTH /obj/item/pipe/directional RPD_type = PIPE_UNARY +/obj/item/pipe/directional/he_junction + icon_state_preview = "junction" + pipe_type = /obj/machinery/atmospherics/pipe/heat_exchanging/junction +/obj/item/pipe/directional/vent + name = "air vent fitting" + icon_state_preview = "uvent" + pipe_type = /obj/machinery/atmospherics/components/unary/vent_pump +/obj/item/pipe/directional/scrubber + name = "air scrubber fitting" + icon_state_preview = "scrubber" + pipe_type = /obj/machinery/atmospherics/components/unary/vent_scrubber +/obj/item/pipe/directional/connector + icon_state_preview = "connector" + pipe_type = /obj/machinery/atmospherics/components/unary/portables_connector +/obj/item/pipe/directional/passive_vent + icon_state_preview = "pvent" + pipe_type = /obj/machinery/atmospherics/components/unary/passive_vent +/obj/item/pipe/directional/injector + icon_state_preview = "injector" + pipe_type = /obj/machinery/atmospherics/components/unary/outlet_injector +/obj/item/pipe/directional/he_exchanger + icon_state_preview = "heunary" + pipe_type = /obj/machinery/atmospherics/components/unary/heat_exchanger +/obj/item/pipe/directional/airlock_pump + icon_state_preview = "airlock_pump" + pipe_type = /obj/machinery/atmospherics/components/unary/airlock_pump /obj/item/pipe/binary RPD_type = PIPE_STRAIGHT +/obj/item/pipe/binary/layer_adapter + icon_state_preview = "manifoldlayer" + pipe_type = /obj/machinery/atmospherics/pipe/layer_manifold +/obj/item/pipe/binary/color_adapter + icon_state_preview = "adapter_center" + pipe_type = /obj/machinery/atmospherics/pipe/color_adapter +/obj/item/pipe/binary/pressure_pump + icon_state_preview = "pump" + pipe_type = /obj/machinery/atmospherics/components/binary/pump +/obj/item/pipe/binary/manual_valve + icon_state_preview = "mvalve" + pipe_type = /obj/machinery/atmospherics/components/binary/valve /obj/item/pipe/binary/bendable RPD_type = PIPE_BENDABLE /obj/item/pipe/trinary @@ -34,45 +78,73 @@ Buildable meters /obj/item/pipe/trinary/flippable RPD_type = PIPE_TRIN_M var/flipped = FALSE +/obj/item/pipe/trinary/flippable/filter + name = "gas filter fitting" + icon_state_preview = "filter" + pipe_type = /obj/machinery/atmospherics/components/trinary/filter +/obj/item/pipe/trinary/flippable/mixer + icon_state_preview = "mixer" + pipe_type = /obj/machinery/atmospherics/components/trinary/mixer /obj/item/pipe/quaternary RPD_type = PIPE_ONEDIR +/obj/item/pipe/quaternary/pipe + icon_state_preview = "manifold4w" + pipe_type = /obj/machinery/atmospherics/pipe/smart +/obj/item/pipe/quaternary/pipe/crafted -/obj/item/pipe/ComponentInitialize() - //Flipping handled manually due to custom handling for trinary pipes - AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE) +/obj/item/pipe/quaternary/pipe/crafted/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from, device_color, device_init_dir = SOUTH) + . = ..() + pipe_type = /obj/machinery/atmospherics/pipe/smart + pipe_color = COLOR_VERY_LIGHT_GRAY + p_init_dir = ALL_CARDINALS + setDir(SOUTH) + update() -CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) +/obj/item/pipe/quaternary/he_pipe + icon_state_preview = "he_manifold4w" + pipe_type = /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w -/obj/item/pipe/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from) +/obj/item/pipe/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from, device_color, device_init_dir = SOUTH) if(make_from) make_from_existing(make_from) else + p_init_dir = device_init_dir pipe_type = _pipe_type + pipe_color = device_color setDir(_dir) update() pixel_x += rand(-5, 5) pixel_y += rand(-5, 5) + + AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated))) + + // Only 'normal' pipes + if(type != /obj/item/pipe/quaternary) + return ..() + return ..() +/obj/item/pipe/proc/can_be_rotated(mob/user) + if(anchored) + return FALSE + return TRUE + /obj/item/pipe/proc/make_from_existing(obj/machinery/atmospherics/make_from) + p_init_dir = make_from.get_init_directions() setDir(make_from.dir) pipename = make_from.name add_atom_colour(make_from.color, FIXED_COLOUR_PRIORITY) pipe_type = make_from.type paintable = make_from.paintable - -/obj/item/pipe/trinary/flippable/make_from_existing(obj/machinery/atmospherics/components/trinary/make_from) - ..() - if(make_from.flipped) - do_a_flip() + pipe_color = make_from.pipe_color /obj/item/pipe/dropped() - ..() if(loc) - setPipingLayer(piping_layer) + set_piping_layer(piping_layer) + return ..() -/obj/item/pipe/proc/setPipingLayer(new_layer = PIPING_LAYER_DEFAULT) +/obj/item/pipe/proc/set_piping_layer(new_layer = PIPING_LAYER_DEFAULT) var/obj/machinery/atmospherics/fakeA = pipe_type if(initial(fakeA.pipe_flags) & PIPING_ALL_LAYER) @@ -85,27 +157,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) /obj/item/pipe/proc/update() var/obj/machinery/atmospherics/fakeA = pipe_type name = "[initial(fakeA.name)] fitting" + desc = initial(fakeA.desc) icon_state = initial(fakeA.pipe_state) if(ispath(pipe_type,/obj/machinery/atmospherics/pipe/heat_exchanging)) resistance_flags |= FIRE_PROOF | LAVA_PROOF -/obj/item/pipe/verb/flip() - set category = "Object" - set name = "Flip Pipe" - set src in view(1) - - if(usr.incapacitated() || !isliving(usr)) - return - - do_a_flip() - -/obj/item/pipe/proc/do_a_flip() - setDir(turn(dir, -180)) - -/obj/item/pipe/trinary/flippable/do_a_flip() - setDir(turn(dir, flipped ? 45 : -45)) - flipped = !flipped - /obj/item/pipe/Move() var/old_dir = dir ..() @@ -124,13 +180,24 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) /obj/item/pipe/trinary/flippable/fixed_dir() . = dir - if(dir in GLOB.diagonals) + if(ISDIAGONALDIR(dir)) . = turn(dir, 45) /obj/item/pipe/attack_self(mob/user) setDir(turn(dir,-90)) -/obj/item/pipe/wrench_act(mob/living/user, obj/item/wrench/W) +///Check if the pipe on the turf and our to be placed binary pipe are perpendicular to each other +/obj/item/pipe/proc/check_ninety_degree_dir(obj/machinery/atmospherics/machine) + if(ISDIAGONALDIR(machine.dir)) + return FALSE + if(EWCOMPONENT(machine.dir) && EWCOMPONENT(dir)) + return FALSE + if(NSCOMPONENT(machine.dir) && NSCOMPONENT(dir)) + return FALSE + return TRUE + +/obj/item/pipe/wrench_act(mob/living/user, obj/item/wrench/wrench) + . = ..() if(!isturf(loc)) return TRUE @@ -138,23 +205,36 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) var/obj/machinery/atmospherics/fakeA = pipe_type var/flags = initial(fakeA.pipe_flags) - for(var/obj/machinery/atmospherics/M in loc) - if((M.pipe_flags & flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. + var/list/potentially_conflicting_machines = list() + // Work out which machines we would potentially conflict with + for(var/obj/machinery/atmospherics/machine in loc) + // Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. + if(machine.pipe_flags & flags & PIPING_ONE_PER_TURF) to_chat(user, span_warning("Something is hogging the tile!")) return TRUE - if((M.piping_layer != piping_layer) && !((M.pipe_flags | flags) & PIPING_ALL_LAYER)) //don't continue if either pipe goes across all layers + // skip checks if we don't overlap layers, either by being on the same layer or by something being on all layers + if(machine.piping_layer != piping_layer && !((machine.pipe_flags | flags) & PIPING_ALL_LAYER)) continue - if(M.GetInitDirections() & SSair.get_init_dirs(pipe_type, fixed_dir())) // matches at least one direction on either type of pipe - to_chat(user, span_warning("There is already a pipe at that location!")) - return TRUE + potentially_conflicting_machines += machine + + // See if we would conflict with any of the potentially interacting machines + for(var/obj/machinery/atmospherics/machine as anything in potentially_conflicting_machines) + // if the pipes have any directions in common, we can't place it that way. + var/our_init_dirs = SSair.get_init_dirs(pipe_type, fixed_dir(), p_init_dir) + if(machine.get_init_directions() & our_init_dirs) + // We have a conflict! + if(length(potentially_conflicting_machines) != 1 || !try_smart_reconfiguration(machine, our_init_dirs, user)) + // No solutions found + to_chat(user, span_warning("There is already a pipe at that location!")) + return TRUE // no conflicts found - var/obj/machinery/atmospherics/A = new pipe_type(loc) - build_pipe(A) - A.on_construction(color, piping_layer) - transfer_fingerprints_to(A) + var/obj/machinery/atmospherics/built_machine = new pipe_type(loc, null, fixed_dir(), p_init_dir) + build_pipe(built_machine) + built_machine.on_construction(user, pipe_color, piping_layer) + transfer_fingerprints_to(built_machine) - W.play_tool_sound(src) + wrench.play_tool_sound(src) user.visible_message( \ "[user] fastens \the [src].", \ span_notice("You fasten \the [src]."), \ @@ -162,10 +242,84 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) qdel(src) -/obj/item/pipe/proc/build_pipe(obj/machinery/atmospherics/A) - A.setDir(fixed_dir()) - A.SetInitDirections() +/** + * Attempt to automatically resolve a pipe conflict by reconfiguring any smart pipes involved. + * + * Constraints: + * - A smart pipe cannot have current connections reconfigured. + * - A smart pipe cannot have fewer than two directions in which it will connect. + * - A smart pipe, existing or new, will not automatically reconfigure itself to permit directions it was not previously permitting. + */ +/obj/item/pipe/proc/try_smart_reconfiguration(obj/machinery/atmospherics/machine, our_init_dirs, mob/living/user) + // If we're a smart pipe, we might be able to solve this by placing down a more constrained version of ourselves. + var/obj/machinery/atmospherics/pipe/smart/other_smart_pipe = machine + if(ispath(pipe_type, /obj/machinery/atmospherics/pipe/smart/)) + // If we're conflicting with another smart pipe, see if we can negotiate. + if(istype(other_smart_pipe)) + // Two smart pipes. This is going to get complicated. + // Check to see whether the already placed pipe is bent or not. + if (ISDIAGONALDIR(other_smart_pipe.dir)) + // The other pipe is bent, with at least two current connections. See if we can bounce off it as a bent pipe in the other direction. + var/opposing_dir = our_init_dirs & ~other_smart_pipe.connections + if (ISNOTSTUB(opposing_dir)) + // We only get here if both smart pipes have two directions. + p_init_dir = opposing_dir + other_smart_pipe.set_init_directions(other_smart_pipe.connections) + other_smart_pipe.update_pipe_icon() + return TRUE + // We're left with one or no available directions if we look at the complement of the other smart pipe's live connections. + // There's nothing further we can do. + return FALSE + else + // The other pipe is straight. See if we can go over it in a perpindicular direction. + // Note that the other pipe cannot be unconnected, since we have a conflict. + if(EWCOMPONENT(other_smart_pipe.dir)) + if ((NORTH|SOUTH) & ~p_init_dir) + // Not allowed to connect this way + return FALSE + if (~other_smart_pipe.get_init_directions() & (EAST|WEST)) + // Not allowed to reconfigure the other pipe this way + return FALSE + p_init_dir = NORTH|SOUTH + other_smart_pipe.set_init_directions(EAST|WEST) + other_smart_pipe.update_pipe_icon() + return TRUE + if (NSCOMPONENT(other_smart_pipe.dir)) + if ((EAST|WEST) & ~p_init_dir) + // Not allowed to connect this way + return FALSE + if (~other_smart_pipe.get_init_directions() & (NORTH|SOUTH)) + // Not allowed to reconfigure the other pipe this way + return FALSE + p_init_dir = EAST|WEST + other_smart_pipe.set_init_directions(NORTH|SOUTH) + other_smart_pipe.update_pipe_icon() + return TRUE + return FALSE + // We're not dealing with another smart pipe. See if we can become the complement of the conflicting machine. + var/opposing_dir = our_init_dirs & ~machine.get_init_directions() + if (ISNOTSTUB(opposing_dir)) + // We have at least two permitted directions in the complement. Use them. + p_init_dir = opposing_dir + return TRUE + return FALSE + + else if(istype(other_smart_pipe)) + // We're not a smart pipe ourselves, but we are conflicting with a smart pipe. We might be able to solve this by constraining the smart pipe. + if (our_init_dirs & other_smart_pipe.connections) + // We needed to go where a smart pipe already had connections, nothing further we can do + return FALSE + var/opposing_dir = other_smart_pipe.get_init_directions() & ~our_init_dirs + if (ISNOTSTUB(opposing_dir)) + // At least two directions remain for that smart pipe, reconfigure it + other_smart_pipe.set_init_directions(opposing_dir) + other_smart_pipe.update_pipe_icon() + return TRUE + return FALSE + // No smart pipes involved, the conflict can't be solved this way. + return FALSE +/obj/item/pipe/proc/build_pipe(obj/machinery/atmospherics/A) if(pipename) A.name = pipename if(A.on) @@ -182,25 +336,28 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) user.visible_message(span_suicide("[user] shoves [src] in [user.p_their()] mouth and turns it on! It looks like [user.p_theyre()] trying to commit suicide!")) if(iscarbon(user)) var/mob/living/carbon/C = user - for(var/i=1 to 20) + for(var/i in 1 to 20) C.vomit(0, TRUE, FALSE, 4, FALSE) if(prob(20)) C.spew_organ() - sleep(5) + sleep(0.5 SECONDS) C.blood_volume = 0 return(OXYLOSS|BRUTELOSS) +/obj/item/pipe/examine(mob/user) + . = ..() + . += span_notice("The pipe layer is set to [piping_layer].") + /obj/item/pipe_meter name = "meter" - desc = "A meter that can be laid on pipes." + desc = "A meter that can be wrenched on pipes, or attached to the floor with screws." icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi' icon_state = "meter" - item_state = "buildpipe" w_class = WEIGHT_CLASS_BULKY var/piping_layer = PIPING_LAYER_DEFAULT /obj/item/pipe_meter/wrench_act(mob/living/user, obj/item/wrench/W) - + . = ..() var/obj/machinery/atmospherics/pipe/pipe for(var/obj/machinery/atmospherics/pipe/P in loc) if(P.piping_layer == piping_layer) @@ -229,10 +386,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) qdel(src) /obj/item/pipe_meter/dropped() - ..() + . = ..() if(loc) - setAttachLayer(piping_layer) + set_attach_layer(piping_layer) -/obj/item/pipe_meter/proc/setAttachLayer(new_layer = PIPING_LAYER_DEFAULT) +/obj/item/pipe_meter/proc/set_attach_layer(new_layer = PIPING_LAYER_DEFAULT) piping_layer = new_layer PIPING_LAYER_DOUBLE_SHIFT(src, piping_layer) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 331f1bed1914a..89ed7b041d298 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -1,66 +1,156 @@ -/obj/machinery/pipedispenser +#define ATMOS_PIPEDISPENSER 0 +#define DISPOSAL_PIPEDISPENSER 1 +#define TRANSIT_PIPEDISPENSER 2 + +/obj/machinery/pipe_dispenser name = "pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" desc = "Dispenses countless types of pipes. Very useful if you need pipes." density = TRUE interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_OFFLINE + var/wait = 0 var/piping_layer = PIPING_LAYER_DEFAULT + ///color of pipe + var/paint_color = "green" + ///type of dispenser + var/category = ATMOS_PIPEDISPENSER + ///smart pipe directions + var/p_init_dir = ALL_CARDINALS + +/obj/machinery/pipe_dispenser/attack_paw(mob/user, list/modifiers) + return attack_hand(user, modifiers) + +/obj/machinery/pipe_dispenser/ui_static_data(mob/user) + var/list/data = list("paint_colors" = GLOB.pipe_paint_colors) + return data + +/obj/machinery/pipe_dispenser/ui_data() + var/list/data = list( + "category" = category, + "piping_layer" = piping_layer, + "categories" = list(), + "selected_color" = paint_color, + ) + + // The get the recipies for this dispenser + var/list/recipes + switch(category) + if(ATMOS_PIPEDISPENSER) + recipes = GLOB.atmos_pipe_recipes + if(DISPOSAL_PIPEDISPENSER) + recipes = GLOB.disposal_pipe_recipes + if(TRANSIT_PIPEDISPENSER) + recipes = GLOB.transit_tube_recipes + // Generate pipe categories + for(var/c in recipes) + var/list/cat = recipes[c] + var/list/r = list() + for(var/i in 1 to cat.len) + var/datum/pipe_info/info = cat[i] + r += list(list("pipe_name" = info.name, "pipe_index" = i, "all_layers" = info.all_layers, "dir" = NORTH)) + // if this is bendable, add the bent version of the pipe (disposals) + if (info.dirtype == PIPE_BENDABLE) + r += list(list("pipe_name" = "Bent " + info.name, "pipe_index" = i, "all_layers" = info.all_layers, "dir" = NORTHEAST)) + data["categories"] += list(list("cat_name" = c, "recipes" = r)) + var/list/init_directions = list("north" = FALSE, "south" = FALSE, "east" = FALSE, "west" = FALSE) + for(var/direction in GLOB.cardinals) + if(p_init_dir & direction) + init_directions[dir2text(direction)] = TRUE + data["init_directions"] = init_directions + return data + +/obj/machinery/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + if(..()) + return + switch(action) + if("color") + paint_color = params["paint_color"] + + if("pipe_type") + switch(category) + if(ATMOS_PIPEDISPENSER) + if(wait < world.time) + var/datum/pipe_info/info = GLOB.atmos_pipe_recipes[params["category"]][params["pipe_type"]] + var/recipe_type = info.type + var/p_type = info.id + + // No spawning arbitrary paths (literally 1984) + if(!verify_recipe(GLOB.atmos_pipe_recipes, p_type)) + return + + // If this is a meter, make that. + if(recipe_type == /datum/pipe_info/meter) + new /obj/item/pipe_meter(loc) + wait = world.time + 1 SECONDS + return + + // Otherwise, make a pipe/device + var/p_dir = params["pipe_dir"] + var/obj/item/pipe/pipe_out = new (loc, p_type, p_dir) + pipe_out.p_init_dir = p_init_dir + pipe_out.pipe_color = GLOB.pipe_paint_colors[paint_color] + pipe_out.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) + pipe_out.set_piping_layer(piping_layer) + pipe_out.add_fingerprint(usr) + wait = world.time + 1 SECONDS + if(DISPOSAL_PIPEDISPENSER) + if(wait < world.time) + var/datum/pipe_info/info = GLOB.disposal_pipe_recipes[params["category"]][params["pipe_type"]] + var/p_type = info.id + + // No spawning arbitrary paths (literally 1984) + if(!verify_recipe(GLOB.disposal_pipe_recipes, p_type)) + return + + var/obj/structure/disposalconstruct/disposal_out = new (loc, p_type) + if(!disposal_out.can_place()) + to_chat(usr, "There's not enough room to build that here!") + qdel(disposal_out) + return + + disposal_out.add_fingerprint(usr) + disposal_out.update_appearance() + disposal_out.setDir(params["pipe_dir"]) + wait = world.time + 1 SECONDS + if(TRANSIT_PIPEDISPENSER) + if(wait < world.time) + var/datum/pipe_info/info = GLOB.transit_tube_recipes[params["category"]][params["pipe_type"]] + var/p_type = info.id + + // No spawning arbitrary paths (literally 1984) + if(!verify_recipe(GLOB.transit_tube_recipes, p_type)) + return + + var/obj/structure/c_transit_tube/tube_out = new p_type(loc) + tube_out.add_fingerprint(usr) + tube_out.update_appearance() + tube_out.setDir(params["pipe_dir"]) + wait = world.time + 1 SECONDS + if("piping_layer") + piping_layer = text2num(params["piping_layer"]) + + if("init_dir_setting") + var/target_dir = p_init_dir ^ text2dir(params["dir_flag"]) + // Refuse to create a smart pipe that can only connect in one direction (it would act weirdly and lack an icon) + if (ISNOTSTUB(target_dir)) + p_init_dir = target_dir + else + to_chat(usr, "\The [src]'s screen flashes a warning: Can't configure a pipe to only connect in one direction.") + + if("init_reset") + p_init_dir = ALL_CARDINALS -/obj/machinery/pipedispenser/attack_paw(mob/user) - return attack_hand(user) - -/obj/machinery/pipedispenser/ui_interact(mob/user) - . = ..() - var/dat = "PIPING LAYER: --[piping_layer]++
" - - var/recipes = GLOB.atmos_pipe_recipes - - for(var/category in recipes) - var/list/cat_recipes = recipes[category] - dat += "[category]:" + return TRUE - user << browse("[src][dat]", "window=pipedispenser") - onclose(user, "pipedispenser") - return +/obj/machinery/pipe_dispenser/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "PipeDispenser", name) + ui.open() -/obj/machinery/pipedispenser/Topic(href, href_list) - if(..()) - return 1 - var/mob/living/L = usr - if(!anchored || (istype(L) && !(L.mobility_flags & MOBILITY_UI)) || usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || !in_range(loc, usr)) - usr << browse(null, "window=pipedispenser") - return 1 - usr.set_machine(src) - add_fingerprint(usr) - if(href_list["makepipe"]) - if(wait < world.time) - var/p_type = text2path(href_list["makepipe"]) - if (!verify_recipe(GLOB.atmos_pipe_recipes, p_type)) - return - var/p_dir = text2num(href_list["dir"]) - var/obj/item/pipe/P = new (loc, p_type, p_dir) - P.setPipingLayer(piping_layer) - P.add_fingerprint(usr) - wait = world.time + 10 - if(href_list["makemeter"]) - if(wait < world.time ) - new /obj/item/pipe_meter(loc) - wait = world.time + 15 - if(href_list["layer_up"]) - piping_layer = clamp(++piping_layer, PIPING_LAYER_MIN, PIPING_LAYER_MAX) - if(href_list["layer_down"]) - piping_layer = clamp(--piping_layer, PIPING_LAYER_MIN, PIPING_LAYER_MAX) - return - -/obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params) +/obj/machinery/pipe_dispenser/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) to_chat(usr, span_notice("You put [W] back into [src].")) @@ -69,7 +159,7 @@ else return ..() -/obj/machinery/pipedispenser/proc/verify_recipe(recipes, path) +/obj/machinery/pipe_dispenser/proc/verify_recipe(recipes, path) for(var/category in recipes) var/list/cat_recipes = recipes[category] for(var/i in cat_recipes) @@ -78,30 +168,30 @@ return TRUE return FALSE -/obj/machinery/pipedispenser/wrench_act(mob/living/user, obj/item/I) - if(default_unfasten_wrench(user, I, 40)) +/obj/machinery/pipe_dispenser/wrench_act(mob/living/user, obj/item/tool) + . = ..() + if(default_unfasten_wrench(user, tool, time = 4 SECONDS)) user << browse(null, "window=pipedispenser") return TRUE -/obj/machinery/pipedispenser/disposal +/obj/machinery/pipe_dispenser/disposal name = "disposal pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" desc = "Dispenses pipes that will ultimately be used to move trash around." density = TRUE - + category = DISPOSAL_PIPEDISPENSER //Allow you to drag-drop disposal pipes and transit tubes into it -/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/usr) - if(!usr.incapacitated()) - return +/obj/machinery/pipe_dispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/user, params) + . = ..() if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod)) return - if (get_dist(usr, src) > 1 || get_dist(src,pipe) > 1 ) + if (get_dist(user, src) > 1 || get_dist(src, pipe) > 1 ) return if (pipe.anchored) @@ -109,105 +199,16 @@ qdel(pipe) -/obj/machinery/pipedispenser/disposal/interact(mob/user) - - var/dat = "" - var/recipes = GLOB.disposal_pipe_recipes - - for(var/category in recipes) - var/list/cat_recipes = recipes[category] - dat += "[category]:" - - user << browse("[src][dat]", "window=pipedispenser") - return - - -/obj/machinery/pipedispenser/disposal/Topic(href, href_list) - if(..()) - return 1 - usr.set_machine(src) - add_fingerprint(usr) - if(href_list["dmake"]) - if(wait < world.time) - var/p_type = text2path(href_list["dmake"]) - if (!verify_recipe(GLOB.disposal_pipe_recipes, p_type)) - return - var/obj/structure/disposalconstruct/C = new (loc, p_type) - - if(!C.can_place()) - to_chat(usr, span_warning("There's not enough room to build that here!")) - qdel(C) - return - if(href_list["dir"]) - C.setDir(text2num(href_list["dir"])) - C.add_fingerprint(usr) - C.update_icon() - wait = world.time + 15 - return - //transit tube dispenser //inherit disposal for the dragging proc -/obj/machinery/pipedispenser/disposal/transit_tube +/obj/machinery/pipe_dispenser/disposal/transit_tube name = "transit tube dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = TRUE desc = "Dispenses pipes that will move beings around." + category = TRANSIT_PIPEDISPENSER -/obj/machinery/pipedispenser/disposal/transit_tube/interact(mob/user) - - var/dat = {"Transit Tubes:
-Straight Tube
-Straight Tube with Crossing
-Curved Tube
-Diagonal Tube
-Diagonal Tube with Crossing
-Junction
-Station Equipment:
-Through Tube Station
-Terminus Tube Station
-Transit Tube Pod
-"} - - user << browse("[src][dat]", "window=pipedispenser") - return - - -/obj/machinery/pipedispenser/disposal/transit_tube/Topic(href, href_list) - if(..()) - return 1 - usr.set_machine(src) - add_fingerprint(usr) - if(wait < world.time) - if(href_list["tube"]) - var/tube_type = text2num(href_list["tube"]) - var/obj/structure/C - switch(tube_type) - if(TRANSIT_TUBE_STRAIGHT) - C = new /obj/structure/c_transit_tube(loc) - if(TRANSIT_TUBE_STRAIGHT_CROSSING) - C = new /obj/structure/c_transit_tube/crossing(loc) - if(TRANSIT_TUBE_CURVED) - C = new /obj/structure/c_transit_tube/curved(loc) - if(TRANSIT_TUBE_DIAGONAL) - C = new /obj/structure/c_transit_tube/diagonal(loc) - if(TRANSIT_TUBE_DIAGONAL_CROSSING) - C = new /obj/structure/c_transit_tube/diagonal/crossing(loc) - if(TRANSIT_TUBE_JUNCTION) - C = new /obj/structure/c_transit_tube/junction(loc) - if(TRANSIT_TUBE_STATION) - C = new /obj/structure/c_transit_tube/station(loc) - if(TRANSIT_TUBE_TERMINUS) - C = new /obj/structure/c_transit_tube/station/reverse(loc) - if(TRANSIT_TUBE_POD) - C = new /obj/structure/c_transit_tube_pod(loc) - if(C) - C.add_fingerprint(usr) - wait = world.time + 15 - return +#undef ATMOS_PIPEDISPENSER +#undef DISPOSAL_PIPEDISPENSER +#undef TRANSIT_PIPEDISPENSER diff --git a/code/game/machinery/portable_thermomachine.dm b/code/game/machinery/portable_thermomachine.dm index cd8fa6b1ac5cb..2b5a432121f00 100644 --- a/code/game/machinery/portable_thermomachine.dm +++ b/code/game/machinery/portable_thermomachine.dm @@ -126,8 +126,8 @@ if(mode == HEATER_MODE_COOL) delta_temperature *= -1 if(delta_temperature) - environment.set_temperature(environment.return_temperature() + delta_temperature) - air_update_turf() + environment.temperature = environment.return_temperature() + delta_temperature + air_update_turf(FALSE, FALSE) cell.use(required_energy / efficiency) /obj/machinery/portable_thermomachine/RefreshParts() @@ -190,19 +190,6 @@ return TRUE return ..() -/obj/machinery/portable_thermomachine/AltClick(mob/user) - if(!can_interact(user)) - return - if(mode == HEATER_MODE_COOL) - target_temperature = (settable_temperature_median - settable_temperature_range) - T0C - investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) - else if(mode == HEATER_MODE_HEAT) - target_temperature = (settable_temperature_median + settable_temperature_range) - T0C - investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) - else - return - balloon_alert(user, "You set the target temperature to [target_temperature] C.") - /obj/machinery/portable_thermomachine/proc/toggle_power() on = !on mode = HEATER_MODE_STANDBY diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 2c6ec9ab1bbfe..5cdbd149f4101 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -10,12 +10,16 @@ anchored = TRUE resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons) - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY /obj/structure/emergency_shield/Initialize(mapload) . = ..() setDir(pick(GLOB.cardinals)) - air_update_turf(1) + air_update_turf(TRUE, TRUE) + +/obj/structure/emergency_shield/Destroy() + air_update_turf(TRUE, FALSE) + . = ..() /obj/structure/emergency_shield/Move() var/turf/T = loc @@ -60,7 +64,6 @@ max_integrity = 20 mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = ABOVE_MOB_LAYER - /obj/structure/emergency_shield/invoker/emp_act(severity) return @@ -653,8 +656,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/shieldwall) icon = 'icons/effects/effects.dmi' icon_state = "holofield" density = FALSE - CanAtmosPass = ATMOS_PASS_NO - CanAtmosPassVertical = 1 + can_atmos_pass = ATMOS_PASS_NO hardshield = FALSE layer = ABOVE_MOB_LAYER light_color = "#f6e384" diff --git a/code/game/machinery/shuttle/shuttle_engine.dm b/code/game/machinery/shuttle/shuttle_engine.dm index df8795df27f25..55a124d0452ad 100644 --- a/code/game/machinery/shuttle/shuttle_engine.dm +++ b/code/game/machinery/shuttle/shuttle_engine.dm @@ -55,7 +55,7 @@ . = ..() check_setup() -/obj/machinery/shuttle/engine/on_construction() +/obj/machinery/shuttle/engine/on_construction(mob/user) . = ..() check_setup() @@ -122,8 +122,8 @@ var/deltaTemperature = req_power / heat_cap if(deltaTemperature < 0) return - env.set_temperature(env.return_temperature() + deltaTemperature) - air_update_turf() + env.temperature = env.return_temperature() + deltaTemperature + air_update_turf(FALSE, FALSE) /obj/machinery/shuttle/engine/attackby(obj/item/I, mob/living/user, params) check_setup() diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm index 50986cbe45624..c5b5d84589100 100644 --- a/code/game/machinery/shuttle/shuttle_heater.dm +++ b/code/game/machinery/shuttle/shuttle_heater.dm @@ -29,7 +29,7 @@ pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY - var/gas_type = GAS_PLASMA + var/gas_type = /datum/gas/plasma var/efficiency_multiplier = 1 var/gas_capacity = 0 @@ -44,7 +44,7 @@ /obj/machinery/atmospherics/components/unary/shuttle/heater/New() . = ..() GLOB.custom_shuttle_machines += src - SetInitDirections() + set_init_directions() update_adjacent_engines() updateGasStats() @@ -53,29 +53,28 @@ update_adjacent_engines() GLOB.custom_shuttle_machines -= src -/obj/machinery/atmospherics/components/unary/shuttle/heater/on_construction() +/obj/machinery/atmospherics/components/unary/shuttle/heater/on_construction(mob/user) ..(dir, dir) - SetInitDirections() + set_init_directions() update_adjacent_engines() /obj/machinery/atmospherics/components/unary/shuttle/heater/default_change_direction_wrench(mob/user, obj/item/I) if(!..()) return FALSE - SetInitDirections() + set_init_directions() var/obj/machinery/atmospherics/node = nodes[1] if(node) node.disconnect(src) nodes[1] = null if(!parents[1]) return - nullifyPipenet(parents[1]) + nullify_pipenet(parents[1]) - atmosinit() + atmos_init() node = nodes[1] if(node) - node.atmosinit() - node.addMember(src) - build_network() + node.atmos_init() + node.add_member(src) return TRUE /obj/machinery/atmospherics/components/unary/shuttle/heater/RefreshParts() @@ -92,14 +91,14 @@ /obj/machinery/atmospherics/components/unary/shuttle/heater/examine(mob/user) . = ..() var/datum/gas_mixture/air_contents = airs[1] - . += "The engine heater's gas dial reads [air_contents.get_moles(gas_type)] moles of gas.
" + . += "The engine heater's gas dial reads [air_contents.total_moles()] moles of gas.
" /obj/machinery/atmospherics/components/unary/shuttle/heater/proc/updateGasStats() var/datum/gas_mixture/air_contents = airs[1] if(!air_contents) return - air_contents.set_volume(gas_capacity) - air_contents.set_temperature(T20C) + air_contents.volume = gas_capacity + air_contents.temperature = T20C /obj/machinery/atmospherics/components/unary/shuttle/heater/proc/hasFuel(var/required) var/datum/gas_mixture/air_contents = airs[1] @@ -114,15 +113,15 @@ /obj/machinery/atmospherics/components/unary/shuttle/heater/attackby(obj/item/I, mob/living/user, params) update_adjacent_engines() if(default_deconstruction_screwdriver(user, icon_state_open, icon_state_closed, I)) - return + return TRUE if(default_pry_open(I)) - return + return TRUE if(panel_open) if(default_change_direction_wrench(user, I)) - return + return TRUE if(default_deconstruction_crowbar(I)) - return - return ..() + return TRUE + return TRUE /obj/machinery/atmospherics/components/unary/shuttle/heater/proc/update_adjacent_engines() var/engine_turf diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 582c98b6bc746..f13e8799aac07 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -78,10 +78,9 @@ * Returns TRUE if there are mobs buckled to this atom and FALSE otherwise */ /atom/movable/proc/has_buckled_mobs() - if(!buckled_mobs) - return FALSE - if(buckled_mobs.len) + if(length(buckled_mobs)) return TRUE + return FALSE /** * Set a mob as buckled to src diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index f92b63ee31a85..51546b45d1189 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -280,9 +280,9 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable/blood/gibs/old) for(var/Ddir in GLOB.cardinals) if(old_entered_dirs & Ddir) - entered_dirs |= angle2dir_cardinal(dir2angle(Ddir) + ang_change) + entered_dirs |= turn_cardinal(Ddir, ang_change) if(old_exited_dirs & Ddir) - exited_dirs |= angle2dir_cardinal(dir2angle(Ddir) + ang_change) + exited_dirs |= turn_cardinal(Ddir, ang_change) update_appearance() return ..() diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 1f7fe58d5714a..49d47acc7b45b 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -32,6 +32,10 @@ slippery_foam = FALSE var/absorbed_plasma = 0 +/obj/effect/particle_effect/foam/firefighting/ComponentInitialize() + ..() + RemoveElement(/datum/element/atmos_sensitive) + /obj/effect/particle_effect/foam/firefighting/process() ..() @@ -40,12 +44,12 @@ if(hotspot && istype(T) && T.air) qdel(hotspot) var/datum/gas_mixture/G = T.air - var/plas_amt = min(30,G.get_moles(GAS_PLASMA)) //Absorb some plasma - G.adjust_moles(GAS_PLASMA, -plas_amt) + var/plas_amt = min(30,GET_MOLES(/datum/gas/plasma, G)) //Absorb some plasma + REMOVE_MOLES(/datum/gas/plasma, G, plas_amt) absorbed_plasma += plas_amt - if(G.return_temperature() > T20C) - G.set_temperature(max(G.return_temperature()/2,T20C)) - T.air_update_turf() + if(G.temperature > T20C) + G.temperature = max(G.return_temperature()/2,T20C) + T.air_update_turf(FALSE, FALSE) /obj/effect/particle_effect/foam/firefighting/kill_foam() STOP_PROCESSING(SSfastprocess, src) @@ -65,9 +69,6 @@ L.adjust_fire_stacks(-2) L.ExtinguishMob() -/obj/effect/particle_effect/foam/firefighting/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - return - /obj/effect/particle_effect/foam/metal name = "aluminium foam" metal = ALUMINUM_FOAM @@ -107,6 +108,7 @@ /obj/effect/particle_effect/foam/Initialize(mapload) . = ..() + AddElement(/datum/element/atmos_sensitive) create_reagents(1000) //limited by the size of the reagent holder anyway. START_PROCESSING(SSfastprocess, src) playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3) @@ -191,7 +193,7 @@ /obj/effect/particle_effect/foam/proc/spread_foam() var/turf/t_loc = get_turf(src) - for(var/turf/T in t_loc.GetAtmosAdjacentTurfs()) + for(var/turf/T in t_loc.get_atmos_adjacent_turfs()) var/obj/effect/particle_effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam! if(foundfoam) continue @@ -207,16 +209,13 @@ F.add_atom_colour(color, FIXED_COLOUR_PRIORITY) F.metal = metal +/obj/effect/particle_effect/foam/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 475 -/obj/effect/particle_effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(prob(max(0, exposed_temperature - 475))) //foam dissolves when heated +/obj/effect/particle_effect/foam/atmos_expose(datum/gas_mixture/air, exposed_temperature) + if(prob(max(0, exposed_temperature - 475))) //foam dissolves when heated kill_foam() - -/obj/effect/particle_effect/foam/metal/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - return - - /////////////////////////////////////////////// //FOAM EFFECT DATUM /datum/effect_system/foam_spread @@ -286,11 +285,15 @@ desc = "A lightweight foamed metal wall." gender = PLURAL max_integrity = 20 - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY /obj/structure/foamedmetal/Initialize(mapload) . = ..() - air_update_turf(1) + air_update_turf(TRUE, TRUE) + +/obj/structure/foamedmetal/Destroy() + air_update_turf(TRUE, FALSE) + . = ..() /obj/structure/foamedmetal/Move() var/turf/T = loc @@ -333,14 +336,14 @@ O.ClearWet() if(O.air) var/datum/gas_mixture/G = O.air - G.set_temperature(293.15) + G.temperature = T20C for(var/obj/effect/hotspot/H in O) qdel(H) - for(var/I in G.get_gases()) - if(I == GAS_O2 || I == GAS_N2) + for(var/I in G.gases) + if(I == /datum/gas/oxygen || I == /datum/gas/nitrogen) continue - G.set_moles(I, 0) - O.air_update_turf() + SET_MOLES(I , G, 0) + for(var/obj/machinery/atmospherics/components/unary/U in O) if(!U.welded) U.welded = TRUE diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index b26866264e97f..c4757e8eda957 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -91,7 +91,7 @@ if(!t_loc) return var/list/newsmokes = list() - for(var/turf/T in t_loc.GetAtmosAdjacentTurfs(!circle)) + for(var/turf/T in t_loc.get_atmos_adjacent_turfs(!circle)) var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke! if(foundsmoke) continue @@ -175,13 +175,14 @@ if(T.air) var/datum/gas_mixture/G = T.air if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air - G.set_temperature(temperature) - T.air_update_turf() + G.temperature = temperature + T.air_update_turf(FALSE, FALSE) for(var/obj/effect/hotspot/H in T) qdel(H) - if(G.get_moles(GAS_PLASMA)) - G.adjust_moles(GAS_N2, G.get_moles(GAS_PLASMA)) - G.set_moles(GAS_PLASMA, 0) + if(G.gases[/datum/gas/plasma][MOLES]) + ADD_MOLES(/datum/gas/nitrogen, G, G.gases[/datum/gas/plasma][MOLES]) + G.gases[/datum/gas/plasma][MOLES] = 0 + if (weldvents) for(var/obj/machinery/atmospherics/components/unary/U in T) if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber. @@ -204,7 +205,7 @@ ..() /datum/effect_system/smoke_spread/freezing/decon - temperature = 293.15 + temperature = T20C distcheck = FALSE weldvents = FALSE diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index fc8577bf8a700..6e7fb59e1bcbb 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -5,7 +5,7 @@ anchored = TRUE opacity = FALSE density = TRUE - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP var/timeleft = 300 //Set to 0 for permanent forcefields (ugh) @@ -26,7 +26,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/forcefield) name = "glowing wall" icon = 'icons/effects/cult_effects.dmi' icon_state = "cultshield" - CanAtmosPass = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO timeleft = 200 ///////////Mimewalls/////////// diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 02c189dcf8e82..b64c36e416932 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -84,27 +84,28 @@ /obj/structure/glowshroom/proc/Spread() var/turf/ownturf = get_turf(src) + if(!TURF_SHARES(ownturf)) //If we are in a 1x1 room + return //Deal with it not now + var/shrooms_planted = 0 for(var/i in 1 to myseed.yield) if(prob(1/(generation * generation) * 100))//This formula gives you diminishing returns based on generation. 100% with 1st gen, decreasing to 25%, 11%, 6, 4, 2... var/list/possibleLocs = list() - var/spreadsIntoAdjacent = FALSE - - if(prob(spreadIntoAdjacentChance)) - spreadsIntoAdjacent = TRUE for(var/turf/open/floor/earth in view(3,src)) if(is_type_in_typecache(earth, blacklisted_glowshroom_turfs)) continue - if(!ownturf.CanAtmosPass(earth)) + if(!TURF_SHARES(earth)) continue - if(spreadsIntoAdjacent || !locate(/obj/structure/glowshroom) in view(1,earth)) - possibleLocs += earth + possibleLocs += earth CHECK_TICK if(!possibleLocs.len) break + if(!prob(spreadIntoAdjacentChance)) + return + var/turf/newLoc = pick(possibleLocs) var/shroomCount = 0 //hacky @@ -165,9 +166,11 @@ if(damage_type == BURN && damage_amount) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/structure/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - take_damage(5, BURN, 0, 0) +/obj/structure/glowshroom/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/structure/glowshroom/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(5, BURN, 0, 0) /obj/structure/glowshroom/acid_act(acidpwr, acid_volume) . = 1 @@ -175,3 +178,7 @@ var/obj/effect/decal/cleanable/molten_object/I = new (get_turf(src)) I.desc = "Looks like this was \an [src] some time ago." qdel(src) + +/obj/structure/glowshroom/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index d41a37c972aa4..2eddeb9e7cc27 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -261,7 +261,7 @@ /obj/effect/mine/gas name = "oxygen mine" var/gas_amount = 360 - var/gas_type = "o2" + var/gas_type = GAS_O2 disarm_product = /obj/item/deployablemine/gas /obj/effect/mine/gas/mineEffect(mob/victim) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index b398597382f38..61c0671894676 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -84,6 +84,18 @@ vis_flags = VIS_INHERIT_ID appearance_flags = KEEP_TOGETHER | LONG_GLIDE | PIXEL_SCALE +/obj/effect/overlay/atmos_excited + name = "excited group" + icon = null + icon_state = null + anchored = TRUE // should only appear in vis_contents, but to be safe + appearance_flags = RESET_TRANSFORM | TILE_BOUND + invisibility = INVISIBILITY_ABSTRACT + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + vis_flags = VIS_INHERIT_PLANE + plane = ATMOS_GROUP_PLANE + layer = ATMOS_GROUP_LAYER + /obj/effect/overlay/light_cone name = "" icon = 'icons/effects/light_overlays/light_cone.dmi' diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 2a9ac99c7d876..3bd2865c56c5b 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -138,16 +138,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/portal) return FALSE atmos_source.atmos_adjacent_turfs[atmos_destination] = TRUE atmos_destination.atmos_adjacent_turfs[atmos_source] = TRUE - atmos_source.air_update_turf(FALSE) - atmos_destination.air_update_turf(FALSE) + atmos_source.air_update_turf(FALSE, FALSE) + atmos_destination.air_update_turf(FALSE, FALSE) /obj/effect/portal/proc/unlink_atmos() if(istype(atmos_source)) - if(istype(atmos_destination) && !atmos_source.Adjacent(atmos_destination) && !CANATMOSPASS(atmos_destination, atmos_source)) + if(istype(atmos_destination) && !atmos_source.Adjacent(atmos_destination) && !CANATMOSPASS(atmos_destination, atmos_source, FALSE)) LAZYREMOVE(atmos_source.atmos_adjacent_turfs, atmos_destination) atmos_source = null if(istype(atmos_destination)) - if(istype(atmos_source) && !atmos_destination.Adjacent(atmos_source) && !CANATMOSPASS(atmos_source, atmos_destination)) + if(istype(atmos_source) && !atmos_destination.Adjacent(atmos_source) && !CANATMOSPASS(atmos_source, atmos_destination, FALSE)) LAZYREMOVE(atmos_destination.atmos_adjacent_turfs, atmos_source) atmos_destination = null diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 04e93d4ffe2bf..7864da70d09d3 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -1,63 +1,177 @@ -#define CELSIUS_TO_KELVIN(T_K) ((T_K) + T0C) - -#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.gas_data.specific_heats[GAS_PLASMA]) / (((PRESSURE_P) * GLOB.gas_data.specific_heats[GAS_PLASMA] + (PRESSURE_O) * GLOB.gas_data.specific_heats[GAS_O2]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.gas_data.specific_heats[GAS_O2] / CELSIUS_TO_KELVIN(TEMP_O))) -#define OPTIMAL_TEMP_K_PLA_BURN_RATIO(PRESSURE_P,PRESSURE_O,TEMP_O) (CELSIUS_TO_KELVIN(TEMP_O) * PLASMA_OXYGEN_FULLBURN * (PRESSURE_P) / (PRESSURE_O)) - +/** + * Spawns a TTV. + * + */ /obj/effect/spawner/newbomb name = "bomb" icon = 'icons/hud/screen_gen.dmi' icon_state = "x" - var/temp_p = 1500 - var/temp_o = 1000 // tank temperatures - var/pressure_p = 10 * ONE_ATMOSPHERE - var/pressure_o = 10 * ONE_ATMOSPHERE //tank pressures - var/assembly_type + /* Gasmixes for tank_one and tank_two of the ttv respectively. + * Populated on /obj/effect/spawner/newbomb/Initialize, depopulated right after by the children procs. + */ + var/datum/gas_mixture/first_gasmix + var/datum/gas_mixture/second_gasmix + +/** + * The part of code that actually spawns the bomb. Always call the parent's initialize first for subtypes of these. + * + * Arguments: + * * assembly - An assembly typepath to add to the ttv. + */ +/obj/effect/spawner/newbomb/Initialize(mapload, assembly = null) + . = ..() + var/obj/item/transfer_valve/ttv = new(loc) + ttv.tank_one = new /obj/item/tank/internals/plasma (ttv) + ttv.tank_two = new /obj/item/tank/internals/oxygen (ttv) + first_gasmix = ttv.tank_one.return_air() + second_gasmix = ttv.tank_two.return_air() + first_gasmix.remove_ratio(1) + second_gasmix.remove_ratio(1) + if(ispath(assembly, /obj/item/assembly)) + var/obj/item/assembly/newassembly = new assembly (ttv) + ttv.attached_device = newassembly + newassembly.on_attach() + newassembly.holder = ttv + ttv.update_appearance() + return INITIALIZE_HINT_QDEL + + +/obj/effect/spawner/newbomb/proc/calculate_pressure(datum/gas_mixture/gasmix, pressure) + return pressure * gasmix.volume/(R_IDEAL_GAS_EQUATION*gasmix.temperature) + +/obj/effect/spawner/newbomb/plasma + +/obj/effect/spawner/newbomb/plasma/Initialize(mapload) + . = ..() + if(!first_gasmix || !second_gasmix) + return + first_gasmix.temperature = 1413 + second_gasmix.temperature = 141.3 + first_gasmix.assert_gas(/datum/gas/plasma) + second_gasmix.assert_gas(/datum/gas/oxygen) + first_gasmix.gases[/datum/gas/plasma][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/oxygen][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + +/obj/effect/spawner/newbomb/tritium + +/obj/effect/spawner/newbomb/tritium/Initialize(mapload, obj/item/assembly) + . = ..() + if(!first_gasmix || !second_gasmix) + return + + first_gasmix.temperature = 8000 + second_gasmix.temperature = 43 + + first_gasmix.assert_gas(/datum/gas/plasma) + second_gasmix.assert_gas(/datum/gas/oxygen) + second_gasmix.assert_gas(/datum/gas/tritium) + + first_gasmix.gases[/datum/gas/plasma][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/oxygen][MOLES] = 0.67 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/tritium][MOLES] = 0.33 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + +/obj/effect/spawner/newbomb/isolated_tritium + +/obj/effect/spawner/newbomb/isolated_tritium/Initialize(mapload) + . = ..() + if(!first_gasmix || !second_gasmix) + return + + first_gasmix.temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1 + second_gasmix.temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1 + + first_gasmix.assert_gas(/datum/gas/hypernoblium) + first_gasmix.assert_gas(/datum/gas/tritium) + second_gasmix.assert_gas(/datum/gas/oxygen) + + first_gasmix.gases[/datum/gas/hypernoblium][MOLES] = REACTION_OPPRESSION_THRESHOLD - 0.01 + first_gasmix.gases[/datum/gas/tritium][MOLES] = 0.5 * calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/oxygen][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE-1) -/obj/effect/spawner/newbomb/Initialize(mapload) +/obj/effect/spawner/newbomb/noblium + +/obj/effect/spawner/newbomb/noblium/Initialize(mapload) + . = ..() + if(!first_gasmix || !second_gasmix) + return + + first_gasmix.temperature = 2.7 + second_gasmix.temperature = 2.7 + + first_gasmix.assert_gas(/datum/gas/nitrogen) + second_gasmix.assert_gas(/datum/gas/tritium) + + first_gasmix.gases[/datum/gas/nitrogen][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/tritium][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + +/obj/effect/spawner/newbomb/pressure + +/obj/effect/spawner/newbomb/pressure/Initialize(mapload) . = ..() - var/obj/item/transfer_valve/V = new(src.loc) - var/obj/item/tank/internals/plasma/PT = new(V) - var/obj/item/tank/internals/oxygen/OT = new(V) + if(!first_gasmix || !second_gasmix) + return/obj/effect/spawner/newbomb/tritium - PT.air_contents.set_moles(GAS_PLASMA, pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p))) - PT.air_contents.set_temperature(CELSIUS_TO_KELVIN(temp_p)) +/obj/effect/spawner/newbomb/tritium/Initialize(mapload, obj/item/assembly) + . = ..() + if(!first_gasmix || !second_gasmix) + return - OT.air_contents.set_moles(GAS_O2, pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))) - OT.air_contents.set_temperature(CELSIUS_TO_KELVIN(temp_o)) + first_gasmix.temperature = 8000 + second_gasmix.temperature = 43 - V.tank_one = PT - V.tank_two = OT - PT.master = V - OT.master = V + first_gasmix.assert_gas(/datum/gas/plasma) + second_gasmix.assert_gas(/datum/gas/oxygen) + second_gasmix.assert_gas(/datum/gas/tritium) - if(assembly_type) - var/obj/item/assembly/A = new assembly_type(V) - V.attached_device = A - A.holder = V + first_gasmix.gases[/datum/gas/plasma][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/oxygen][MOLES] = 0.67 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/tritium][MOLES] = 0.33 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) - V.update_icon() +/obj/effect/spawner/newbomb/isolated_tritium -/obj/effect/spawner/newbomb/timer/syndicate/Initialize(mapload) - temp_p = (OPTIMAL_TEMP_K_PLA_BURN_SCALE(pressure_p, pressure_o, temp_o)/2 + OPTIMAL_TEMP_K_PLA_BURN_RATIO(pressure_p, pressure_o, temp_o)/2) - T0C +/obj/effect/spawner/newbomb/isolated_tritium/Initialize(mapload) . = ..() + if(!first_gasmix || !second_gasmix) + return + + first_gasmix.temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1 + second_gasmix.temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1 -/obj/effect/spawner/newbomb/timer - assembly_type = /obj/item/assembly/timer + first_gasmix.assert_gas(/datum/gas/hypernoblium) + first_gasmix.assert_gas(/datum/gas/tritium) + second_gasmix.assert_gas(/datum/gas/oxygen) -/obj/effect/spawner/newbomb/timer/syndicate - pressure_o = TANK_LEAK_PRESSURE - 1 - temp_o = 20 + first_gasmix.gases[/datum/gas/hypernoblium][MOLES] = REACTION_OPPRESSION_THRESHOLD - 0.01 + first_gasmix.gases[/datum/gas/tritium][MOLES] = 0.5 * calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/oxygen][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE-1) - pressure_p = TANK_LEAK_PRESSURE - 1 +/obj/effect/spawner/newbomb/noblium + +/obj/effect/spawner/newbomb/noblium/Initialize(mapload) + . = ..() + if(!first_gasmix || !second_gasmix) + return -/obj/effect/spawner/newbomb/proximity - assembly_type = /obj/item/assembly/prox_sensor + first_gasmix.temperature = 2.7 + second_gasmix.temperature = 2.7 -/obj/effect/spawner/newbomb/radio - assembly_type = /obj/item/assembly/signaler + first_gasmix.assert_gas(/datum/gas/nitrogen) + second_gasmix.assert_gas(/datum/gas/tritium) + first_gasmix.gases[/datum/gas/nitrogen][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/tritium][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + +/obj/effect/spawner/newbomb/pressure + +/obj/effect/spawner/newbomb/pressure/Initialize(mapload) + . = ..() + if(!first_gasmix || !second_gasmix) + return + first_gasmix.temperature = 20000 + second_gasmix.temperature = 2.7 -#undef CELSIUS_TO_KELVIN + first_gasmix.assert_gas(/datum/gas/hypernoblium) + second_gasmix.assert_gas(/datum/gas/tritium) -#undef OPTIMAL_TEMP_K_PLA_BURN_SCALE -#undef OPTIMAL_TEMP_K_PLA_BURN_RATIO + first_gasmix.gases[/datum/gas/hypernoblium][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.gases[/datum/gas/tritium][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 98b6d7fbed7bf..32ed641f9913e 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -7,7 +7,9 @@ density = FALSE max_integrity = 15 - +/obj/structure/spider/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) /obj/structure/spider/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) if(damage_type == BURN)//the stickiness of the web mutes all attack sounds except fire damage type @@ -27,9 +29,11 @@ damage_amount *= 2 . = ..() -/obj/structure/spider/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - take_damage(5, BURN, 0, 0) +/obj/structure/spider/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/structure/spider/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(5, BURN, 0, 0) /obj/structure/spider/stickyweb icon_state = "stickyweb1" @@ -127,9 +131,11 @@ else to_chat(user, span_warning("[src] isn't ready yet!")) -/obj/structure/spider/eggcluster/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 500) - take_damage(5, BURN, 0, 0) +/obj/structure/spider/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/structure/spider/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(5, BURN, 0, 0) /obj/structure/spider/eggcluster/Destroy() var/list/spawners = GLOB.mob_spawners[name] @@ -257,8 +263,8 @@ else if(entry_vent) if(get_dist(src, entry_vent) <= 1) var/list/vents = list() - var/datum/pipeline/entry_vent_parent = entry_vent.parents[1] - for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmosmch) + var/datum/pipenet/entry_vent_parent = entry_vent.parents[1] + for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmos_machines) vents.Add(temp_vent) if(!vents.len) entry_vent = null diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 1f0058906ef67..ef5f9aded2549 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -818,6 +818,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) icon_state = "arcd" item_state = "oldrcd" has_ammobar = FALSE + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING /obj/item/construction/rcd/arcd/afterattack(atom/A, mob/user) . = ..() @@ -928,7 +929,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) for(var/direction in GLOB.cardinals) var/turf/C = get_step(W, direction) var/list/dupes = checkdupes(C) - if(start.CanAtmosPass(C) && !dupes.len) + if(TURF_SHARES(C) && !dupes.len) candidates += C if(!candidates.len) to_chat(user, span_warning("Valid target not found...")) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 598d33b4e5ce2..aafc37b361224 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -6,20 +6,20 @@ RPD #define ATMOS_CATEGORY 0 #define DISPOSALS_CATEGORY 1 #define TRANSIT_CATEGORY 2 -#define PLUMBING_CATEGORY 3 #define BUILD_MODE (1<<0) #define WRENCH_MODE (1<<1) #define DESTROY_MODE (1<<2) -#define PAINT_MODE (1<<3) +#define REPROGRAM_MODE (1<<3) +#define PIPE_LAYER(num) (1<<(num-1)) GLOBAL_LIST_INIT(atmos_pipe_recipes, list( "Pipes" = list( - new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/simple, TRUE), - new /datum/pipe_info/pipe("Manifold", /obj/machinery/atmospherics/pipe/manifold, TRUE), - new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/manifold4w, TRUE), + new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/smart, TRUE), new /datum/pipe_info/pipe("Layer Adapter", /obj/machinery/atmospherics/pipe/layer_manifold, TRUE), + new /datum/pipe_info/pipe("Color Adapter", /obj/machinery/atmospherics/pipe/color_adapter, TRUE), + new /datum/pipe_info/pipe("Bridge Pipe", /obj/machinery/atmospherics/pipe/bridge_pipe, TRUE), new /datum/pipe_info/pipe("Multi-Deck Adapter", /obj/machinery/atmospherics/pipe/multiz, TRUE), new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve, TRUE), new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital, TRUE), @@ -55,6 +55,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Junction", /obj/structure/disposalpipe/junction, PIPE_TRIN_M), new /datum/pipe_info/disposal("Y-Junction", /obj/structure/disposalpipe/junction/yjunction), new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), + new /datum/pipe_info/disposal("Rotator", /obj/structure/disposalpipe/rotator, PIPE_ONEDIR_FLIPPABLE), new /datum/pipe_info/disposal("Package Junction", /obj/structure/disposalpipe/sorting/wrap, PIPE_TRIN_M), new /datum/pipe_info/disposal("Unsorted Mail Junction", /obj/structure/disposalpipe/sorting/unsorted, PIPE_TRIN_M), new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), @@ -77,18 +78,11 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( ), "Station Equipment" = list( new /datum/pipe_info/transit("Through Tube Station", /obj/structure/c_transit_tube/station, PIPE_STRAIGHT), - new /datum/pipe_info/transit("Terminus Tube Station", /obj/structure/c_transit_tube/station/reverse, PIPE_UNARY), + new /datum/pipe_info/transit("Terminus Tube Station", /obj/structure/c_transit_tube/station/reverse, PIPE_UNARY_FLIPPABLE), new /datum/pipe_info/transit("Transit Tube Pod", /obj/structure/c_transit_tube_pod, PIPE_ONEDIR), ) )) -GLOBAL_LIST_INIT(fluid_duct_recipes, list( - "Fluid Ducts" = list( - new /datum/pipe_info/plumbing("Duct", /obj/machinery/duct, PIPE_ONEDIR), - new /datum/pipe_info/plumbing/multilayer("Duct Layer-Manifold",/obj/machinery/duct/multilayered, PIPE_STRAIGHT) - ) -)) - /datum/pipe_info var/name var/icon_state @@ -96,21 +90,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( var/dirtype = PIPE_BENDABLE var/all_layers -/datum/pipe_info/proc/Render(dispenser) - var/dat = "
  • [name]
    • " - - // Stationary pipe dispensers don't allow you to pre-select pipe directions. - // This makes it impossble to spawn bent versions of bendable pipes. - // We add a "Bent" pipe type with a preset diagonal direction to work around it. - if(istype(dispenser, /obj/machinery/pipedispenser) && (dirtype == PIPE_BENDABLE || dirtype == /obj/item/pipe/binary/bendable)) - dat += "
  • Bent [name]
    • " - - return dat - -/datum/pipe_info/proc/Params() - return "" - -/datum/pipe_info/proc/get_preview(selected_dir) +/datum/pipe_info/proc/get_preview(selected_dir, selected = FALSE) var/list/dirs switch(dirtype) if(PIPE_STRAIGHT, PIPE_BENDABLE) @@ -125,7 +105,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( dirs = list("[NORTH]" = "North East South", "[SOUTHWEST]" = "North West South", "[NORTHEAST]" = "South East North", "[SOUTH]" = "South West North", "[WEST]" = "West North East", "[SOUTHEAST]" = "West South East", - "[NORTHWEST]" = "East North West", "[EAST]" = "East South West") + "[NORTHWEST]" = "East North West", "[EAST]" = "East South West",) if(PIPE_UNARY) dirs = list("[NORTH]" = "North", "[SOUTH]" = "South", "[WEST]" = "West", "[EAST]" = "East") if(PIPE_ONEDIR) @@ -133,19 +113,21 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( if(PIPE_UNARY_FLIPPABLE) dirs = list("[NORTH]" = "North", "[EAST]" = "East", "[SOUTH]" = "South", "[WEST]" = "West", "[NORTHEAST]" = "North Flipped", "[SOUTHEAST]" = "East Flipped", "[SOUTHWEST]" = "South Flipped", "[NORTHWEST]" = "West Flipped") - + if(PIPE_ONEDIR_FLIPPABLE) + dirs = list("[SOUTH]" = name, "[SOUTHEAST]" = "[name] Flipped") var/list/rows = list() - var/list/row = list("previews" = list()) - var/i = 0 for(var/dir in dirs) var/numdir = text2num(dir) - var/flipped = ((dirtype == PIPE_TRIN_M) || (dirtype == PIPE_UNARY_FLIPPABLE)) && (numdir in GLOB.diagonals) - row["previews"] += list(list("selected" = (numdir == selected_dir), "dir" = dir2text(numdir), "dir_name" = dirs[dir], "icon_state" = icon_state, "flipped" = flipped)) - if(i++ || dirtype == PIPE_ONEDIR) - rows += list(row) - row = list("previews" = list()) - i = 0 + var/flipped = ((dirtype == PIPE_TRIN_M) || (dirtype == PIPE_UNARY_FLIPPABLE) || (dirtype == PIPE_ONEDIR_FLIPPABLE)) && (ISDIAGONALDIR(numdir)) + var/is_variant_selected = selected && (!selected_dir ? FALSE : (dirtype == PIPE_ONEDIR ? TRUE : (numdir == selected_dir))) + rows += list(list( + "selected" = is_variant_selected, + "dir" = dir2text(numdir), + "dir_name" = dirs[dir], + "icon_state" = icon_state, + "flipped" = flipped, + )) return rows @@ -157,19 +139,14 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( var/obj/item/pipe/c = initial(path.construction_type) dirtype = initial(c.RPD_type) -/datum/pipe_info/pipe/Params() - return "makepipe=[id]&type=[dirtype]" - /datum/pipe_info/meter icon_state = "meter" dirtype = PIPE_ONEDIR + all_layers = TRUE /datum/pipe_info/meter/New(label) name = label -/datum/pipe_info/meter/Params() - return "makemeter=[id]&type=[dirtype]" - /datum/pipe_info/disposal/New(label, obj/path, dt=PIPE_UNARY) name = label id = path @@ -180,9 +157,6 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( dirtype = dt -/datum/pipe_info/disposal/Params() - return "dmake=[id]&type=[dirtype]" - /datum/pipe_info/transit/New(label, obj/path, dt=PIPE_UNARY) name = label id = path @@ -191,15 +165,6 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( if(dt == PIPE_UNARY_FLIPPABLE) icon_state = "[icon_state]_preview" -/datum/pipe_info/plumbing/New(label, obj/path, dt=PIPE_UNARY) - name = label - id = path - icon_state = initial(path.icon_state) - dirtype = dt - -/datum/pipe_info/plumbing/multilayer //exists as identifier so we can see the difference between multi_layer and just ducts properly later on - - /obj/item/pipe_dispenser name = "Rapid Pipe Dispenser (RPD)" desc = "A device used to rapidly pipe things." @@ -216,51 +181,42 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( custom_materials = list(/datum/material/iron=75000, /datum/material/glass=37500) armor_type = /datum/armor/item_pipe_dispenser resistance_flags = FIRE_PROOF + ///Sparks system used when changing device in the UI var/datum/effect_system/spark_spread/spark_system - var/working = 0 + ///Direction of the device we are going to spawn, set up in the UI var/p_dir = NORTH + ///Initial direction of the smart pipe we are going to spawn, set up in the UI + var/p_init_dir = ALL_CARDINALS + ///Is the device of the flipped type? var/p_flipped = FALSE - var/paint_color = "grey" - var/atmos_build_speed = 5 //deciseconds (500ms) - var/disposal_build_speed = 5 - var/transit_build_speed = 5 - var/plumbing_build_speed = 5 - var/destroy_speed = 5 - var/paint_speed = 5 + ///Color of the device we are going to spawn + var/paint_color = "green" + ///Speed of building atmos devices + var/atmos_build_speed = 0.4 SECONDS + ///Speed of building disposal devices + var/disposal_build_speed = 0.5 SECONDS + ///Speed of building transit devices + var/transit_build_speed = 0.5 SECONDS + ///Category currently active (Atmos, disposal, transit) var/category = ATMOS_CATEGORY - var/piping_layer = PIPING_LAYER_DEFAULT + ///All pipe layers we are going to spawn the atmos devices in + var/pipe_layers = PIPE_LAYER(3) + ///Are we laying multiple layers per click + var/multi_layer = FALSE + ///Layer for disposal ducts var/ducting_layer = DUCT_LAYER_DEFAULT + ///Stores the current device to spawn var/datum/pipe_info/recipe + ///Stores the first atmos device var/static/datum/pipe_info/first_atmos + ///Stores the first disposal device var/static/datum/pipe_info/first_disposal + ///Stores the first transit device var/static/datum/pipe_info/first_transit - var/static/datum/pipe_info/first_plumbing - var/mode = BUILD_MODE | DESTROY_MODE | WRENCH_MODE + ///The modes that are allowed for the RPD + var/mode = BUILD_MODE | DESTROY_MODE | WRENCH_MODE | REPROGRAM_MODE /// Bitflags for upgrades var/upgrade_flags - var/locked = FALSE //wheter we can change categories. Useful for the plumber - var/ranged = FALSE - - /// you can remove these through RPD - var/static/list/rpd_targets = typecacheof(list( - /obj/item/pipe, - /obj/item/pipe_meter, - /obj/structure/disposalconstruct, - /obj/structure/disposalpipe/broken, - /obj/structure/c_transit_tube, - /obj/structure/c_transit_tube_pod, - )) - /// you can attempt using RPD on these - var/static/list/rpd_whitelist = typecacheof(list( - /obj/structure/lattice, - /obj/structure/girder, - /obj/item/pipe, - /obj/item/pipe_meter, - /obj/structure/window, - /obj/structure/grille - )) - /// list of atmos constructs that we don't want to attack with RPD - var/static/list/atmos_constructs = typecacheof(list(/obj/machinery/atmospherics, /obj/structure/transit_tube)) /datum/armor/item_pipe_dispenser @@ -301,6 +257,13 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( UnregisterSignal(user, COMSIG_MOB_MOUSE_SCROLL_ON) return ..() +/obj/item/pipe_dispenser/proc/get_active_pipe_layers() + var/list/layer_nums = list() + for(var/pipe_layer_number in 1 to 5) + if(PIPE_LAYER(pipe_layer_number) & pipe_layers) + layer_nums += pipe_layer_number + return layer_nums + /obj/item/pipe_dispenser/cyborg_unequip(mob/user) UnregisterSignal(user, COMSIG_MOB_MOUSE_SCROLL_ON) return ..() @@ -308,29 +271,6 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( /obj/item/pipe_dispenser/attack_self(mob/user) ui_interact(user) -/obj/item/pipe_dispenser/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/rpd_upgrade)) - install_upgrade(W, user) - return TRUE - return ..() - -/** - * Installs an upgrade into the RPD - * - * Installs an upgrade into the RPD checking if it is already installed - * Arguments: - * * rpd_up - RPD upgrade - * * user - mob that use upgrade on RPD - */ -/obj/item/pipe_dispenser/proc/install_upgrade(obj/item/rpd_upgrade/rpd_up, mob/user) - if(rpd_up.upgrade_flags& upgrade_flags) - to_chat(user, span_warning("[src] has already installed this upgrade!")) - return - upgrade_flags |= rpd_up.upgrade_flags - to_chat(user, span_notice("You install this upgrade into [src].")) - playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) - qdel(rpd_up) - /obj/item/pipe_dispenser/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] points the end of the RPD down [user.p_their()] throat and presses a button! It looks like [user.p_theyre()] trying to commit suicide...")) playsound(get_turf(user), 'sound/machines/click.ogg', 50, 1) @@ -352,47 +292,64 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( ui = new(user, src, "RapidPipeDispenser") ui.open() +/obj/item/pipe_dispenser/ui_static_data(mob/user) + var/list/data = list("paint_colors" = GLOB.pipe_paint_colors) + return data + /obj/item/pipe_dispenser/ui_data(mob/user) var/list/data = list( "category" = category, - "piping_layer" = piping_layer, + "multi_layer" = multi_layer, + "pipe_layers" = pipe_layers, "ducting_layer" = ducting_layer, - "preview_rows" = recipe.get_preview(p_dir), "categories" = list(), + "selected_recipe" = recipe.name, "selected_color" = paint_color, - "paint_colors" = GLOB.pipe_paint_colors, "mode" = mode, - "locked" = locked ) - var/list/recipes + //currently selected category (atmos, disposal or transit) + var/list/selected_major_category switch(category) if(ATMOS_CATEGORY) - recipes = GLOB.atmos_pipe_recipes + selected_major_category = GLOB.atmos_pipe_recipes if(DISPOSALS_CATEGORY) - recipes = GLOB.disposal_pipe_recipes + selected_major_category = GLOB.disposal_pipe_recipes if(TRANSIT_CATEGORY) - recipes = GLOB.transit_tube_recipes - if(PLUMBING_CATEGORY) - recipes = GLOB.fluid_duct_recipes - for(var/c in recipes) - var/list/cat = recipes[c] - var/list/r = list() - for(var/i in 1 to cat.len) - var/datum/pipe_info/info = cat[i] - r += list(list("pipe_name" = info.name, "pipe_index" = i, "selected" = (info == recipe), "all_layers" = info.all_layers)) - data["categories"] += list(list("cat_name" = c, "recipes" = r)) - + selected_major_category = GLOB.transit_tube_recipes + //selected subcategory (e.g. pipes/binary/devices/heat exchange for atmos) + for(var/subcategory in selected_major_category) + var/list/subcategory_recipes = selected_major_category[subcategory] + var/list/available_recipe = list() + for(var/i in 1 to subcategory_recipes.len) + var/datum/pipe_info/info = subcategory_recipes[i] + + available_recipe += list(list( + "pipe_name" = info.name, + "pipe_index" = i, + "previews" = info.get_preview(p_dir, info == recipe) + )) + if(info == recipe) + data["selected_category"] = subcategory + + data["categories"] += list(list("cat_name" = subcategory, "recipes" = available_recipe)) + + var/list/init_directions = list("north" = FALSE, "south" = FALSE, "east" = FALSE, "west" = FALSE) + for(var/direction in GLOB.cardinals) + if(p_init_dir & direction) + init_directions[dir2text(direction)] = TRUE + data["init_directions"] = init_directions return data -/obj/item/pipe_dispenser/ui_act(action, params) - if(..()) +/obj/item/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) return + var/playeffect = TRUE switch(action) if("color") paint_color = params["paint_color"] - . = TRUE if("category") category = text2num(params["category"]) switch(category) @@ -402,279 +359,327 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( recipe = first_atmos if(TRANSIT_CATEGORY) recipe = first_transit - if(PLUMBING_CATEGORY) - recipe = first_plumbing p_dir = NORTH playeffect = FALSE - . = TRUE - if("piping_layer") - piping_layer = text2num(params["piping_layer"]) + if("pipe_layers") + var/selected_layers = text2num(params["pipe_layers"]) + var/valid_layer = FALSE + for(var/pipe_layer_number in 1 to 5) + if(!(PIPE_LAYER(pipe_layer_number) & selected_layers)) + continue + valid_layer = TRUE + if(!valid_layer) + return + if(multi_layer) + if(pipe_layers != selected_layers) + pipe_layers ^= selected_layers + else + pipe_layers = selected_layers playeffect = FALSE - . = TRUE + if("toggle_multi_layer") + if(multi_layer) + pipe_layers = PIPE_LAYER(max(get_active_pipe_layers())) + multi_layer = !multi_layer if("ducting_layer") ducting_layer = text2num(params["ducting_layer"]) playeffect = FALSE - . = TRUE if("pipe_type") var/static/list/recipes if(!recipes) - recipes = GLOB.disposal_pipe_recipes + GLOB.atmos_pipe_recipes + GLOB.transit_tube_recipes + GLOB.fluid_duct_recipes + recipes = GLOB.disposal_pipe_recipes + GLOB.atmos_pipe_recipes + GLOB.transit_tube_recipes recipe = recipes[params["category"]][text2num(params["pipe_type"])] p_dir = NORTH - . = TRUE if("setdir") p_dir = text2dir(params["dir"]) p_flipped = text2num(params["flipped"]) playeffect = FALSE - . = TRUE if("mode") - var/n = text2num(params["mode"]) - . = TRUE - if(mode & n) - mode &= ~n + var/selected_mode = text2num(params["mode"]) + mode ^= selected_mode + if("init_dir_setting") + var/target_dir = p_init_dir ^ text2dir(params["dir_flag"]) + // Refuse to create a smart pipe that can only connect in one direction (it would act weirdly and lack an icon) + if (ISNOTSTUB(target_dir)) + p_init_dir = target_dir else - mode |= n - if(playeffect && .) + to_chat(usr, span_warning("The [src]'s screen flashes a warning: Can't configure a pipe to only connect in one direction.")) + playeffect = FALSE + if("init_reset") + p_init_dir = ALL_CARDINALS + if(playeffect) spark_system.start() playsound(get_turf(src), 'sound/effects/pop.ogg', 50, FALSE) + return TRUE -/obj/item/pipe_dispenser/attack_atom(obj/O, mob/living/user) - // don't attempt to attack what we don't want to attack - if(is_type_in_typecache(O, atmos_constructs) || is_type_in_typecache(O, rpd_targets) || is_type_in_typecache(O, rpd_whitelist)) - return - - return ..() - -/obj/item/pipe_dispenser/afterattack(atom/A, mob/user, proximity) - if(!user.IsAdvancedToolUser() || istype(A, /turf/open/space/transit)) +/obj/item/pipe_dispenser/pre_attack(atom/atom_to_attack, mob/user, params) + if(!user.IsAdvancedToolUser() || istype(atom_to_attack, /turf/open/space/transit)) return ..() - // this shouldn't use early return because checking less condition is good - if(isturf(A) || is_type_in_typecache(A, atmos_constructs) || is_type_in_typecache(A, rpd_targets) || is_type_in_typecache(A, rpd_whitelist)) - if(proximity || ranged) - rpd_create(A, user) - return - - return ..() - -/obj/item/pipe_dispenser/proc/rpd_create(atom/A, mob/user) + if(istype(atom_to_attack, /obj/item/rpd_upgrade)) + install_upgrade(atom_to_attack, user) + return TRUE - var/atom/attack_target = A + var/atom/attack_target = atom_to_attack //So that changing the menu settings doesn't affect the pipes already being built. - var/queued_p_type = recipe.id - var/queued_p_dir = p_dir - var/queued_p_flipped = p_flipped + var/queued_pipe_type = recipe.id + var/queued_pipe_dir = p_dir + var/queued_pipe_flipped = p_flipped //Unwrench pipe before we build one over/paint it, but only if we're not already running a do_after on it already to prevent a potential runtime. if((mode & DESTROY_MODE) && (upgrade_flags & RPD_UPGRADE_UNWRENCH) && istype(attack_target, /obj/machinery/atmospherics) && !(DOING_INTERACTION_WITH_TARGET(user, attack_target))) - attack_target.wrench_act(user, src) - return + attack_target = attack_target.wrench_act(user, src) + if(!isatom(attack_target)) //can return null, FALSE if do_after() fails see /obj/machinery/atmospherics/wrench_act() + return TRUE - //make sure what we're clicking is valid for the current category - if(istype(attack_target, /obj/machinery/atmospherics) && ((mode & BUILD_MODE) && !(mode & PAINT_MODE))) //target turf if on buildmode so that it doesn't try painting a pipe you click on + if(istype(attack_target, /obj/machinery/atmospherics) && (mode & BUILD_MODE)) attack_target = get_turf(attack_target) - var/can_make_pipe = (isturf(attack_target) || is_type_in_typecache(attack_target, rpd_whitelist)) - . = TRUE + var/can_make_pipe = check_can_make_pipe(attack_target) - if((mode & DESTROY_MODE) && is_type_in_typecache(A, rpd_targets)) - to_chat(user, span_notice("You start destroying a pipe...")) - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - if(do_after(user, destroy_speed, target = attack_target)) - activate() - qdel(attack_target) + if((mode & DESTROY_MODE) && istype(attack_target, /obj/item/pipe) || istype(attack_target, /obj/structure/disposalconstruct) || istype(attack_target, /obj/structure/c_transit_tube) || istype(attack_target, /obj/structure/c_transit_tube_pod) || istype(attack_target, /obj/item/pipe_meter) || istype(attack_target, /obj/structure/disposalpipe/broken)) + activate() + qdel(attack_target) return - if(mode & PAINT_MODE) - var/obj/machinery/atmospherics/M = attack_target - if(istype(M) && M.paintable) - to_chat(user, span_notice("You start painting \the [M] [paint_color]...")) - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - if(do_after(user, paint_speed, target = M)) - M.paint(GLOB.pipe_paint_colors[paint_color]) //paint the pipe - user.visible_message(span_notice("[user] paints \the [M] [paint_color]."),span_notice("You paint \the [M] [paint_color].")) + if(mode & REPROGRAM_MODE) + // If this is a placed smart pipe, try to reprogram it + var/obj/machinery/atmospherics/pipe/smart/target_smart_pipe = attack_target + if(istype(target_smart_pipe)) + if(target_smart_pipe.dir == ALL_CARDINALS) + balloon_alert(user, "has no unconnected directions!") + return + var/old_init_dir = target_smart_pipe.get_init_directions() + if(old_init_dir == p_init_dir) + balloon_alert(user, "already configured!") + return + // Check for differences in unconnected directions + var/target_differences = (p_init_dir ^ old_init_dir) & ~target_smart_pipe.connections + if(!target_differences) + balloon_alert(user, "already configured for its directions!") + return + + activate() + + // Something else could have changed the target's state while we were waiting in do_after + // Most of the edge cases don't matter, but atmos components being able to have live connections not described by initializable directions sounds like a headache at best and an exploit at worst + + // Double check to make sure that nothing has changed. If anything we were about to change was connected during do_after, abort + if(target_differences & target_smart_pipe.connections) + balloon_alert(user, "can't configure for its direction!") + return + // Grab the current initializable directions, which may differ from old_init_dir if someone else was working on the same pipe at the same time + var/current_init_dir = target_smart_pipe.get_init_directions() + // Access p_init_dir directly. The RPD can change target layer and initializable directions (though not pipe type or dir) while working to dispense and connect a component, + // and have it reflected in the final result. Reprogramming should be similarly consistent. + var/new_init_dir = (current_init_dir & ~target_differences) | (p_init_dir & target_differences) + // Don't make a smart pipe with only one connection + if(ISSTUB(new_init_dir)) + balloon_alert(user, "no one directional pipes allowed!") + return + target_smart_pipe.set_init_directions(new_init_dir) + // We're now reconfigured. + // We can never disconnect from existing connections, but we can connect to previously unconnected directions, and should immediately do so + var/newly_permitted_connections = new_init_dir & ~current_init_dir + if(newly_permitted_connections) + // We're allowed to connect in new directions. Recompute our nodes + // Disconnect from everything that is currently connected + for(var/i in 1 to target_smart_pipe.device_type) + // This is basically pipe.nullifyNode, but using it here would create a pitfall for others attempting to + // copy and paste disconnection code for other components. Welcome to the atmospherics subsystem + var/obj/machinery/atmospherics/node = target_smart_pipe.nodes[i] + if(!node) + continue + node.disconnect(target_smart_pipe) + target_smart_pipe.nodes[i] = null + // Get our new connections + target_smart_pipe.atmos_init() + // Connect to our new connections + for(var/obj/machinery/atmospherics/connected_device in target_smart_pipe.nodes) + connected_device.atmos_init() + connected_device.add_member(target_smart_pipe) + SSair.add_to_rebuild_queue(target_smart_pipe) + // Finally, update our internal state - update_pipe_icon also updates dir and connections + target_smart_pipe.update_pipe_icon() + user.visible_message(span_notice("[user] reprograms the [target_smart_pipe]."), span_notice("You reprogram the [target_smart_pipe].")) return - var/obj/item/pipe/P = attack_target - if(istype(P) && P.paintable) - to_chat(user, span_notice("You start painting \the [P] [paint_color]...")) - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - if(do_after(user, paint_speed, target = P)) - P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) //paint the pipe - user.visible_message(span_notice("[user] paints \the [P] [paint_color]."),span_notice("You paint \the [P] [paint_color].")) + // If this is an unplaced smart pipe, try to reprogram it + var/obj/item/pipe/quaternary/target_unsecured_pipe = attack_target + if(istype(target_unsecured_pipe) && ispath(target_unsecured_pipe.pipe_type, /obj/machinery/atmospherics/pipe/smart)) + // An unplaced pipe never has any existing connections, so just directly assign the new configuration + target_unsecured_pipe.p_init_dir = p_init_dir + target_unsecured_pipe.update() return if(mode & BUILD_MODE) switch(category) //if we've gotten this var, the target is valid if(ATMOS_CATEGORY) //Making pipes - if(!can_make_pipe) - return - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - if (recipe.type == /datum/pipe_info/meter) - to_chat(user, span_notice("You start building a meter...")) - if(do_after(user, atmos_build_speed, target = attack_target)) - activate() - var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(attack_target)) - PM.setAttachLayer(piping_layer) - if(mode & WRENCH_MODE) - PM.wrench_act(user, src) - else - if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5)) - to_chat(user, span_notice("You can't build this object on the layer...")) - return - to_chat(user, span_notice("You start building a pipe...")) - if(do_after(user, atmos_build_speed, target = attack_target)) - if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5)) // double check to stop cheaters (and to not waste time waiting for something that can't be placed) - to_chat(user, span_notice("You can't build this object on the layer...")) - return - activate() - var/obj/machinery/atmospherics/path = queued_p_type - var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe - var/obj/item/pipe/P = new pipe_item_type(get_turf(attack_target), queued_p_type, queued_p_dir) - - if(queued_p_flipped && istype(P, /obj/item/pipe/trinary/flippable)) - var/obj/item/pipe/trinary/flippable/F = P - F.flipped = queued_p_flipped - - P.update() - P.add_fingerprint(usr) - P.setPipingLayer(piping_layer) - if(findtext("[queued_p_type]", "/obj/machinery/atmospherics/pipe") && !findtext("[queued_p_type]", "layer_manifold")) - P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) - if(mode & WRENCH_MODE) - P.wrench_act(user, src) + if(!do_pipe_build(attack_target, user, params)) + return ..() if(DISPOSALS_CATEGORY) //Making disposals pipes if(!can_make_pipe) - return + return ..() attack_target = get_turf(attack_target) if(isclosedturf(attack_target)) - to_chat(user, span_warning("[src]'s error light flickers; there's something in the way!")) + balloon_alert(user, "target is blocked!") return - to_chat(user, span_notice("You start building a disposals pipe...")) - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + activate() if(do_after(user, disposal_build_speed, target = attack_target)) - var/obj/structure/disposalconstruct/C = new (attack_target, queued_p_type, queued_p_dir, queued_p_flipped) + var/obj/structure/disposalconstruct/new_disposals_segment = new (attack_target, queued_pipe_type, queued_pipe_dir, queued_pipe_flipped) - if(!C.can_place()) - to_chat(user, span_warning("There's not enough room to build that here!")) - qdel(C) + if(!new_disposals_segment.can_place()) + balloon_alert(user, "not enough room!") + qdel(new_disposals_segment) return activate() - C.add_fingerprint(usr) - C.update_icon() + new_disposals_segment.add_fingerprint(usr) + new_disposals_segment.update_appearance() if(mode & WRENCH_MODE) - C.wrench_act(user, src) + new_disposals_segment.wrench_act(user, src) return if(TRANSIT_CATEGORY) //Making transit tubes if(!can_make_pipe) - return + return ..() attack_target = get_turf(attack_target) if(isclosedturf(attack_target)) - to_chat(user, span_warning("[src]'s error light flickers; there's something in the way!")) + balloon_alert(user, "something in the way!") return - to_chat(user, span_notice("You start building a transit tube...")) - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + + var/turf/target_turf = get_turf(attack_target) + if(target_turf.is_blocked_turf(exclude_mobs = TRUE)) + balloon_alert(user, "something in the way!") + return + + activate() if(do_after(user, transit_build_speed, target = attack_target)) activate() - if(queued_p_type == /obj/structure/c_transit_tube_pod) + if(queued_pipe_type == /obj/structure/c_transit_tube_pod) var/obj/structure/c_transit_tube_pod/pod = new /obj/structure/c_transit_tube_pod(attack_target) pod.add_fingerprint(usr) if(mode & WRENCH_MODE) pod.wrench_act(user, src) else - var/obj/structure/c_transit_tube/tube = new queued_p_type(attack_target) - tube.setDir(queued_p_dir) + var/obj/structure/c_transit_tube/tube = new queued_pipe_type(attack_target) + tube.setDir(queued_pipe_dir) - if(queued_p_flipped) - tube.setDir(turn(queued_p_dir, 45)) - tube.simple_rotate_flip() + if(queued_pipe_flipped) + tube.setDir(turn(queued_pipe_dir, 45 + ROTATION_FLIP)) + tube.post_rotation(user, ROTATION_FLIP) tube.add_fingerprint(usr) if(mode & WRENCH_MODE) tube.wrench_act(user, src) return + else + return ..() - if(PLUMBING_CATEGORY) //Making pancakes - if(!can_make_pipe) - return - attack_target = get_turf(attack_target) - if(isclosedturf(attack_target)) - to_chat(user, span_warning("[src]'s error light flickers; there's something in the way!")) - return - to_chat(user, span_notice("You start building a fluid duct...")) - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - if(do_after(user, plumbing_build_speed, target = A)) - var/obj/machinery/duct/D - if(recipe.type == /datum/pipe_info/plumbing/multilayer) - var/temp_connects = NORTH + SOUTH - if(queued_p_dir == EAST) - temp_connects = EAST + WEST - D = new queued_p_type (attack_target, TRUE, GLOB.pipe_paint_colors[paint_color], ducting_layer, temp_connects) - else - D = new queued_p_type (attack_target, TRUE, GLOB.pipe_paint_colors[paint_color], ducting_layer) - D.add_fingerprint(usr) - if(mode & WRENCH_MODE) - D.wrench_act(user, src) +/obj/item/pipe_dispenser/attackby(obj/item/item, mob/user, params) + if(istype(item, /obj/item/rpd_upgrade)) + install_upgrade(item, user) + return TRUE + return ..() - else - return +/// Installs an upgrade into the RPD after checking if it is already installed +/obj/item/pipe_dispenser/proc/install_upgrade(obj/item/rpd_upgrade/rpd_disk, mob/user) + // Check if the upgrade's already present + if(rpd_disk.upgrade_flags & upgrade_flags) + balloon_alert(user, "already installed!") + return + // Adds the upgrade from the disk and then deletes the disk + upgrade_flags |= rpd_disk.upgrade_flags + playsound(loc, 'sound/machines/click.ogg', 50, vary = TRUE) + balloon_alert(user, "upgrade installed") + qdel(rpd_disk) /obj/item/pipe_dispenser/proc/activate() playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) -/obj/item/pipe_dispenser/proc/mouse_wheeled(mob/source, atom/A, delta_x, delta_y, params) +/obj/item/pipe_dispenser/proc/check_can_make_pipe(atom/target_of_attack) + //make sure what we're clicking is valid for the current category + var/static/list/make_pipe_whitelist = typecacheof(list(/obj/structure/lattice, /obj/structure/girder, /obj/item/pipe, /obj/structure/window, /obj/structure/grille)) + var/can_we_make_pipe = (isturf(target_of_attack) || is_type_in_typecache(target_of_attack, make_pipe_whitelist)) + return can_we_make_pipe + +/obj/item/pipe_dispenser/proc/do_pipe_build(atom/atom_to_target, mob/user, params) + //So that changing the menu settings doesn't affect the pipes already being built. + var/queued_pipe_type = recipe.id + var/queued_pipe_dir = p_dir + var/queued_pipe_flipped = p_flipped + + var/can_make_pipe = check_can_make_pipe(atom_to_target) + var/list/pipe_layer_numbers = get_active_pipe_layers() + var/continued_build = FALSE + for(var/pipe_layer_num in 1 to length(pipe_layer_numbers)) + var/layer_to_build = pipe_layer_numbers[pipe_layer_num] + if(layer_to_build != pipe_layer_numbers[1]) + continued_build = TRUE + if(!layer_to_build) + return FALSE + if(!can_make_pipe) + return FALSE + activate() + if(!continued_build && !do_after(user, atmos_build_speed, target = atom_to_target)) + return FALSE + if(!recipe.all_layers && (layer_to_build == 1 || layer_to_build == 5)) + balloon_alert(user, "can't build on layer [layer_to_build]!") + if(multi_layer) + continue + return FALSE + activate() + if(recipe.type == /datum/pipe_info/meter) + var/obj/item/pipe_meter/new_meter = new /obj/item/pipe_meter(get_turf(atom_to_target)) + new_meter.set_attach_layer(layer_to_build) + if(mode & WRENCH_MODE) + new_meter.wrench_act(user, src) + else + var/obj/machinery/atmospherics/path = queued_pipe_type + var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe + var/obj/item/pipe/pipe_type = new pipe_item_type( + get_turf(atom_to_target), + queued_pipe_type, + queued_pipe_dir, + null, + GLOB.pipe_paint_colors[paint_color], + ispath(queued_pipe_type, /obj/machinery/atmospherics/pipe/smart) ? p_init_dir : null, + ) + if(queued_pipe_flipped && istype(pipe_type, /obj/item/pipe/trinary/flippable)) + var/obj/item/pipe/trinary/flippable/new_flippable_pipe = pipe_type + new_flippable_pipe.flipped = queued_pipe_flipped + + pipe_type.update() + pipe_type.add_fingerprint(usr) + pipe_type.set_piping_layer(layer_to_build) + if(ispath(queued_pipe_type, /obj/machinery/atmospherics) && !ispath(queued_pipe_type, /obj/machinery/atmospherics/pipe/color_adapter)) + pipe_type.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) + if(mode & WRENCH_MODE) + pipe_type.wrench_act(user, src) + return TRUE + +///Changes the piping layer when the mousewheel is scrolled up or down. +/obj/item/pipe_dispenser/proc/mouse_wheeled(mob/source_mob, atom/A, delta_x, delta_y, params) SIGNAL_HANDLER - if(loc != source) - UnregisterSignal(source, COMSIG_MOB_MOUSE_SCROLL_ON) + if(multi_layer) + balloon_alert(source_mob, "turn off multi layer!") return - - if(source.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) + if(source_mob.incapacitated()) + return + if(source_mob.get_active_held_item() != src) return if(delta_y < 0) - piping_layer = min(PIPING_LAYER_MAX, piping_layer + 1) + pipe_layers = min(PIPE_LAYER(5), pipe_layers << 1) else if(delta_y > 0) - piping_layer = max(PIPING_LAYER_MIN, piping_layer - 1) - else + pipe_layers = max(PIPE_LAYER(1), pipe_layers >> 1) + else //mice with side-scrolling wheels are apparently a thing and fuck this up return SStgui.update_uis(src) + balloon_alert(source_mob, "set pipe layer to [get_active_pipe_layers()[1]]") - to_chat(source, span_notice("You set the layer to [piping_layer].")) - -/obj/item/pipe_dispenser/plumbing - name = "Plumberinator" - desc = "A crude device to rapidly plumb things." - icon_state = "plumberer" - category = PLUMBING_CATEGORY - locked = TRUE - -/obj/item/pipe_dispenser/plumbing/Initialize(mapload) - . = ..() - spark_system = new - spark_system.set_up(5, 0, src) - spark_system.attach(src) - if(!first_plumbing) - first_plumbing = GLOB.fluid_duct_recipes[GLOB.fluid_duct_recipes[1]][1] - - recipe = first_plumbing - -/obj/item/pipe_dispenser/plumbing/install_upgrade(obj/item/rpd_upgrade/rpd_up, mob/user) - to_chat(user, span_warning("You fail to install this upgrade into [src]!")) - -#undef ATMOS_CATEGORY -#undef DISPOSALS_CATEGORY -#undef TRANSIT_CATEGORY -#undef PLUMBING_CATEGORY - -#undef BUILD_MODE -#undef DESTROY_MODE -#undef PAINT_MODE -#undef WRENCH_MODE /obj/item/rpd_upgrade name = "RPD advanced design disk" @@ -685,5 +690,18 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( var/upgrade_flags /obj/item/rpd_upgrade/unwrench - desc = "Adds reverse wrench mode to the RPD. A warning label reads: This mode is hard linked to the destroy mode control button!" + name = "RPD advanced upgrade: wrench mode" + desc = "Adds reverse wrench mode to the RPD. Attention, due to budget cuts, the mode is hard linked to the destroy mode control button." + icon_state = "datadisk1" upgrade_flags = RPD_UPGRADE_UNWRENCH + +#undef ATMOS_CATEGORY +#undef DISPOSALS_CATEGORY +#undef TRANSIT_CATEGORY + +#undef BUILD_MODE +#undef DESTROY_MODE +#undef WRENCH_MODE +#undef REPROGRAM_MODE + +#undef PIPE_LAYER diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 9de172534ac86..2205824fe88d9 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -213,27 +213,34 @@ var/prevname = "[A.name]" set_area_machinery_title(A, new_name, prevname) A.name = new_name + require_area_resort() //area renamed so resort the names + if(A.firedoors) for(var/D in A.firedoors) var/obj/machinery/door/firedoor/FD = D - FD.CalculateAffectingAreas() + FD.calculate_affecting_areas() A.update_areasize() return TRUE -/proc/set_area_machinery_title(area/A, title, oldtitle) +/proc/set_area_machinery_title(area/area, title, oldtitle) if(!oldtitle) // or replacetext goes to infinite loop return - for(var/obj/machinery/airalarm/M in A) - M.name = replacetext(M.name,oldtitle,title) - for(var/obj/machinery/power/apc/M in A) - M.name = replacetext(M.name,oldtitle,title) - for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/M in A) - M.name = replacetext(M.name,oldtitle,title) - for(var/obj/machinery/atmospherics/components/unary/vent_pump/M in A) - M.name = replacetext(M.name,oldtitle,title) - for(var/obj/machinery/door/M in A) - M.name = replacetext(M.name,oldtitle,title) + + //stuff tied to the area to rename + var/list/to_rename = list( + /obj/machinery/airalarm, + /obj/machinery/atmospherics/components/unary/vent_scrubber, + /obj/machinery/atmospherics/components/unary/vent_pump, + /obj/machinery/door, + /obj/machinery/firealarm, + /obj/machinery/light_switch, + /obj/machinery/power/apc, + ) + + for(var/obj/machine as anything in area) + if(is_type_in_list(machine, to_rename)) + machine.name = replacetext(machine.name, oldtitle, title) //TODO: much much more. Unnamed airlocks, cameras, etc. #undef AREA_ERRNONE diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index 08f017e40ba45..63b713742870f 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -258,9 +258,9 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/chrono_field) /obj/structure/chrono_field/return_air() //we always have nominal air and temperature var/datum/gas_mixture/GM = new - GM.set_moles(GAS_O2, MOLES_O2STANDARD) - GM.set_moles(GAS_N2, MOLES_N2STANDARD) - GM.set_temperature(T20C) + SET_MOLES(/datum/gas/oxygen, GM, MOLES_O2STANDARD) + SET_MOLES(/datum/gas/nitrogen, GM, MOLES_N2STANDARD) + GM.temperature = T20C return GM /obj/structure/chrono_field/singularity_act() diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 93ab9b69b03d8..48d11182a7478 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -82,53 +82,85 @@ build_path = /obj/machinery/computer/atmos_alert /obj/item/circuitboard/computer/atmos_control - name = "atmospheric monitor console (Computer Board)" + name = "Atmospheric Control (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/atmos_control -/obj/item/circuitboard/computer/atmos_control/tank - name = "tank control console (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank +/obj/item/circuitboard/computer/atmos_control/nocontrol + name = "Atmospheric Monitor (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/nocontrol -/obj/item/circuitboard/computer/atmos_control/tank/oxygen_tank - name = "oxygen supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/oxygen_tank +/obj/item/circuitboard/computer/atmos_control/noreconnect + name = "Atmospheric Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/noreconnect -/obj/item/circuitboard/computer/atmos_control/tank/plasma_tank - name = "plasma supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/plasma_tank +/obj/item/circuitboard/computer/atmos_control/fixed + name = "Atmospheric Monitor (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/fixed -/obj/item/circuitboard/computer/atmos_control/tank/air_tank - name = "mixed air supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/air_tank +/obj/item/circuitboard/computer/atmos_control/nocontrol/master + name = "Station Atmospheric Monitor (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/nocontrol/master -/obj/item/circuitboard/computer/atmos_control/tank/mix_tank - name = "gas mix supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/mix_tank +/obj/item/circuitboard/computer/atmos_control/nocontrol/incinerator + name = "Incinerator Chamber Monitor (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/nocontrol/incinerator -/obj/item/circuitboard/computer/atmos_control/tank/nitrous_tank - name = "nitrous oxide supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/nitrous_tank +/obj/item/circuitboard/computer/atmos_control/toxinsmix + name = "Toxins Chamber Monitor (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/toxinsmix -/obj/item/circuitboard/computer/atmos_control/tank/nitrogen_tank - name = "nitrogen supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/nitrogen_tank +/obj/item/circuitboard/computer/atmos_control/oxygen_tank + name = "Oxygen Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/oxygen_tank -/obj/item/circuitboard/computer/atmos_control/tank/carbon_tank - name = "carbon dioxide supply control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/carbon_tank +/obj/item/circuitboard/computer/atmos_control/plasma_tank + name = "Plasma Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/plasma_tank -/obj/item/circuitboard/computer/atmos_control/tank/incinerator - name = "incinerator air control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/incinerator +/obj/item/circuitboard/computer/atmos_control/air_tank + name = "Mixed Air Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/air_tank -/obj/item/circuitboard/computer/atmos_control/tank/sm_waste - name = "supermatter waste control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/sm_waste +/obj/item/circuitboard/computer/atmos_control/mix_tank + name = "Gas Mix Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/mix_tank -/obj/item/circuitboard/computer/atmos_control/tank/toxins_waste - name = "toxins waste control (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/tank/toxins_waste_tank +/obj/item/circuitboard/computer/atmos_control/nitrous_tank + name = "Nitrous Oxide Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/nitrous_tank + +/obj/item/circuitboard/computer/atmos_control/nitrogen_tank + name = "Nitrogen Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/nitrogen_tank + +/obj/item/circuitboard/computer/atmos_control/carbon_tank + name = "Carbon Dioxide Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/carbon_tank + +/obj/item/circuitboard/computer/atmos_control/bz_tank + name = "BZ Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/bz_tank + +/obj/item/circuitboard/computer/atmos_control/hypernoblium_tank + name = "Hypernoblium Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/hypernoblium_tank + +/obj/item/circuitboard/computer/atmos_control/nitryl_tank + name = "Nitryl Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/nitryl_tank + +/obj/item/circuitboard/computer/atmos_control/pluoxium_tank + name = "Pluoxium Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/pluoxium_tank + +/obj/item/circuitboard/computer/atmos_control/tritium_tank + name = "Tritium Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/tritium_tank + +/obj/item/circuitboard/computer/atmos_control/water_vapor + name = "Water Vapor Supply Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/water_vapor /obj/item/circuitboard/computer/auxillary_base name = "auxillary base management console (Computer Board)" diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index f42f75e33dcbd..75e6e3977e943 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -380,7 +380,7 @@ /obj/item/circuitboard/machine/thermomachine name = "thermomachine (Machine Board)" icon_state = "engineering" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer + build_path = /obj/machinery/atmospherics/components/unary/thermomachine var/pipe_layer = PIPING_LAYER_DEFAULT req_components = list( /obj/item/stock_parts/matter_bin = 2, @@ -782,7 +782,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge) /obj/item/circuitboard/machine/cryo_tube name = "cryotube (Machine Board)" icon_state = "medical" - build_path = /obj/machinery/atmospherics/components/unary/cryo_cell + build_path = /obj/machinery/cryo_cell req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 1, diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index e1a8d01c8643f..5c767d8faeefa 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -182,10 +182,6 @@ atmos_build_speed = 0.1 disposal_build_speed = 0.1 transit_build_speed = 0.1 - plumbing_build_speed = 0.1 - destroy_speed = 0.1 - paint_speed = 0.1 - ranged = TRUE upgrade_flags = RPD_UPGRADE_UNWRENCH /obj/item/spellbook/debug diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index 726cb7d23a8a1..8ec80d35387e2 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -10,7 +10,7 @@ var/obj/item/electronics/airlock/electronics = null var/circuits = 5 //How many circuits the pseudocircuit has left var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \ - /obj/item/electronics/apc, /obj/item/electronics/advanced_airlock_controller, /obj/item/electronics/airlock))//A typecache of circuits consumable for material + /obj/item/electronics/apc, /obj/item/electronics/airlock))//A typecache of circuits consumable for material /obj/item/electroadaptive_pseudocircuit/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index f342591529e26..249420956a8e3 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -86,7 +86,7 @@ z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP mouse_opacity = MOUSE_OPACITY_OPAQUE resistance_flags = INDESTRUCTIBLE - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY armor_type = /datum/armor/structure_projected_forcefield var/obj/item/forcefield_projector/generator diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index a083461e3fd5d..c194ec4ab5979 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -533,6 +533,7 @@ GENE SCANNER var/cooldown = FALSE var/cooldown_time = 250 var/accuracy // 0 is the best accuracy. + var/ranged_scan_distance = 1 /obj/item/analyzer/examine(mob/user) . = ..() @@ -563,7 +564,7 @@ GENE SCANNER if(!istype(location)) return - scan_turf(user, location) + atmos_scan(user=user, target=get_turf(src), silent=FALSE) /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens @@ -627,7 +628,13 @@ GENE SCANNER amount += inaccurate return DisplayTimeText(max(1,amount)) -/proc/atmosanalyzer_scan(mob/user, atom/target, silent=FALSE, to_chat = TRUE) +/obj/item/analyzer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + . = ..() + if(!can_see(user, target, ranged_scan_distance)) + return + atmos_scan(user, (target.return_analyzable_air() ? target : get_turf(target))) + +/proc/atmos_scan(mob/user, atom/target, silent=FALSE) var/mixture = target.return_analyzable_air() if(!mixture) return FALSE @@ -648,16 +655,20 @@ GENE SCANNER var/pressure = air_contents.return_pressure() var/volume = air_contents.return_volume() //could just do mixture.volume... but safety, I guess? var/temperature = air_contents.return_temperature() + var/heat_capacity = air_contents.heat_capacity() + var/thermal_energy = air_contents.thermal_energy() var/cached_scan_results = air_contents.analyzer_results if(total_moles > 0) message += span_notice("Moles: [round(total_moles, 0.01)] mol") message += span_notice("Volume: [volume] L") message += span_notice("Pressure: [round(pressure,0.01)] kPa") + message += span_notice("Heat Capacity: [display_joules(heat_capacity)] / K") + message += span_notice("Thermal Energy: [display_joules(thermal_energy)]") - for(var/id in air_contents.get_gases()) - var/gas_concentration = air_contents.get_moles(id)/total_moles - message += span_notice("[GLOB.gas_data.names[id]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)") + for(var/id in air_contents.gases) + var/gas_concentration = GET_MOLES(id,air_contents)/total_moles + message += span_notice("[air_contents.gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(GET_MOLES(id, air_contents), 0.01)] mol)") message += span_notice("Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)") else @@ -672,57 +683,9 @@ GENE SCANNER message += span_boldnotice("Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.") message += span_notice("Instability of the last fusion reaction: [instability].") - if(to_chat) - to_chat(user, EXAMINE_BLOCK(jointext(message, "\n")), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO) - return TRUE - else - return(jointext(message, "\n")) - -/obj/item/analyzer/proc/scan_turf(mob/user, turf/location) - var/list/message = list() - var/datum/gas_mixture/environment = location.return_air() - - var/pressure = environment.return_pressure() - var/total_moles = environment.total_moles() - - message += span_info("Results:") - if(abs(pressure - ONE_ATMOSPHERE) < 10) - message += span_info("Pressure: [round(pressure, 0.01)] kPa") - else - message += span_alert("Pressure: [round(pressure, 0.01)] kPa") - if(total_moles) - var/o2_concentration = environment.get_moles(GAS_O2)/total_moles - var/n2_concentration = environment.get_moles(GAS_N2)/total_moles - var/co2_concentration = environment.get_moles(GAS_CO2)/total_moles - var/plasma_concentration = environment.get_moles(GAS_PLASMA)/total_moles - - if(abs(n2_concentration - N2STANDARD) < 20) - message += span_info("Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_N2), 0.01)] mol)") - else - message += span_alert("Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_N2), 0.01)] mol)") - - if(abs(o2_concentration - O2STANDARD) < 2) - message += span_info("Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_O2), 0.01)] mol)") - else - message += span_alert("Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_O2), 0.01)] mol)") - - if(co2_concentration > 0.01) - message += span_alert("CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_CO2), 0.01)] mol)") - else - message += span_info("CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_CO2), 0.01)] mol)") - - if(plasma_concentration > 0.005) - message += span_alert("Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_PLASMA), 0.01)] mol)") - else - message += span_info("Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(GAS_PLASMA), 0.01)] mol)") - - for(var/id in environment.get_gases()) - if(id in GLOB.hardcoded_gases) - continue - var/gas_concentration = environment.get_moles(id)/total_moles - message += span_alert("[GLOB.gas_data.names[id]]: [round(gas_concentration*100, 0.01)] % ([round(environment.get_moles(id), 0.01)] mol)") - message += span_info("Temperature: [round(environment.return_temperature()-T0C, 0.01)] °C ([round(environment.return_temperature(), 0.01)] K)") - to_chat(user, EXAMINE_BLOCK(jointext(message, "\n"))) + // we let the join apply newlines so we do need handholding + to_chat(user, EXAMINE_BLOCK(jointext(message, "\n")), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO) + return TRUE /obj/item/analyzer/ranged desc = "A hand-held scanner which uses advanced spectroscopy and infrared readings to analyze gases as a distance. Alt-Click to use the built in barometer function." @@ -730,14 +693,7 @@ GENE SCANNER icon = 'icons/obj/device.dmi' icon_state = "ranged_analyzer" worn_icon_state = "analyzer" - -/obj/item/analyzer/ranged/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - . = ..() - if(target.tool_act(user, src, tool_behaviour)) - return - // Tool act didn't scan it, so let's get it's turf. - var/turf/location = get_turf(target) - scan_turf(user, location) + ranged_scan_distance = 15 //slime scanner diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 0b2207424f3a1..456d0560b0c4e 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -126,35 +126,44 @@ if(sensor.on && sensor.visible) add_overlay("proxy_beam") -/obj/item/transfer_valve/proc/merge_gases(datum/gas_mixture/target, change_volume = TRUE) - var/target_self = FALSE - if(!target || (target == tank_one.air_contents)) - target = tank_two.air_contents - if(target == tank_two.air_contents) - target_self = TRUE +/// Merge both gases into a single tank. Combine the volume by default. If target tank isn't specified default to tank_two +/obj/item/transfer_valve/proc/merge_gases(obj/item/tank/target, change_volume = TRUE) + if(!target) + target = tank_two + + if(!istype(target) || (target != tank_one && target != tank_two)) + return FALSE + + // Throw both tanks into processing queue + var/datum/gas_mixture/target_mix = target.return_air() + var/datum/gas_mixture/other_mix + other_mix = (target == tank_one ? tank_two : tank_one).return_air() + if(change_volume) - if(!target_self) - target.set_volume(target.return_volume() + tank_two.air_contents.return_volume()) - target.set_volume(target.return_volume() + tank_one.air_contents.return_volume()) - tank_one.air_contents.transfer_ratio_to(target, 1) - if(!target_self) - tank_two.air_contents.transfer_ratio_to(target, 1) + target_mix.volume += other_mix.volume + + target_mix.merge(other_mix.remove_ratio(1)) + return TRUE /obj/item/transfer_valve/proc/split_gases() if (!valve_open || !tank_one || !tank_two) return - var/ratio1 = tank_one.air_contents.return_volume()/tank_two.air_contents.return_volume() - tank_two.air_contents.transfer_ratio_to(tank_one.air_contents, ratio1) - tank_two.air_contents.set_volume(tank_two.air_contents.return_volume() - tank_one.air_contents.return_volume()) + var/datum/gas_mixture/mix_one = tank_one.return_air() + var/datum/gas_mixture/mix_two = tank_two.return_air() + + var/volume_ratio = mix_one.volume/mix_two.volume + var/datum/gas_mixture/temp + temp = mix_two.remove_ratio(volume_ratio) + mix_one.merge(temp) + mix_two.volume -= mix_one.volume /* Exadv1: I know this isn't how it's going to work, but this was just to check it explodes properly when it gets a signal (and it does). */ -/obj/item/transfer_valve/proc/toggle_valve(manual = FALSE) +/obj/item/transfer_valve/proc/toggle_valve(obj/item/tank/target, change_volume = TRUE) if(!valve_open && tank_one && tank_two) - valve_open = TRUE var/turf/bombturf = get_turf(src) var/attachment @@ -167,23 +176,27 @@ var/admin_attachment_message var/attachment_message - if(attachment && !manual) - admin_attachment_message = " with [attachment] attached by [attacher ? ADMIN_LOOKUPFLW(attacher) : "Unknown CKEY"]" - attachment_message = " with [attachment] attached by [attacher ? key_name_admin(attacher) : "Unknown CKEY"]" + if(attachment) + admin_attachment_message = "The bomb had [attachment], which was attached by [attacher ? ADMIN_LOOKUPFLW(attacher) : "Unknown"]" + attachment_message = " with [attachment] attached by [attacher ? key_name_admin(attacher) : "Unknown"]" var/mob/bomber = get_mob_by_ckey(fingerprintslast) var/admin_bomber_message var/bomber_message if(bomber) - admin_bomber_message = " - Last touched by: [ADMIN_LOOKUPFLW(bomber)]" + admin_bomber_message = "The bomb's most recent set of fingerprints indicate it was last touched by [ADMIN_LOOKUPFLW(bomber)]" bomber_message = " - Last touched by: [key_name_admin(bomber)]" + bomber.log_message("opened bomb valve", LOG_GAME, log_globally = FALSE) - var/admin_bomb_message = "Bomb valve opened [manual ? "manually" : ""] in [ADMIN_VERBOSEJMP(bombturf)][admin_attachment_message][admin_bomber_message]" + var/admin_bomb_message = "Bomb valve opened in [ADMIN_VERBOSEJMP(bombturf)]
    [admin_attachment_message]
    [admin_bomber_message]
    " GLOB.bombers += admin_bomb_message message_admins(admin_bomb_message) - log_game("Bomb valve opened [manual ? "manually " : ""]in [AREACOORD(bombturf)][attachment_message][bomber_message]") + log_game("Bomb valve opened in [AREACOORD(bombturf)][attachment_message][bomber_message]") + + valve_open = merge_gases(target, change_volume) - merge_gases() + if(!valve_open) + stack_trace("TTV gas merging failed.") for(var/i in 1 to 6) addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 20 + (i - 1) * 10) diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 95a0827029b28..7dcf61cd8d10d 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -79,6 +79,9 @@ if(ishuman(user)) if(!can_trigger_gun(user)) return + if(HAS_TRAIT(user, TRAIT_PACIFISM)) + to_chat(user, span_warning("You can't bring yourself to fire the [src]! You don't want to risk harming anyone...")) + return if(user && user.get_active_held_item() == src) // Make sure our user is still holding us var/turf/target_turf = get_turf(target) if(target_turf) @@ -196,7 +199,7 @@ for(var/turf/T in turflist) if(T == previousturf) continue //so we don't burn the tile we be standin on - var/list/turfs_sharing_with_prev = previousturf.GetAtmosAdjacentTurfs(alldir=1) + var/list/turfs_sharing_with_prev = previousturf.get_atmos_adjacent_turfs(alldir=1) if(!(T in turfs_sharing_with_prev)) break if(igniter) @@ -206,7 +209,7 @@ sleep(1) previousturf = T operating = FALSE - for(var/mob/M as() in viewers(1, loc)) + for(var/mob/M in viewers(1, loc)) if((M.client && M.machine == src)) attack_self(M) @@ -214,14 +217,16 @@ /obj/item/flamethrower/proc/default_ignite(turf/target, release_amount = 0.05) //TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this... //Transfer 5% of current tank air contents to turf - var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount) - air_transfer.set_moles(GAS_PLASMA, air_transfer.get_moles(GAS_PLASMA) * 5) + var/datum/gas_mixture/tank_mix = ptank.return_air() + var/datum/gas_mixture/air_transfer = tank_mix.remove_ratio(release_amount) + + if(air_transfer.gases[/datum/gas/plasma]) + air_transfer.gases[/datum/gas/plasma][MOLES] *= 5 //Suffering target.assume_air(air_transfer) //Burn it based on transfered gas - target.hotspot_expose((ptank.air_contents.return_temperature()*2) + 380,500) + target.hotspot_expose((tank_mix.temperature*2) + 380,500) //location.hotspot_expose(1000,500,1) - /obj/item/flamethrower/Initialize(mapload) . = ..() if(create_full) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index c8023ad211485..533b3684ff588 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -45,9 +45,12 @@ burst() return ..() -/obj/item/latexballon/temperature_expose(datum/gas_mixture/air, temperature, volume) - if(temperature > T0C+100) - burst() +/obj/item/latexballon/should_atmos_process(datum/gas_mixture/air, temperature) + return temperature > T0C+100 + +/obj/item/latexballon/atmos_expose(datum/gas_mixture/air, temperature) + burst() + /obj/item/latexballon/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/tank)) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index f0cd9cd95bd76..5b5948ee953e3 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -706,7 +706,7 @@ T.visible_message(span_danger("[T] smacks into [src] and rapidly flashes to ash."),\ span_italics("You hear a loud crack as you are washed with a wave of heat.")) shard.Consume() - CALCULATE_ADJACENT_TURFS(T) + CALCULATE_ADJACENT_TURFS(T, MAKE_ACTIVE) /obj/item/melee/supermatter_sword/add_blood_DNA(list/blood_dna) return FALSE diff --git a/code/game/objects/items/peppercloud.dm b/code/game/objects/items/peppercloud.dm index e7049d06d2ed0..8f98ced70ea50 100644 --- a/code/game/objects/items/peppercloud.dm +++ b/code/game/objects/items/peppercloud.dm @@ -69,7 +69,7 @@ var/turf/previous = get_turf(user) var/turf/next = get_step(user, direction) for (var/i in 1 to 2) - if (!CANATMOSPASS(next, previous)) + if (!CANATMOSPASS(next, previous, FALSE)) break previous = next next = get_step(previous, direction) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 68e33f6df382b..a20f35ff2505f 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -157,7 +157,7 @@ if(!tank && checktank) to_chat(user, span_warning("\The [src] can't fire without a source of gas.")) return - if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) + if(tank && !tank.remove_air(gasPerThrow * pressureSetting)) to_chat(user, span_warning("\The [src] lets out a weak hiss and doesn't react!")) return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(75) && clumsyCheck && iscarbon(user)) diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index 5096a363d3564..332e95555f74b 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -83,7 +83,7 @@ if(!tank) to_chat(user, span_warning("\The [src] can't operate without a source of gas!")) return - var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting) + var/datum/gas_mixture/gasused = tank.remove_air(gasperfist * fisto_setting) var/turf/T = get_turf(src) if(!T) return @@ -99,9 +99,8 @@ if(H.check_shields(src, force)) return return ..() - if(gasused.total_moles() < gasperfist * fisto_setting) + if(!molar_cmp_equals(gasused.total_moles(), gasperfist * fisto_setting)) T.assume_air(gasused) - T.air_update_turf() to_chat(user, span_warning("\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")) playsound(loc, 'sound/weapons/punch4.ogg', 50, 1) force = (baseforce / 2) @@ -119,7 +118,6 @@ var/mob/living/carbon/human/H = target if(H.check_shields(src, force)) T.assume_air(gasused) - T.air_update_turf() return target.visible_message(span_danger("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!"), \ span_userdanger("You cry out in pain as [user]'s punch flings you backwards!"), ignored_mobs = list(user)) @@ -136,6 +134,6 @@ user.changeNext_move(CLICK_CD_MELEE * click_delay) T.assume_air(gasused) - T.air_update_turf() + T.air_update_turf(FALSE, FALSE) return ..() diff --git a/code/game/objects/items/stacks/sheets/mineral/materials.dm b/code/game/objects/items/stacks/sheets/mineral/materials.dm index 02f9472d6cd5b..876e1b9f106b0 100644 --- a/code/game/objects/items/stacks/sheets/mineral/materials.dm +++ b/code/game/objects/items/stacks/sheets/mineral/materials.dm @@ -99,9 +99,11 @@ Mineral Sheets else return ..() -/obj/item/stack/sheet/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - plasma_ignition(amount/5) +/obj/item/stack/sheet/mineral/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/item/stack/sheet/mineral/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + plasma_ignition(amount/5) /obj/item/stack/sheet/mineral/plasma/bullet_act(obj/projectile/Proj) if(!(Proj.nodamage) && Proj.damage_type == BURN) diff --git a/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm b/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm index 26ba53a24befd..9d3f742a1ebe6 100644 --- a/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm +++ b/code/game/objects/items/stacks/sheets/mineral/metals_recipes.dm @@ -99,7 +99,6 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ null, \ new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2), \ new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/airalarm, 2), \ - new/datum/stack_recipe("airlock controller frame", /obj/item/wallframe/advanced_airlock_controller, 2), \ new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2), \ new/datum/stack_recipe("extinguisher cabinet frame", /obj/item/wallframe/extinguisher_cabinet, 2), \ new/datum/stack_recipe("light switch frame", /obj/item/wallframe/light_switch, 1), \ diff --git a/code/game/objects/items/stacks/sheets/organic/leather.dm b/code/game/objects/items/stacks/sheets/organic/leather.dm index fdd63ac72fbc9..0de8f6c8abea8 100644 --- a/code/game/objects/items/stacks/sheets/organic/leather.dm +++ b/code/game/objects/items/stacks/sheets/organic/leather.dm @@ -38,6 +38,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/sheet/leather/wetleather) . = ..() AddElement(/datum/element/dryable, /obj/item/stack/sheet/leather) + +/obj/item/stack/sheet/leather/wetleather/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + //Step two to make leather - washing /obj/item/stack/sheet/leather/hairlesshide/machine_wash(obj/machinery/washing_machine/WM) @@ -46,14 +51,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/sheet/leather/wetleather) //Step three to make leather - drying, either naturally or... in a more induced way. -/obj/item/stack/sheet/leather/wetleather/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - ..() - if(exposed_temperature >= drying_threshold_temperature) - wetness-- - if(wetness == 0) - new /obj/item/stack/sheet/leather(drop_location(), 1) - wetness = initial(wetness) - use(1) +/obj/item/stack/sheet/leather/wetleather/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > drying_threshold_temperature) + +/obj/item/stack/sheet/leather/wetleather/atmos_expose(datum/gas_mixture/air, exposed_temperature) + wetness-- + if(wetness == 0) + new /obj/item/stack/sheet/leather(drop_location(), 1) + wetness = initial(wetness) + use(1) /obj/item/stack/sheet/leather/wetleather/microwave_act(obj/machinery/microwave/MW) ..() diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 1ca88e4332fce..185af4b11ae67 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -315,7 +315,6 @@ /obj/item/implanter, /obj/item/pinpointer/crew, /obj/item/holosign_creator/medical, - /obj/item/pipe_dispenser/plumbing, /obj/item/construction/plumbing, /obj/item/plunger, /obj/item/extrapolator diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index a320646e3e61e..2a7ecc1dcab0d 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_BULKY distribute_pressure = ONE_ATMOSPHERE * O2STANDARD actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization) - var/gas_type = GAS_O2 + var/gas_type = /datum/gas/oxygen var/on = FALSE var/stabilizers = FALSE var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not @@ -29,7 +29,8 @@ /obj/item/tank/jetpack/populate_gas() if(gas_type) - air_contents.set_moles(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))) + var/datum/gas_mixture/our_mix = return_air() + SET_MOLES(gas_type, our_mix, ((6 * ONE_ATMOSPHERE * volume / (R_IDEAL_GAS_EQUATION * T20C)))) /obj/item/tank/jetpack/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/toggle_jetpack)) @@ -125,9 +126,8 @@ if((num < 0.005 || num > THRUST_REQUIREMENT_GRAVITY * 0.5 || air_contents.total_moles() < num)) turn_off(user) return - if(use_fuel) - assume_air_moles(air_contents, num) + remove_air(num) return TRUE @@ -161,7 +161,7 @@ return if(use_fuel) - assume_air_moles(air_contents, num) + remove_air(num) return TRUE @@ -333,10 +333,14 @@ animate(who, transform = null, time = 2) /obj/item/tank/jetpack/combustion/populate_gas() + var/datum/gas_mixture/our_mix = return_air() var/moles_full = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) var/ideal_o2_percent = (1 / PLASMA_OXYGEN_FULLBURN) * 2 - air_contents.set_moles(GAS_PLASMA, moles_full * (1 - ideal_o2_percent)) - air_contents.set_moles(GAS_O2, moles_full * ideal_o2_percent) + our_mix.assert_gas(/datum/gas/plasma) + our_mix.assert_gas(/datum/gas/oxygen) + SET_MOLES(/datum/gas/plasma, our_mix, moles_full*(1-ideal_o2_percent)) + SET_MOLES(/datum/gas/oxygen, our_mix, moles_full*ideal_o2_percent) + /obj/item/tank/jetpack/combustion/allow_thrust(num, mob/living/user, use_fuel = TRUE) if(!on || !known_user) @@ -346,16 +350,17 @@ return var/potential_energy = 0 + var/datum/gas_mixture/our_mix = return_air() // Minified version of plasmafire burn reaction, with a "controlled" burnrate adjustment due to the high energy output of the reaction // Also produces no waste products (CO2/Trit) var/oxygen_burn_rate = (OXYGEN_BURN_RATE_BASE - 1) var/plasma_burn_rate = 0 - if(air_contents.get_moles(GAS_O2) > air_contents.get_moles(GAS_PLASMA)*PLASMA_OXYGEN_FULLBURN) - plasma_burn_rate = air_contents.get_moles(GAS_PLASMA)/PLASMA_BURN_RATE_DELTA + if(GET_MOLES(/datum/gas/oxygen, our_mix) > GET_MOLES(/datum/gas/plasma, our_mix) * PLASMA_OXYGEN_FULLBURN) + plasma_burn_rate = GET_MOLES(/datum/gas/plasma, our_mix)/PLASMA_BURN_RATE_DELTA else - plasma_burn_rate = (air_contents.get_moles(GAS_O2)/PLASMA_OXYGEN_FULLBURN)/PLASMA_BURN_RATE_DELTA + plasma_burn_rate = (GET_MOLES(/datum/gas/plasma, our_mix)/PLASMA_OXYGEN_FULLBURN)/PLASMA_BURN_RATE_DELTA if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) - plasma_burn_rate = min(plasma_burn_rate,air_contents.get_moles(GAS_PLASMA),air_contents.get_moles(GAS_O2)/oxygen_burn_rate) //Ensures matter is conserved properly + plasma_burn_rate = min(plasma_burn_rate,GET_MOLES(/datum/gas/plasma, our_mix),GET_MOLES(/datum/gas/oxygen, our_mix)/oxygen_burn_rate) //Ensures matter is conserved properly potential_energy = FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) // Normalize thrust volume to joules @@ -369,8 +374,8 @@ // Consume if(use_fuel) - air_contents.set_moles(GAS_PLASMA, QUANTIZE(air_contents.get_moles(GAS_PLASMA) - plasma_burn_rate)) - air_contents.set_moles(GAS_O2, QUANTIZE(air_contents.get_moles(GAS_O2) - (plasma_burn_rate * oxygen_burn_rate))) + SET_MOLES(/datum/gas/plasma, our_mix, QUANTIZE(GET_MOLES(/datum/gas/plasma, our_mix) - plasma_burn_rate)) + SET_MOLES(/datum/gas/oxygen, our_mix, QUANTIZE(GET_MOLES(/datum/gas/oxygen, our_mix) - (plasma_burn_rate * oxygen_burn_rate))) update_fade(15) update_lifespan(4) @@ -382,7 +387,7 @@ icon_state = "jetpack-black" item_state = "jetpack-black" distribute_pressure = 0 - gas_type = GAS_CO2 + gas_type = /datum/gas/carbon_dioxide // Integrated suit jetpacks // These use the tanks of a suit's suit storage instead of an internal tank, and their parent hardsuit assigns their known user. @@ -397,17 +402,14 @@ slot_flags = null gas_type = null full_speed = FALSE - var/datum/gas_mixture/temp_air_contents var/obj/item/tank/internals/tank = null /obj/item/tank/jetpack/suit/Initialize(mapload) . = ..() STOP_PROCESSING(SSobj, src) - temp_air_contents = air_contents /obj/item/tank/jetpack/suit/Destroy() tank = null - QDEL_NULL(temp_air_contents) . = ..() /obj/item/tank/jetpack/suit/attack_self() @@ -430,7 +432,7 @@ return var/mob/living/carbon/human/H = user tank = H.s_store - air_contents = tank.air_contents + air_contents = tank.return_air() RegisterSignals(tank, list(COMSIG_ITEM_DROPPED, COMSIG_PARENT_QDELETING), PROC_REF(on_tank_drop)) START_PROCESSING(SSobj, src) ..() @@ -440,7 +442,6 @@ if(!isnull(tank)) UnregisterSignal(tank, list(COMSIG_ITEM_DROPPED, COMSIG_PARENT_QDELETING)) tank = null - air_contents = temp_air_contents STOP_PROCESSING(SSobj, src) ..() diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 158fc20e197e6..4454fea3c6f95 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -30,7 +30,7 @@ /obj/item/tank/internals/oxygen/populate_gas() - air_contents.set_moles(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/oxygen, air_contents, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/oxygen/yellow desc = "A tank of oxygen, this one is yellow." @@ -56,8 +56,13 @@ force = 10 /obj/item/tank/internals/anesthetic/populate_gas() - air_contents.set_moles(GAS_O2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) - air_contents.set_moles(GAS_NITROUS, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) + SET_MOLES(/datum/gas/oxygen, air_contents, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) + SET_MOLES(/datum/gas/nitrous_oxide, air_contents, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) + +/obj/item/tank/internals/anesthetic/examine(mob/user) + . = ..() + . += span_notice("A warning is etched into [src]...") + . += span_warning("There is no process in the body that uses N2O, so patients will exhale the N2O... exposing you to it. Make sure to work in a well-ventilated space to avoid sleepy mishaps.") /* * Air @@ -71,8 +76,8 @@ dog_fashion = /datum/dog_fashion/back /obj/item/tank/internals/air/populate_gas() - air_contents.set_moles(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) - air_contents.set_moles(GAS_N2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) + SET_MOLES(/datum/gas/oxygen, air_contents, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) + SET_MOLES(/datum/gas/nitrogen, air_contents, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) /* * Plasma @@ -87,7 +92,7 @@ /obj/item/tank/internals/plasma/populate_gas() - air_contents.set_moles(GAS_PLASMA, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/plasma, air_contents, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/flamethrower)) @@ -103,7 +108,7 @@ return ..() /obj/item/tank/internals/plasma/full/populate_gas() - air_contents.set_moles(GAS_PLASMA, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/plasma, air_contents, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasma/empty/populate_gas() return @@ -122,10 +127,10 @@ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE /obj/item/tank/internals/plasmaman/populate_gas() - air_contents.set_moles(GAS_PLASMA, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/plasma, air_contents, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasmaman/full/populate_gas() - air_contents.set_moles(GAS_PLASMA, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/plasma, air_contents, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasmaman/empty/populate_gas() return @@ -143,7 +148,7 @@ w_class = WEIGHT_CLASS_SMALL //thanks i forgot this /obj/item/tank/internals/plasmaman/belt/full/populate_gas() - air_contents.set_moles(GAS_PLASMA, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/plasma, air_contents, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasmaman/belt/empty/populate_gas() return @@ -166,11 +171,11 @@ w_class = WEIGHT_CLASS_SMALL force = 4 distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE - volume = 1 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) + volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) /obj/item/tank/internals/emergency_oxygen/populate_gas() - air_contents.set_moles(GAS_O2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/oxygen, air_contents, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/emergency_oxygen/empty/populate_gas() return @@ -180,7 +185,7 @@ icon_state = "emergency_engi" worn_icon_state = "emergency_engi" worn_icon = null - volume = 2 // should last a bit over 30 minutes if full + volume = 6 // should last a bit over 30 minutes if full /obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas() return @@ -189,7 +194,7 @@ name = "double emergency oxygen tank" icon_state = "emergency_double" worn_icon_state = "emergency_engi" - volume = 8 + volume = 12 /obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas() return @@ -214,5 +219,5 @@ volume = 1 /obj/item/tank/internals/emergency_oxygen/clown/populate_gas() - air_contents.set_moles(GAS_O2, (9.99*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) - air_contents.set_moles(GAS_NITROUS, (0.01*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + SET_MOLES(/datum/gas/oxygen, air_contents, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)* 0.95) + SET_MOLES(/datum/gas/nitrous_oxide, air_contents, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.05) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 65fa4b9d041e5..d6d0caf2fda3c 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -29,6 +29,8 @@ var/leaking = FALSE /// The pressure of the gases this tank supplies to internals. var/distribute_pressure = ONE_ATMOSPHERE + //Used by process() to track if there's a reason to process each tick + var/excited = TRUE /// Mob that is currently breathing from the tank. var/mob/living/carbon/breathing_mob = null @@ -58,12 +60,10 @@ /// Called by carbons after they connect the tank to their breathing apparatus. /obj/item/tank/proc/after_internals_opened(mob/living/carbon/carbon_target) breathing_mob = carbon_target - carbon_target.update_internals_hud_icon(1) /// Called by carbons after they disconnect the tank from their breathing apparatus. /obj/item/tank/proc/after_internals_closed(mob/living/carbon/carbon_target) breathing_mob = null - carbon_target.update_internals_hud_icon(0) /// Attempts to toggle the mob's internals on or off using this tank. Returns TRUE if successful. /obj/item/tank/proc/toggle_internals(mob/living/carbon/mob_target) @@ -76,7 +76,7 @@ . = ..() air_contents = new(volume) //liters - air_contents.set_temperature(T20C) + air_contents.temperature = T20C populate_gas() @@ -86,9 +86,8 @@ return /obj/item/tank/Destroy() - if(air_contents) - QDEL_NULL(air_contents) - + UnregisterSignal(air_contents, COMSIG_GASMIX_MERGED) + air_contents = null STOP_PROCESSING(SSobj, src) return ..() @@ -104,7 +103,7 @@ . += span_notice("The gauge reads [round(air_contents.total_moles(), 0.01)] mol at [round(src.air_contents.return_pressure(),0.01)] kPa.") //yogs can read mols - var/celsius_temperature = src.air_contents.return_temperature()-T0C + var/celsius_temperature = air_contents.return_temperature()-T0C var/descriptive if (celsius_temperature < 20) @@ -123,10 +122,10 @@ . += span_notice("It feels [descriptive].") /obj/item/tank/deconstruct(disassembled = TRUE) - var/turf/location = get_turf(src) - if(location) - location.assume_air(air_contents) - location.air_update_turf(FALSE, FALSE) + if(!disassembled) + var/turf/location = get_turf(src) + if(location) + location.assume_air(air_contents) playsound(location, 'sound/effects/spray.ogg', 10, TRUE, -3) return ..() @@ -209,43 +208,43 @@ distribute_pressure = clamp(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE) /obj/item/tank/remove_air(amount) + START_PROCESSING(SSobj, src) return air_contents.remove(amount) -/obj/item/tank/remove_air_ratio(ratio) - return air_contents.remove_ratio(ratio) - /obj/item/tank/return_air() + START_PROCESSING(SSobj, src) return air_contents /obj/item/tank/return_analyzable_air() return air_contents /obj/item/tank/assume_air(datum/gas_mixture/giver) + START_PROCESSING(SSobj, src) air_contents.merge(giver) handle_tolerances(ASSUME_AIR_DT_FACTOR) return TRUE -/obj/item/tank/assume_air_moles(datum/gas_mixture/giver, moles) - giver.transfer_to(air_contents, moles) - - handle_tolerances(ASSUME_AIR_DT_FACTOR) - return TRUE - -/obj/item/tank/assume_air_ratio(datum/gas_mixture/giver, ratio) - giver.transfer_ratio_to(air_contents, ratio) - - handle_tolerances(ASSUME_AIR_DT_FACTOR) - return TRUE - +/** + * Removes some volume of the tanks gases as the tanks distribution pressure. + * + * Arguments: + * - volume_to_return: The amount of volume to remove from the tank. + */ /obj/item/tank/proc/remove_air_volume(volume_to_return) if(!air_contents) return null var/tank_pressure = air_contents.return_pressure() - if(tank_pressure < distribute_pressure) - distribute_pressure = tank_pressure + var/actual_distribute_pressure = clamp(tank_pressure, 0, distribute_pressure) - var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.return_temperature()) + // Lets do some algebra to understand why this works, yeah? + // R_IDEAL_GAS_EQUATION is (kPa * L) / (K * mol) by the by, so the units in this equation look something like this + // kpa * L / (R_IDEAL_GAS_EQUATION * K) + // Or restated (kpa * L / K) * 1/R_IDEAL_GAS_EQUATION + // (kpa * L * K * mol) / (kpa * L * K) + // If we cancel it all out, we get moles, which is the expected unit + // This sort of thing comes up often in atmos, keep the tool in mind for other bits of code + var/moles_needed = actual_distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature) return remove_air(moles_needed) @@ -254,20 +253,26 @@ return //Allow for reactions - air_contents.react(src) - handle_tolerances(delta_time) - if(QDELETED(src) || !leaking || !air_contents) + excited = (excited | air_contents.react(src)) + excited = (excited | handle_tolerances(delta_time)) + excited = (excited | leaking) + + if(!excited) + STOP_PROCESSING(SSobj, src) + excited = FALSE + + if(QDELETED(src) || !air_contents || !leaking) return - var/turf/location = get_turf(src) + var/atom/location = loc if(!location) return var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25) location.assume_air(leaked_gas) - location.air_update_turf(FALSE, FALSE) /** * Handles the minimum and maximum pressure tolerances of the tank. * + * Returns true if it did anything of significance, false otherwise * Arguments: * - delta_time: How long has passed between ticks. */ @@ -286,7 +291,8 @@ if(pressure >= TANK_LEAK_PRESSURE) var/pressure_damage_ratio = (pressure - TANK_LEAK_PRESSURE) / (TANK_RUPTURE_PRESSURE - TANK_LEAK_PRESSURE) take_damage(max_integrity * pressure_damage_ratio * delta_time, BRUTE, BOMB, FALSE, NONE) - return TRUE + return TRUE + return FALSE /// Handles the tank springing a leak. /obj/item/tank/atom_break(damage_flag) @@ -295,6 +301,9 @@ return leaking = TRUE + + START_PROCESSING(SSobj, src) + if(atom_integrity < 0) // So we don't play the alerts while we are exploding or rupturing. return visible_message(span_warning("[src] springs a leak!")) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index e420348f22c49..c68509747fcfa 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -196,6 +196,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e //what happens when the obj's integrity reaches zero. /obj/atom_destruction(damage_flag) + . = ..() if(damage_flag == ACID) acid_melt() else if(damage_flag == FIRE) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 16f82e97e0fcf..428f9cf853cbf 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -101,10 +101,20 @@ CREATION_TEST_IGNORE_SELF(/obj) AddComponent(/datum/component/ntnet_interface, network_id, id_tag) /// Needs to run before as ComponentInitialize runs after this statement...why do we have ComponentInitialize again? +// A list of all /obj by their id_tag +GLOBAL_LIST_EMPTY(objects_by_id_tag) + +/obj/Initialize(mapload) + . = ..() + + if (id_tag) + GLOB.objects_by_id_tag[id_tag] = src + /obj/Destroy(force=FALSE) if(!ismachinery(src) && (datum_flags & DF_ISPROCESSING)) STOP_PROCESSING(SSobj, src) SStgui.close_uis(src) + GLOB.objects_by_id_tag -= id_tag . = ..() @@ -114,42 +124,12 @@ CREATION_TEST_IGNORE_SELF(/obj) else return null -/obj/assume_air_moles(datum/gas_mixture/giver, moles) - if(loc) - return loc.assume_air_moles(giver, moles) - else - return null - -/obj/assume_air_ratio(datum/gas_mixture/giver, ratio) - if(loc) - return loc.assume_air_ratio(giver, ratio) - else - return null - -/obj/transfer_air(datum/gas_mixture/taker, moles) - if(loc) - return loc.transfer_air(taker, moles) - else - return null - -/obj/transfer_air_ratio(datum/gas_mixture/taker, ratio) - if(loc) - return loc.transfer_air_ratio(taker, ratio) - else - return null - /obj/remove_air(amount) if(loc) return loc.remove_air(amount) else return null -/obj/remove_air_ratio(ratio) - if(loc) - return loc.remove_air_ratio(ratio) - else - return null - /obj/return_air() if(loc) return loc.return_air() @@ -164,7 +144,8 @@ CREATION_TEST_IGNORE_SELF(/obj) if(breath_request>0) var/datum/gas_mixture/environment = return_air() - return remove_air_ratio(BREATH_VOLUME / environment.return_volume()) + var/breath_percentage = BREATH_VOLUME / environment.return_volume() + return remove_air(environment.total_moles() * breath_percentage) else return null @@ -349,7 +330,7 @@ CREATION_TEST_IGNORE_SELF(/obj) return /obj/analyzer_act(mob/living/user, obj/item/I) - if(atmosanalyzer_scan(user, src)) + if(atmos_scan(user=user, target=src, silent=FALSE)) return TRUE return ..() diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 33902203ee077..a373c26dc397e 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -63,12 +63,16 @@ anchored = TRUE max_integrity = 200 var/resintype = null - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY /obj/structure/alien/resin/Initialize(mapload) . = ..() - air_update_turf(TRUE) + air_update_turf(TRUE, TRUE) + +/obj/structure/alien/resin/Destroy() + air_update_turf(TRUE, FALSE) + . = ..() /obj/structure/alien/resin/Move() var/turf/T = loc @@ -84,9 +88,6 @@ smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS) canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS) -/obj/structure/alien/resin/wall/BlockThermalConductivity() - return 1 - /obj/structure/alien/resin/membrane name = "resin membrane" desc = "Resin just thin enough to let light pass through." @@ -172,13 +173,17 @@ icon = 'icons/obj/smooth_structures/alien/weeds3.dmi' base_icon_state = "weeds3" +/obj/structure/alien/weeds/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + /obj/structure/alien/weeds/proc/expand() var/turf/U = get_turf(src) if(is_type_in_typecache(U, blacklisted_turfs)) qdel(src) return FALSE - for(var/turf/T in U.GetAtmosAdjacentTurfs()) + for(var/turf/T in U.get_atmos_adjacent_turfs()) if((locate(/obj/structure/alien/weeds) in T)) continue @@ -188,9 +193,11 @@ new /obj/structure/alien/weeds(T) return TRUE -/obj/structure/alien/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - take_damage(5, BURN, 0, 0) +/obj/structure/alien/weeds/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/structure/alien/weeds/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(5, BURN, 0, 0) //Weed nodes /obj/structure/alien/weeds/node @@ -263,6 +270,10 @@ if(status == BURST) atom_integrity = integrity_failure * max_integrity +/obj/structure/alien/egg/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + /obj/structure/alien/egg/update_icon() ..() switch(status) @@ -340,10 +351,11 @@ if(status != BURST) Burst(kill=TRUE) -/obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 500) - take_damage(5, BURN, 0, 0) +/obj/structure/alien/egg/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 500 +/obj/structure/alien/egg/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(5, BURN, 0, 0) /obj/structure/alien/egg/HasProximity(atom/movable/AM) if(status == GROWN) diff --git a/code/game/objects/structures/crates_lockers/crates/critter.dm b/code/game/objects/structures/crates_lockers/crates/critter.dm index 2fda6f1ebc050..bae75aa791f76 100644 --- a/code/game/objects/structures/crates_lockers/crates/critter.dm +++ b/code/game/objects/structures/crates_lockers/crates/critter.dm @@ -69,7 +69,7 @@ /obj/structure/closet/crate/critter/return_air() if(tank) - return tank.air_contents + return tank.return_air() else return loc.return_air() diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 12957f18194fc..5f89e767aa61e 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -16,7 +16,7 @@ opacity = TRUE max_integrity = 100 can_be_unanchored = FALSE - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE rad_insulation = RAD_MEDIUM_INSULATION var/mineral = /obj/item/stack/sheet/iron @@ -28,7 +28,7 @@ /obj/structure/falsewall/Initialize(mapload) . = ..() - air_update_turf(TRUE) + air_update_turf(TRUE, TRUE) /obj/structure/falsewall/ratvar_act() new /obj/structure/falsewall/brass(loc) @@ -57,7 +57,7 @@ z_flags &= density ? (Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) : ~(Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) opening = FALSE update_icon() - air_update_turf(TRUE) + air_update_turf(TRUE, !density) /obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open if(opening) @@ -261,6 +261,10 @@ mineral = /obj/item/stack/sheet/mineral/plasma walltype = /turf/closed/wall/mineral/plasma +/obj/structure/falsewall/plasma/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + /obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params) if(W.is_hot() > 300) if(plasma_ignition(6, user)) @@ -269,11 +273,12 @@ else return ..() -/obj/structure/falsewall/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - if(plasma_ignition(6)) - new /obj/structure/girder/displaced(loc) +/obj/structure/falsewall/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 +/obj/structure/falsewall/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + if(plasma_ignition(6)) + new /obj/structure/girder/displaced(loc) /obj/structure/falsewall/plasma/bullet_act(obj/projectile/Proj) if(!(Proj.nodamage) && Proj.damage_type == BURN) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 84a87d90fd5d8..c150c8e2c259a 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -25,6 +25,10 @@ pipe_astar_cost = 1\ ) +/obj/structure/grille/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + /datum/armor/structure_grille melee = 50 @@ -335,11 +339,11 @@ return FALSE return FALSE -/obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(!broken) - if(exposed_temperature > T0C + 1500) - take_damage(1, BURN, 0, 0) - ..() +/obj/structure/grille/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > T0C + 1500 && !broken + +/obj/structure/grille/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(1, BURN, 0, 0) /obj/structure/grille/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(isobj(AM)) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 8e387170d7ed0..7ed1841c5d670 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -32,6 +32,8 @@ alpha = 0 SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it + + /obj/structure/holosign/Destroy() if(projector) projector.signs -= src @@ -99,7 +101,7 @@ icon_state = "holo_firelock" density = FALSE anchored = TRUE - CanAtmosPass = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO alpha = 150 rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE rad_insulation = RAD_LIGHT_INSULATION @@ -115,11 +117,12 @@ . = ..() var/turf/local = get_turf(loc) ADD_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC) - air_update_turf(TRUE) + air_update_turf(TRUE, TRUE) /obj/structure/holosign/barrier/atmos/Destroy() var/turf/local = get_turf(loc) REMOVE_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC) + air_update_turf(TRUE, FALSE) return ..() /obj/structure/holosign/barrier/atmos/Move(atom/newloc, direct) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 77624f2b00df7..d817df295fca1 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -12,7 +12,7 @@ icon_state = "metal" max_integrity = 200 armor_type = /datum/armor/structure_mineral_door - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE rad_insulation = RAD_MEDIUM_INSULATION @@ -37,12 +37,18 @@ /obj/structure/mineral_door/Initialize(mapload) . = ..() - air_update_turf(TRUE) + air_update_turf(TRUE, TRUE) + +/obj/structure/mineral_door/Destroy() + if(!door_opened) + air_update_turf(TRUE, FALSE) + . = ..() /obj/structure/mineral_door/Move() var/turf/T = loc . = ..() - move_update_air(T) + if(!door_opened) + move_update_air(T) /obj/structure/mineral_door/Bumped(atom/movable/AM) ..() @@ -100,7 +106,7 @@ set_density(FALSE) z_flags &= ~(Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) door_opened = TRUE - air_update_turf(1) + air_update_turf(TRUE, FALSE) update_appearance() isSwitchingStates = FALSE @@ -121,7 +127,7 @@ z_flags |= (Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP) set_opacity(TRUE) door_opened = FALSE - air_update_turf(1) + air_update_turf(TRUE, TRUE) update_appearance() isSwitchingStates = FALSE @@ -140,7 +146,7 @@ /obj/structure/mineral_door/set_anchored(anchorvalue) //called in default_unfasten_wrench() chain . = ..() set_opacity(anchored ? !door_opened : FALSE) - air_update_turf(TRUE) + air_update_turf(TRUE, anchorvalue) /obj/structure/mineral_door/wrench_act(mob/living/user, obj/item/I) default_unfasten_wrench(user, I, 40) @@ -256,7 +262,8 @@ sheetType = /obj/item/stack/sheet/mineral/plasma /obj/structure/mineral_door/transparent/plasma/ComponentInitialize() - return + . = ..() + AddElement(/datum/element/atmos_sensitive) /obj/structure/mineral_door/transparent/plasma/welder_act(mob/living/user, obj/item/I) return @@ -267,9 +274,11 @@ else return ..() -/obj/structure/mineral_door/transparent/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - plasma_ignition(6) +/obj/structure/mineral_door/transparent/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/structure/mineral_door/transparent/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + plasma_ignition(6) /obj/structure/mineral_door/transparent/plasma/bullet_act(obj/projectile/Proj) if(!(Proj.nodamage) && Proj.damage_type == BURN) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 3ed3de0d7cdf0..012ab1211521d 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -264,14 +264,14 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/mirror) if(P.starting) var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) - var/turf/curloc = get_turf(src) + var/turf/current_location = get_turf(src) // redirect the projectile P.original = locate(new_x, new_y, P.z) - P.starting = curloc + P.starting = current_location P.firer = src - P.yo = new_y - curloc.y - P.xo = new_x - curloc.x + P.yo = new_y - current_location.y + P.xo = new_x - current_location.x var/new_angle_s = P.Angle + 180 while(new_angle_s > 180) // Translate to regular projectile degrees new_angle_s -= 360 diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 6338699cd188f..b66d7aec2ef0c 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -7,7 +7,7 @@ density = FALSE anchored = TRUE layer = BELOW_OBJ_LAYER - CanAtmosPass = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO /datum/armor/structure_plasticflaps @@ -116,4 +116,10 @@ /obj/structure/plasticflaps/Initialize(mapload) . = ..() - air_update_turf(TRUE) + air_update_turf(TRUE, TRUE) + +/obj/structure/plasticflaps/Destroy() + var/atom/oldloc = loc + . = ..() + if (oldloc) + oldloc.air_update_turf(TRUE, FALSE) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 75d93c0ad6aff..841895d3112a5 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -7,10 +7,10 @@ density = TRUE anchored = FALSE max_integrity = 100 - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY var/oreAmount = 5 var/material_drop_type = /obj/item/stack/sheet/iron - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY material_modifier = 0.5 material_flags = MATERIAL_EFFECTS | MATERIAL_AFFECT_STATISTICS /// Beauty component mood modifier @@ -109,8 +109,14 @@ name = "statue of a scientist" icon_state = "sci" -/obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) +/obj/structure/statue/plasma/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + +/obj/structure/statue/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/structure/statue/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) plasma_ignition(6) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index bcc8c848aeef6..548afe42587d8 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -152,9 +152,10 @@ sleep(OPEN_DURATION + 2) pod_moving = 0 if(!QDELETED(pod)) - var/datum/gas_mixture/floor_mixture = loc.return_air() - equalize_all_gases_in_list(list(pod.air_contents,floor_mixture)) - air_update_turf() + return + var/datum/gas_mixture/floor_mixture = loc.return_air() + pod.air_contents.equalize(floor_mixture) + air_update_turf(FALSE, FALSE) /obj/structure/transit_tube/station/init_tube_dirs() switch(dir) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index ab2b5fc9539ab..8ae6a047bb958 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -26,18 +26,18 @@ /obj/structure/c_transit_tube/ComponentInitialize() . = ..() - AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src,PROC_REF(after_rot))) + AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src,PROC_REF(post_rotation))) -/obj/structure/c_transit_tube/proc/after_rot(mob/user,rotation_type) - if(flipped_build_type && rotation_type == ROTATION_FLIP) - setDir(turn(dir,-180)) //Turn back we don't actually flip +/obj/structure/c_transit_tube/proc/post_rotation(mob/user, degrees) + if(flipped_build_type && degrees == ROTATION_FLIP) + setDir(turn(dir, degrees)) //Turn back we don't actually flip flipped = !flipped var/cur_flip = initial(flipped) ? !flipped : flipped if(cur_flip) build_type = flipped_build_type else build_type = initial(build_type) - icon_state = "[base_icon][flipped]" + icon_state = "[base_icon_state][flipped]" /obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I) if(!can_wrench_in_loc(user)) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index e8be7e34e29e0..b57be5fb61d68 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -13,9 +13,10 @@ /obj/structure/transit_tube_pod/Initialize(mapload) . = ..() - air_contents.set_moles(GAS_O2, MOLES_O2STANDARD) - air_contents.set_moles(GAS_N2, MOLES_N2STANDARD) - air_contents.set_temperature(T20C) + air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen) + air_contents.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD + air_contents.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD + air_contents.temperature = T20C /obj/structure/transit_tube_pod/Destroy() @@ -162,24 +163,9 @@ /obj/structure/transit_tube_pod/assume_air(datum/gas_mixture/giver) return air_contents.merge(giver) -/obj/structure/transit_tube_pod/assume_air_moles(datum/gas_mixture/giver, moles) - return giver.transfer_to(air_contents, moles) - -/obj/structure/transit_tube_pod/assume_air_ratio(datum/gas_mixture/giver, ratio) - return giver.transfer_ratio_to(air_contents, ratio) - /obj/structure/transit_tube_pod/remove_air(amount) return air_contents.remove(amount) -/obj/structure/transit_tube_pod/remove_air_ratio(ratio) - return air_contents.remove_ratio(ratio) - -/obj/structure/transit_tube_pod/transfer_air(datum/gas_mixture/taker, moles) - return air_contents.transfer_to(taker, moles) - -/obj/structure/transit_tube_pod/transfer_air_ratio(datum/gas_mixture/taker, ratio) - return air_contents.transfer_ratio_to(taker, ratio) - /obj/structure/transit_tube_pod/relaymove(mob/living/user, direction) if(!user.client || moving) @@ -208,7 +194,7 @@ return /obj/structure/transit_tube_pod/return_temperature() - return air_contents.return_temperature() + return air_contents.temperature #undef MOVE_ANIMATION_STAGE_ONE #undef MOVE_ANIMATION_STAGE_TWO diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 4591d160605e9..0072959f0116e 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -18,7 +18,7 @@ density = FALSE layer = ABOVE_OBJ_LAYER //Just above doors anchored = FALSE - CanAtmosPass = ATMOS_PASS_PROC + can_atmos_pass = ATMOS_PASS_PROC dir = NORTH set_dir_on_move = FALSE @@ -37,7 +37,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/windoor_assembly) . = ..() if(set_dir) setDir(set_dir) - air_update_turf(1) + air_update_turf(TRUE, TRUE) var/static/list/loc_connections = list( COMSIG_ATOM_EXIT = PROC_REF(on_exit), @@ -47,7 +47,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/windoor_assembly) /obj/structure/windoor_assembly/Destroy() set_density(FALSE) - air_update_turf(1) + air_update_turf(TRUE, FALSE) return ..() /obj/structure/windoor_assembly/Move() @@ -73,11 +73,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/windoor_assembly) return TRUE -/obj/structure/windoor_assembly/CanAtmosPass(turf/T) +/obj/structure/windoor_assembly/can_atmos_pass(turf/T, vertical = FALSE) if(get_dir(loc, T) == dir) return !density else - return 1 + return TRUE /obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 17b4bdcd80537..0c577ab8abbea 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -11,7 +11,7 @@ can_be_unanchored = TRUE resistance_flags = ACID_PROOF armor_type = /datum/armor/structure_window - CanAtmosPass = ATMOS_PASS_PROC + can_atmos_pass = ATMOS_PASS_PROC rad_insulation = RAD_VERY_LIGHT_INSULATION rad_flags = RAD_PROTECT_CONTENTS pass_flags_self = PASSTRANSPARENT @@ -65,7 +65,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) state = WINDOW_SCREWED_TO_FRAME ini_dir = dir - air_update_turf(1) + air_update_turf(TRUE, TRUE) if(fulltile) setDir() @@ -84,6 +84,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) /obj/structure/window/ComponentInitialize() . = ..() AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)),CALLBACK(src, PROC_REF(after_rotation))) + AddElement(/datum/element/atmos_sensitive) /obj/structure/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_DECONSTRUCT) @@ -247,7 +248,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) /obj/structure/window/set_anchored(anchorvalue) ..() - air_update_turf(TRUE) + air_update_turf(TRUE, anchorvalue) update_nearby_icons() /obj/structure/window/proc/check_state(checked_state) @@ -324,14 +325,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) return TRUE /obj/structure/window/proc/after_rotation(mob/user,rotation_type) + air_update_turf(TRUE, FALSE) ini_dir = dir add_fingerprint(user) /obj/structure/window/Destroy() - set_density(FALSE) - air_update_turf(1) + var/turf/local_turf = get_turf(src) update_nearby_icons() - return ..() + . = ..() + local_turf.air_update_turf(TRUE, FALSE) /obj/structure/window/Move() @@ -339,7 +341,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) . = ..() move_update_air(T) -/obj/structure/window/CanAtmosPass(turf/T) +/obj/structure/window/can_atmos_pass(turf/T, vertical = FALSE) if(!anchored || !density) return TRUE return !(fulltile || dir == get_dir(loc, T)) @@ -368,11 +370,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer+0.1)) add_overlay(crack_overlay) -/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/window/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > T0C + heat_resistance - if(exposed_temperature > (T0C + heat_resistance)) - take_damage(round(exposed_volume / 100), BURN, 0, 0) - ..() +/obj/structure/window/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(round(air.return_volume() / 100), BURN, 0, 0) /obj/structure/window/get_dumping_location(obj/item/storage/source,mob/user) return null @@ -444,6 +446,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) glass_type = /obj/item/stack/sheet/plasmaglass rad_insulation = RAD_NO_INSULATION +/obj/structure/window/plasma/ComponentInitialize() + . = ..() + RemoveElement(/datum/element/atmos_sensitive) + /datum/armor/window_plasma melee = 75 @@ -485,7 +491,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) explosion_block = 2 glass_type = /obj/item/stack/sheet/plasmarglass - /datum/armor/plasma_reinforced melee = 85 bullet = 20 @@ -732,7 +737,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) glass_type = /obj/item/stack/sheet/paperframes heat_resistance = 233 decon_speed = 10 - CanAtmosPass = ATMOS_PASS_YES + can_atmos_pass = ATMOS_PASS_YES resistance_flags = FLAMMABLE armor_type = /datum/armor/none breaksound = 'sound/items/poster_ripped.ogg' diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index a22d9f2d207ae..482502c725749 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -24,6 +24,7 @@ density = TRUE anchored = TRUE z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP + can_atmos_pass = ATMOS_PASS_DENSITY var/engine_power = 1 var/state = ENGINE_WELDED //welding shmelding diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index e9837c2980790..a7ff60267f5ab 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -15,7 +15,8 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(turf_type) var/turf/newT = ChangeTurf(turf_type, baseturf_type, flags) - CALCULATE_ADJACENT_TURFS(newT) + SSair.remove_from_active(newT) + CALCULATE_ADJACENT_TURFS(newT, KILL_EXCITED) /turf/proc/copyTurf(turf/T) if(T.type != type) @@ -98,6 +99,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( blueprint_data = null var/list/old_baseturfs = baseturfs + var/old_type = type var/list/post_change_callbacks = list() SEND_SIGNAL(src, COMSIG_TURF_CHANGE, path, new_baseturfs, flags, post_change_callbacks) @@ -131,7 +133,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( new_turf.explosion_level = old_exl if(!(flags & CHANGETURF_DEFER_CHANGE)) - new_turf.AfterChange(flags) + new_turf.AfterChange(flags, old_type) new_turf.blueprint_data = old_bp new_turf.rcd_memory = old_rcd_memory @@ -169,25 +171,28 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if ((flags & CHANGETURF_INHERIT_AIR) && ispath(path, /turf/open)) var/datum/gas_mixture/stashed_air = new() stashed_air.copy_from(air) - . = ..() + var/stashed_state = excited + var/datum/excited_group/stashed_group = excited_group + . = ..() //If path == type this will return us, don't bank on making a new type if (!.) // changeturf failed or didn't do anything - QDEL_NULL(stashed_air) return - var/turf/open/newTurf = . - newTurf.air.copy_from(stashed_air) - update_air_ref(planetary_atmos ? 1 : 2) - QDEL_NULL(stashed_air) + var/turf/open/new_turf = . + new_turf.air.copy_from(stashed_air) + new_turf.excited = stashed_state + new_turf.excited_group = stashed_group + #ifdef VISUALIZE_ACTIVE_TURFS + if(stashed_state) + new_turf.add_atom_colour(COLOR_VIBRANT_LIME, TEMPORARY_COLOUR_PRIORITY) + #endif + if(stashed_group) + if(stashed_group.should_display || SSair.display_all_groups) + stashed_group.display_turf(new_turf) else + if(excited || excited_group) + SSair.remove_from_active(src) //Clean up wall excitement, and refresh excited groups if(ispath(path,/turf/closed)) flags |= CHANGETURF_RECALC_ADJACENT - update_air_ref(-1) - . = ..() - else - . = ..() - if(flags & CHANGETURF_SKIP) // don't init air before the air subsystem runs - return - if(!istype(air,/datum/gas_mixture)) - Initalize_Atmos(0) + return ..() /turf/closed/ChangeTurf(path, list/new_baseturfs, flags) if(ispath(path,/turf/open)) @@ -312,19 +317,21 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( //If you modify this function, ensure it works correctly with lateloaded map templates. -/turf/proc/AfterChange(flags) //called after a turf has been replaced in ChangeTurf() +/turf/proc/AfterChange(flags, oldType) //called after a turf has been replaced in ChangeTurf() levelupdate() if(flags & CHANGETURF_RECALC_ADJACENT) - ImmediateCalculateAdjacentTurfs() - else - CALCULATE_ADJACENT_TURFS(src) + immediate_calculate_adjacent_turfs() + if(ispath(oldType, /turf/closed) && istype(src, /turf/open)) + SSair.add_to_active(src) + else //In effect, I want closed turfs to make their tile active when sheered, but we need to queue it since they have no adjacent turfs + CALCULATE_ADJACENT_TURFS(src, (!(ispath(oldType, /turf/closed) && istype(src, /turf/open)) ? NORMAL_TURF : MAKE_ACTIVE)) //update firedoor adjacency var/list/turfs_to_check = get_adjacent_open_turfs(src) | src for(var/I in turfs_to_check) var/turf/T = I for(var/obj/machinery/door/firedoor/FD in T) - FD.CalculateAffectingAreas() + FD.calculate_affecting_areas() QUEUE_SMOOTH_NEIGHBORS(src) @@ -333,7 +340,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(above) above.update_mimic() -/turf/open/AfterChange(flags) +/turf/open/AfterChange(flags, oldType) ..() RemoveLattice() if(!(flags & (CHANGETURF_IGNORE_AIR | CHANGETURF_INHERIT_AIR))) @@ -342,18 +349,41 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( //////Assimilate Air////// /turf/open/proc/Assimilate_Air() var/turf_count = LAZYLEN(atmos_adjacent_turfs) - if(isclosedturf(src) || !turf_count) //if there weren't any open turfs, no need to update. + if(blocks_air || !turf_count) //if there weren't any open turfs, no need to update. return var/datum/gas_mixture/total = new//Holders to assimilate air from nearby turfs - - for(var/T in atmos_adjacent_turfs) - var/turf/open/S = T - if(!S.air) - continue - total.merge(S.air) - - air.copy_from(total.remove_ratio(1/turf_count)) + var/list/total_gases = total.gases + //Stolen blatently from self_breakdown + var/list/turf_list = atmos_adjacent_turfs + src + var/turflen = turf_list.len + var/energy = 0 + var/heat_cap = 0 + + for(var/t in turf_list) + var/turf/open/T = t + //Cache? + var/datum/gas_mixture/turf/mix = T.air + //"borrowing" this code from merge(), I need to play with the temp portion. Lets expand it out + //temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity + var/capacity = mix.heat_capacity() + energy += mix.temperature * capacity + heat_cap += capacity + + var/list/giver_gases = mix.gases + for(var/giver_id in giver_gases) + ASSERT_GAS_IN_LIST(giver_id, total_gases) + total_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES] + + total.temperature = energy / heat_cap + for(var/id in total_gases) + total_gases[id][MOLES] /= turflen + + for(var/t in turf_list) + var/turf/open/T = t + T.air.copy_from(total) + T.update_visuals() + SSair.add_to_active(T) /turf/proc/ReplaceWithLattice() ScrapeAway(flags = CHANGETURF_INHERIT_AIR) diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index b58f97fde3f99..44199b70641b9 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -5,7 +5,9 @@ CREATION_TEST_IGNORE_SELF(/turf/closed) opacity = TRUE density = TRUE init_air = FALSE + blocks_air = TRUE rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE + init_air = FALSE rad_insulation = RAD_MEDIUM_INSULATION pass_flags_self = PASSCLOSEDTURF diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 16b54a4b30bcd..466a57c1c19d2 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -15,7 +15,7 @@ opacity = TRUE density = TRUE layer = EDGED_TURF_LAYER - initial_temperature = 293.15 + temperature = T20C max_integrity = 200 var/environment_type = "asteroid" var/turf/open/floor/plating/turf_type = /turf/open/floor/plating/asteroid/airless @@ -91,11 +91,33 @@ for(var/obj/effect/temp_visual/mining_overlay/M in src) qdel(M) var/flags = NONE + var/old_type = type if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE - ScrapeAway(null, flags) - addtimer(CALLBACK(src, PROC_REF(AfterChange)), 1, TIMER_UNIQUE) - playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction + var/turf/open/mined = ScrapeAway(null, flags) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) + playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction + mined.update_visuals() + +/turf/closed/mineral/attack_animal(mob/living/simple_animal/user, list/modifiers) + if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS)) + gets_drilled(user) + ..() + +/turf/closed/mineral/attack_alien(mob/living/carbon/alien/user, list/modifiers) + to_chat(user, "You start digging into the rock...") + playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) + if(do_after(user, 4 SECONDS, target = src)) + to_chat(user, "You tunnel into the rock.") + gets_drilled(user) + +/turf/closed/mineral/attack_hulk(mob/living/carbon/human/H) + ..() + if(do_after(H, 50, target = src)) + playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE) + H.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") + gets_drilled(H) + return TRUE /turf/closed/mineral/Bumped(atom/movable/AM) ..() diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index c73500b20adc9..b3af3a03d2e00 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -147,10 +147,11 @@ new /obj/structure/girder/displaced(loc) ..() -/turf/closed/wall/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :( - if(exposed_temperature > 300) - if(plasma_ignition(6)) - new /obj/structure/girder/displaced(loc) +/turf/closed/wall/mineral/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 +/turf/closed/wall/mineral/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + if(plasma_ignition(6)) + new /obj/structure/girder/displaced(loc) /turf/closed/wall/mineral/plasma/bullet_act(obj/projectile/Proj) if(!(Proj.nodamage) && Proj.damage_type == BURN) diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index fc1cd0cb4296e..44886c8f10ea1 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -18,6 +18,7 @@ girder_type = /obj/structure/girder/reinforced explosion_block = 2 rad_insulation = RAD_HEAVY_INSULATION + heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall. also indicates the temperature at wich the wall will melt (currently only able to melt with H/E pipes) FASTDMM_PROP(\ pipe_astar_cost = 50 \ ) diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index beb7fdb661a9e..60ec813253ece 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -14,7 +14,7 @@ explosion_block = 1 thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT - heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall + heat_capacity = 62500 //a little over 5 cm thick , 62500 for 1 m by 2.5 m by 0.25 m iron wall. also indicates the temperature at wich the wall will melt (currently only able to melt with H/E pipes) baseturfs = /turf/open/floor/plating @@ -47,6 +47,7 @@ underlays += underlay_appearance /turf/closed/wall/atom_destruction(damage_flag) + . = ..() dismantle_wall(TRUE, FALSE) /turf/closed/wall/Destroy() diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index dec6ae3722344..f36d85b54c6f7 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -32,13 +32,6 @@ CREATION_TEST_IGNORE_SELF(/turf/open) ///Is this floor no-slip? var/traction = FALSE -/turf/open/Initialize(mapload) - . = ..() - if(broken) - break_tile(TRUE) - if(burnt) - burn_tile(TRUE) - /turf/open/ComponentInitialize() . = ..() if(wet) @@ -70,6 +63,10 @@ CREATION_TEST_IGNORE_SELF(/turf/open) /turf/open/zAirOut(direction, turf/source) return (direction == UP) +/turf/open/update_icon() + . = ..() + update_visuals() + /turf/open/indestructible name = "floor" icon = 'icons/turf/floors.dmi' @@ -128,6 +125,7 @@ CREATION_TEST_IGNORE_SELF(/turf/open) icon = 'icons/turf/boss_floors.dmi' icon_state = "boss" baseturfs = /turf/open/indestructible/boss + planetary_atmos = TRUE initial_gas_mix = LAVALAND_DEFAULT_ATMOS /turf/open/indestructible/boss/air @@ -135,6 +133,7 @@ CREATION_TEST_IGNORE_SELF(/turf/open) /turf/open/indestructible/hierophant icon = 'icons/turf/floors/hierophant_floor.dmi' + planetary_atmos = TRUE initial_gas_mix = LAVALAND_DEFAULT_ATMOS baseturfs = /turf/open/indestructible/hierophant tiled_dirt = FALSE @@ -157,7 +156,7 @@ CREATION_TEST_IGNORE_SELF(/turf/open) /turf/open/indestructible/binary name = "tear in the fabric of reality" - CanAtmosPass = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO baseturfs = /turf/open/indestructible/binary icon_state = "binary" footstep = FOOTSTEP_PLATING @@ -168,30 +167,27 @@ CREATION_TEST_IGNORE_SELF(/turf/open) /turf/open/indestructible/airblock icon_state = "bluespace" + blocks_air = TRUE + init_air = FALSE baseturfs = /turf/open/indestructible/airblock - CanAtmosPass = ATMOS_PASS_NO init_air = FALSE -/turf/open/Initalize_Atmos(times_fired) - if(!istype(air, /datum/gas_mixture/turf)) - air = new(2500,src) - air.copy_from_turf(src) - update_air_ref(planetary_atmos ? 1 : 2) - +/turf/open/Initalize_Atmos(time) + excited = FALSE update_visuals() - ImmediateCalculateAdjacentTurfs() - + current_cycle = time + init_immediate_calculate_adjacent_turfs() -/turf/open/proc/GetHeatCapacity() +/turf/open/get_heat_capacity() . = air.heat_capacity() -/turf/open/proc/GetTemperature() - . = air.return_temperature() +/turf/open/get_temperature() + . = air.temperature -/turf/open/proc/TakeTemperature(temp) - air.set_temperature(air.return_temperature() + temp) - air_update_turf() +/turf/open/take_temperature(temp) + air.temperature += temp + air_update_turf(FALSE, FALSE) /turf/open/proc/freeze_turf() for(var/obj/I in contents) @@ -279,11 +275,11 @@ CREATION_TEST_IGNORE_SELF(/turf/open) /turf/open/rad_act(pulse_strength) . = ..() - if (air.get_moles(GAS_CO2) && air.get_moles(GAS_O2)) - pulse_strength = min(pulse_strength,air.get_moles(GAS_CO2)*1000,air.get_moles(GAS_O2)*2000) //Ensures matter is conserved properly - air.set_moles(GAS_CO2, max(air.get_moles(GAS_CO2)-(pulse_strength/1000),0)) - air.set_moles(GAS_O2, max(air.get_moles(GAS_O2)-(pulse_strength/2000),0)) - air.adjust_moles(GAS_PLUOXIUM, pulse_strength/4000) + if (air.gases[/datum/gas/carbon_dioxide] && air.gases[/datum/gas/oxygen] && air.temperature <= PLUOXIUM_TEMP_CAP) + pulse_strength = min(pulse_strength,air.gases[/datum/gas/carbon_dioxide][MOLES]*1000,air.gases[/datum/gas/oxygen][MOLES]*2000) //Ensures matter is conserved properly + REMOVE_MOLES(/datum/gas/carbon_dioxide, air, (pulse_strength/1000)) + REMOVE_MOLES(/datum/gas/oxygen, air, (pulse_strength/2000)) + ADJUST_MOLES(/datum/gas/pluoxium, air, pulse_strength/4000) /turf/open/proc/break_tile(force, allow_base) LAZYINITLIST(damage_overlays) @@ -334,7 +330,7 @@ CREATION_TEST_IGNORE_SELF(/turf/open) return GLOB.default_turf_damage /turf/open/proc/burnt_states() - return GLOB.default_turf_burn + return GLOB.default_burn_turf /turf/open/proc/make_traction(add_visual = TRUE) if(add_visual) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 56e7a1c8e00c0..4221fdd3c1912 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -16,8 +16,8 @@ smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_OPEN_FLOOR) canSmoothWith = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_OPEN_FLOOR) - thermal_conductivity = 0.04 - heat_capacity = 10000 + thermal_conductivity = 0.02 + heat_capacity = 20000 tiled_dirt = TRUE overfloor_placed = TRUE diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 13b3c6b58b150..b20a9b4878c0d 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -100,7 +100,7 @@ return make_plating() /turf/open/floor/wood/cold - initial_temperature = 255.37 + temperature = 255.37 /turf/open/floor/wood/airless initial_gas_mix = AIRLESS_ATMOS diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm index cd2436a3d2bae..5c47fd612acfe 100644 --- a/code/game/turfs/open/floor/iron_floor.dm +++ b/code/game/turfs/open/floor/iron_floor.dm @@ -388,6 +388,8 @@ /turf/open/floor/iron/solarpanel/airless initial_gas_mix = AIRLESS_ATMOS +/turf/open/floor/iron/solarpanel/cold + initial_gas_mix = KITCHEN_COLDROOM_ATMOS /turf/open/floor/iron/freezer icon_state = "freezerfloor" diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index 99d133c7ed1f8..956c640f7749c 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -40,8 +40,10 @@ icons = list("plasma","plasma_dam") max_integrity = 200 -/turf/open/floor/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) +/turf/open/floor/mineral/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/turf/open/floor/mineral/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) PlasmaBurn(exposed_temperature) /turf/open/floor/mineral/plasma/attackby(obj/item/W, mob/user, params) diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm index d1f4503f6ff1d..af95bba835cf0 100644 --- a/code/game/turfs/open/floor/plating/asteroid.dm +++ b/code/game/turfs/open/floor/plating/asteroid.dm @@ -84,15 +84,7 @@ return ..() /turf/open/floor/plating/asteroid/planetary - var/static/datum/gas_mixture/immutable/planetary/GM - -/turf/open/floor/plating/asteroid/planetary/Initialize(mapload) - if(!GM) - GM = new - . = ..() - air = GM - update_air_ref(2) - return + planetary_atmos = TRUE /turf/open/floor/plating/lavaland_baseturf baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface @@ -136,21 +128,14 @@ baseturfs = /turf/open/lava/smooth/lava_land_surface /turf/open/floor/plating/asteroid/basalt/iceland_surface - initial_gas_mix = FROZEN_ATMOS + initial_gas_mix = KITCHEN_COLDROOM_ATMOS planetary_atmos = TRUE baseturfs = /turf/open/lava/smooth/cold /turf/open/floor/plating/asteroid/basalt/planetary resistance_flags = INDESTRUCTIBLE - var/static/datum/gas_mixture/immutable/planetary/GM - -/turf/open/floor/plating/asteroid/basalt/planetary/Initialize(mapload) - if(!GM) - GM = new - . = ..() - air = GM - update_air_ref(2) - return + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE /turf/open/floor/plating/asteroid/airless initial_gas_mix = AIRLESS_ATMOS @@ -166,7 +151,7 @@ icon_state = "fairygrass" icon_plating = "fairygrass" environment_type = "snow_cavern" - initial_gas_mix = "o2=22;n2=82;TEMP=270.15" + initial_gas_mix = KITCHEN_COLDROOM_ATMOS /turf/open/floor/plating/asteroid/snow gender = PLURAL @@ -176,7 +161,7 @@ baseturfs = /turf/open/floor/plating/asteroid/snow icon_state = "snow" icon_plating = "snow" - initial_gas_mix = FROZEN_ATMOS + initial_gas_mix = KITCHEN_COLDROOM_ATMOS environment_type = "snow" flags_1 = NONE planetary_atmos = TRUE @@ -218,12 +203,13 @@ /turf/open/floor/plating/asteroid/snow/airless initial_gas_mix = AIRLESS_ATMOS -/turf/open/floor/plating/asteroid/snow/temperatre - initial_gas_mix = "o2=22;n2=82;TEMP=255.37" +/turf/open/floor/plating/asteroid/snow/temperate + initial_gas_mix = OPENTURF_DEFAULT_ATMOS /turf/open/floor/plating/asteroid/snow/atmosphere initial_gas_mix = FROZEN_ATMOS planetary_atmos = FALSE /turf/open/floor/plating/asteroid/snow/planetary - initial_gas_mix = "o2=22;n2=82;TEMP=270.15" + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + planetary_atmos = TRUE diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 77c48198f6efc..aba0b9719ac6a 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -132,7 +132,6 @@ GM = new . = ..() air = GM - update_air_ref(2) return /turf/open/floor/plating/beach @@ -304,6 +303,18 @@ icon_state = "sandwater_inner" baseturfs = /turf/open/floor/plating/beach/coastline_t/sandwater_inner +/turf/open/floor/plating/beach/deep_water/cold + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + +/turf/open/floor/plating/beach/coastline_t/cold + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + +/turf/open/floor/plating/beach/coastline_b/cold + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + +/turf/open/floor/plating/beach/coastline_t/sandwater_inner/cold + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + /turf/open/floor/plating/ironsand gender = PLURAL name = "iron sand" @@ -329,7 +340,7 @@ icon = 'icons/turf/floors/ice_turf.dmi' icon_state = "ice-0" initial_gas_mix = FROZEN_ATMOS - initial_temperature = 180 + temperature = 180 planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/ice slowdown = 1 @@ -355,7 +366,8 @@ canSmoothWith = list(SMOOTH_GROUP_FLOOR_ICE) /turf/open/floor/plating/ice/smooth/planetary - initial_gas_mix = "o2=22;n2=82;TEMP=270.15" + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + planetary_atmos = TRUE /turf/open/floor/plating/ice/smooth/red icon = 'icons/turf/floors/red_ice.dmi' @@ -363,10 +375,10 @@ base_icon_state = "red_ice" /turf/open/floor/plating/ice/colder - initial_temperature = 140 + temperature = 140 /turf/open/floor/plating/ice/temperate - initial_temperature = 255.37 + temperature = 255.37 /turf/open/floor/plating/ice/break_tile() return @@ -381,7 +393,7 @@ icon = 'icons/turf/snow.dmi' icon_state = "snowplating" initial_gas_mix = FROZEN_ATMOS - initial_temperature = 180 + temperature = 180 attachment_holes = FALSE planetary_atmos = TRUE footstep = FOOTSTEP_SAND @@ -390,7 +402,9 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/open/floor/plating/snowed/cavern - initial_gas_mix = "n2=82;plasma=24;TEMP=120" + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + planetary_atmos = TRUE + /turf/open/floor/plating/snowed/smoothed planetary_atmos = TRUE @@ -402,13 +416,14 @@ canSmoothWith = list(SMOOTH_GROUP_FLOOR_SNOWED) /turf/open/floor/plating/snowed/smoothed/planetary - initial_gas_mix = "o2=22;n2=82;TEMP=270.15" + initial_gas_mix = KITCHEN_COLDROOM_ATMOS + planetary_atmos = TRUE /turf/open/floor/plating/snowed/colder - initial_temperature = 140 + temperature = 140 -/turf/open/floor/plating/snowed/temperatre - initial_temperature = 255.37 +/turf/open/floor/plating/snowed/temperate + temperature = 255.37 /turf/open/floor/plating/elevatorshaft name = "elevator shaft" diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm index 808025a769691..46c844bc568ca 100644 --- a/code/game/turfs/open/floor/plating/planet.dm +++ b/code/game/turfs/open/floor/plating/planet.dm @@ -17,6 +17,7 @@ /turf/open/floor/plating/dirt/planetary initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = TRUE /turf/open/floor/plating/dirt/grass desc = "You're almost positive this is real grass." diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm index 328629268d612..7ceaaa1199a74 100644 --- a/code/game/turfs/open/floor/reinf_floor.dm +++ b/code/game/turfs/open/floor/reinf_floor.dm @@ -4,7 +4,7 @@ desc = "Extremely sturdy." icon_state = "engine" holodeck_compatible = TRUE - thermal_conductivity = 0.025 + thermal_conductivity = 0.01 heat_capacity = INFINITY floor_tile = /obj/item/stack/sheet/iron footstep = FOOTSTEP_PLATING @@ -130,8 +130,7 @@ icon_state = "plating" floor_tile = null var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance - CanAtmosPass = ATMOS_PASS_NO - CanAtmosPassVertical = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO /turf/open/floor/engine/cult/Initialize(mapload) diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index 712e20e180b01..811ef3c81d95b 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -75,13 +75,13 @@ underlay_appearance.icon_state = "basalt" return TRUE -/turf/open/lava/GetHeatCapacity() +/turf/open/lava/get_heat_capacity() . = 700000 -/turf/open/lava/GetTemperature() +/turf/open/lava/get_temperature() . = 5000 -/turf/open/lava/TakeTemperature(temp) +/turf/open/lava/take_temperature(temp) /turf/open/lava/proc/is_safe() diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index 4bb13121c0f0f..c2be469d2bc59 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -5,7 +5,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/turf/open/openspace) desc = "Watch your step!" icon_state = "invisible" baseturfs = /turf/open/openspace - CanAtmosPassVertical = ATMOS_PASS_YES overfloor_placed = FALSE underfloor_accessibility = UNDERFLOOR_INTERACTABLE allow_z_travel = TRUE diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index a32b48c5b0733..d9b4bfc4a7a40 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -13,8 +13,8 @@ allow_z_travel = TRUE - initial_temperature = TCMB - thermal_conductivity = 0 + temperature = TCMB + thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT heat_capacity = 700000 // Since we have a lighting layer that extends further than the turf, make this turf @@ -25,9 +25,10 @@ var/destination_x var/destination_y - var/static/datum/gas_mixture/immutable/space/space_gas + var/static/datum/gas_mixture/immutable/space/space_gas = new // We do NOT want atmos adjacent turfs init_air = FALSE + run_later = TRUE plane = PLANE_SPACE layer = SPACE_LAYER light_power = 0.25 @@ -62,7 +63,6 @@ if(!space_gas) space_gas = new air = space_gas - update_air_ref(0) if(flags_1 & INITIALIZED_1) stack_trace("Warning: [src]([type]) initialized multiple times!") @@ -72,6 +72,9 @@ if(IS_DYNAMIC_LIGHTING(A)) overlays += GLOB.starlight_overlay + if(requires_activation) + SSair.add_to_active(src, TRUE) + return INITIALIZE_HINT_NORMAL /turf/open/space/Destroy() @@ -88,7 +91,7 @@ var/turf/T = locate(destination_x, destination_y, destination_z) user.forceMove(T) -/turf/open/space/TakeTemperature(temp) +/turf/open/space/take_temperature(temp) /turf/open/space/RemoveLattice() return @@ -104,9 +107,6 @@ /turf/open/space/remove_air(amount) return null -/turf/open/space/remove_air_ratio(amount) - return null - /turf/open/space/attack_paw(mob/user) return attack_hand(user) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ab2f450c8aeb2..25b8bddaf9f57 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -30,11 +30,12 @@ CREATION_TEST_IGNORE_SELF(/turf) var/list/baseturfs = /turf/baseturf_bottom /// How hot the turf is, in kelvin - var/initial_temperature = T20C + var/temperature = T20C /// Used for fire, if a melting temperature was reached, it will be destroyed var/to_be_destroyed = 0 - var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to + ///The max temperature of the fire which it was subjected to, determines the melting point of turf + var/max_fire_temperature_sustained = 0 /// If this turf should initialize atmos adjacent turfs or not /// Optimization, not for setting outside of initialize @@ -43,6 +44,9 @@ CREATION_TEST_IGNORE_SELF(/turf) //If true, turf will allow users to float up and down in 0 grav. var/allow_z_travel = FALSE + /// Whether the turf blocks atmos from passing through it or not + var/blocks_air = FALSE + /// For the station blueprints, images of objects eg: pipes var/list/image/blueprint_data @@ -97,6 +101,17 @@ CREATION_TEST_IGNORE_SELF(/turf) return FALSE . = ..() +/turf/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION(VV_HK_UPDATE_ACTIVE_TURF, "Update Turf Air") + +/turf/vv_do_topic(href_list) + . = ..() + if(href_list[VV_HK_UPDATE_ACTIVE_TURF]) + if(isspaceturf(src)) + return + air_update_turf(TRUE, FALSE) + /turf/Initialize(mapload) if(flags_1 & INITIALIZED_1) stack_trace("Warning: [src]([type]) initialized multiple times!") @@ -139,7 +154,7 @@ CREATION_TEST_IGNORE_SELF(/turf) add_overlay(GLOB.fullbright_overlay) if(requires_activation) - CALCULATE_ADJACENT_TURFS(src) + CALCULATE_ADJACENT_TURFS(src, KILL_EXCITED) if(color) add_atom_colour(color, FIXED_COLOUR_PRIORITY) @@ -167,13 +182,6 @@ CREATION_TEST_IGNORE_SELF(/turf) if(uses_integrity) atom_integrity = max_integrity - if(isopenturf(src)) - var/turf/open/O = src - __auxtools_update_turf_temp_info(isspaceturf(get_z_base_turf()) && !O.planetary_atmos) - else - update_air_ref(-1) - __auxtools_update_turf_temp_info(isspaceturf(get_z_base_turf())) - //Handle turf texture var/datum/turf_texture/TT = get_turf_texture() if(TT) @@ -181,15 +189,9 @@ CREATION_TEST_IGNORE_SELF(/turf) return INITIALIZE_HINT_NORMAL -/turf/proc/__auxtools_update_turf_temp_info() - -/turf/return_temperature() - -/turf/proc/set_temperature() - /// Initializes our adjacent turfs. If you want to avoid this, do not override it, instead set init_air to FALSE -/turf/proc/Initalize_Atmos(times_fired) - CALCULATE_ADJACENT_TURFS(src) +/turf/proc/Initalize_Atmos(time) + CALCULATE_ADJACENT_TURFS(src, NORMAL_TURF) /turf/Destroy(force) . = QDEL_HINT_IWILLGC @@ -240,6 +242,24 @@ CREATION_TEST_IGNORE_SELF(/turf) else user.changeNext_move(CLICK_CD_MELEE) +/// Call to move a turf from its current area to a new one +/turf/proc/change_area(area/old_area, area/new_area) + //don't waste our time + if(old_area == new_area) + return + + //move the turf + old_area.turfs_to_uncontain += src + new_area.contents += src + new_area.contained_turfs += src + + //changes to make after turf has moved + on_change_area(old_area, new_area) + +/// Allows for reactions to an area change without inherently requiring change_area() be called (I hate maploading) +/turf/proc/on_change_area(area/old_area, area/new_area) + transfer_area_lighting(old_area, new_area) + /turf/eminence_act(mob/living/simple_animal/eminence/eminence) if(get_turf(eminence) == src) show_zmove_radial(eminence) @@ -541,6 +561,15 @@ CREATION_TEST_IGNORE_SELF(/turf) continue . += turf_to_check +/turf/proc/get_heat_capacity() + . = heat_capacity + +/turf/proc/get_temperature() + . = temperature + +/turf/proc/take_temperature(temp) + temperature += temp + /turf/proc/generate_fake_pierced_realities(centered = TRUE, max_amount = 2) if(max_amount <= 0) return diff --git a/code/game/world.dm b/code/game/world.dm index 25236936ee88c..98db440f7c303 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -32,7 +32,6 @@ GLOBAL_VAR(restart_counter) */ /world/proc/Genesis() // auxtools has to go BEFORE tracy, otherwise tracy will clobber its hook addresses - AUXTOOLS_CHECK(AUXMOS) #ifdef USE_BYOND_TRACY #warn USE_BYOND_TRACY is enabled init_byond_tracy() @@ -350,13 +349,11 @@ GLOBAL_VAR(restart_counter) log_world("World rebooted at [time_stamp()]") shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. - AUXTOOLS_SHUTDOWN(AUXMOS) ..() #endif /world/Del() shutdown_logging() // makes sure the thread is closed before end, else we terminate - AUXTOOLS_SHUTDOWN(AUXMOS) var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") if (debug_server) LIBCALL(debug_server, "auxtools_shutdown")() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 3fb16ec4636fc..8dd7213d45e84 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -187,9 +187,9 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/cmd_display_init_log, /client/proc/cmd_display_overlay_log, /client/proc/reload_configuration, + /client/proc/atmos_control, /client/proc/give_all_spells, /datum/admins/proc/create_or_modify_area, - /datum/admins/proc/fixcorruption, #ifdef TESTING /client/proc/check_missing_sprites, /client/proc/run_dynamic_simulations, @@ -627,6 +627,13 @@ GLOBAL_PROTECT(admin_verbs_hideable) log_admin("[key_name(usr)] has modified Dynamic Explosion Scale: [ex_scale]") message_admins("[key_name_admin(usr)] has modified Dynamic Explosion Scale: [ex_scale]") +/client/proc/atmos_control() + set name = "Atmos Control Panel" + set category = "Debug" + if(!check_rights(R_DEBUG)) + return + SSair.ui_interact(mob) + /client/proc/give_spell(mob/T in GLOB.mob_list) set category = "Fun" set name = "Give Spell" @@ -810,11 +817,14 @@ GLOBAL_PROTECT(admin_verbs_hideable) message_admins("[key_name_admin(usr)] stabilized atmos at [AREACOORD(T)]") log_game("[key_name_admin(usr)] stabilized atmos at [AREACOORD(T)]") - var/datum/gas_mixture/GM = new - for(var/turf/open/F in view()) - GM.parse_gas_string(F.initial_gas_mix) - F.copy_air(GM) - F.update_visuals() + for(var/turf/open/valid_range_turf in view()) + if(valid_range_turf.blocks_air) + //skip walls + continue + var/datum/gas_mixture/safe_gas_mixture = SSair.parse_gas_string(valid_range_turf.initial_gas_mix, /datum/gas_mixture/turf) + valid_range_turf.copy_air(safe_gas_mixture) + valid_range_turf.temperature = initial(valid_range_turf.temperature) + valid_range_turf.update_visuals() for(var/obj/machinery/portable_atmospherics/canister/can in view()) can.valve_open = FALSE diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index 0a4abfd033111..e0c5b4e26fa78 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -11,22 +11,18 @@ if(pipe.z && (!pipe.nodes || !pipe.nodes.len || (null in pipe.nodes))) to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_VERBOSEJMP(pipe)]") - //Manifolds - for(var/obj/machinery/atmospherics/pipe/manifold/pipe in GLOB.machines) - if(pipe.z && (!pipe.nodes || !pipe.nodes.len || (null in pipe.nodes))) - to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_VERBOSEJMP(pipe)]") - //Pipes - for(var/obj/machinery/atmospherics/pipe/simple/pipe in GLOB.machines) + for(var/obj/machinery/atmospherics/pipe/pipe in GLOB.machines) + if(istype(pipe, /obj/machinery/atmospherics/pipe/smart) || istype(pipe, /obj/machinery/atmospherics/pipe/layer_manifold)) + continue if(pipe.z && (!pipe.nodes || !pipe.nodes.len || (null in pipe.nodes))) to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_VERBOSEJMP(pipe)]") - //Erroneous Connections, e.g. duplicate pipes - //This uses pipeline_expansion(), so you can detect some atmos machineries causing problems at pipenet code. - for (var/obj/machinery/atmospherics/AM in GLOB.machines) - for (var/obj/machinery/atmospherics/AMT in AM.pipeline_expansion()) - if (!(AM in AMT.pipeline_expansion())) - to_chat(usr, "Errorneous connections around [AM.name]. Duplicate or rogue pipes suspected at or around [ADMIN_VERBOSEJMP(AM)]") + //Nodes + for(var/obj/machinery/atmospherics/node1 in GLOB.machines) + for(var/obj/machinery/atmospherics/node2 in node1.nodes) + if(!(node1 in node2.nodes)) + to_chat(usr, "One-way connection in [node1.name] located at [ADMIN_VERBOSEJMP(node1)]") /client/proc/powerdebug() set category = "Mapping" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index cffa07dbd0eea..e4411bd3d8179 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -31,10 +31,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that set name = "Air Status in Location" if(!mob) return - var/turf/T = get_turf(mob) - if(!isturf(T)) + var/turf/user_turf = get_turf(mob) + if(!isturf(user_turf)) return - atmosanalyzer_scan(usr, T, TRUE) + atmos_scan(mob, user_turf, TRUE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list) @@ -272,42 +272,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(usr)] gave away direct control of [M] to [newkey].") SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_test_atmos_controllers() - set category = "Mapping" - set name = "Test Atmos Monitoring Consoles" - - var/list/dat = list() - - if(SSticker.current_state == GAME_STATE_STARTUP) - to_chat(usr, "Game still loading, please hold!") - return - - message_admins(span_adminnotice("[key_name_admin(usr)] used the Test Atmos Monitor debug command.")) - log_admin("[key_name(usr)] used the Test Atmos Monitor debug command.") - - var/bad_shit = 0 - for(var/obj/machinery/computer/atmos_control/tank/console in GLOB.atmos_air_controllers) - dat += "

    [console] at [AREACOORD(console)]:


    " - if(console.input_tag == console.output_tag) - dat += "Error: input_tag is the same as the output_tag, \"[console.input_tag]\"!
    " - bad_shit++ - if(!LAZYLEN(console.input_info)) - dat += "Failed to find a valid outlet injector as an input with the tag [console.input_tag].
    " - bad_shit++ - if(!LAZYLEN(console.output_info)) - dat += "Failed to find a valid siphon pump as an outlet with the tag [console.output_tag].
    " - bad_shit++ - if(!bad_shit) - dat += "STATUS: NORMAL" - else - bad_shit = 0 - dat += "
    " - CHECK_TICK - - var/datum/browser/popup = new(usr, "testatmoscontroller", "Test Atmos Monitoring Consoles", 500, 750) - popup.set_content(dat.Join()) - popup.open() - /client/proc/cmd_admin_areatest(on_station) set category = "Mapping" set name = "Test Areas" @@ -591,7 +555,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(Rad.anchored) if(!Rad.loaded_tank) var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad) - Plasma.air_contents.set_moles(GAS_PLASMA, 70) + var/datum/gas_mixture/plasma_air = Plasma.return_air() + SET_MOLES(/datum/gas/plasma, plasma_air, 70) + Rad.drainratio = 0 Rad.loaded_tank = Plasma Plasma.forceMove(Rad) @@ -916,13 +882,15 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(!check_rights(R_DEBUG) || !C) return - var/gas_to_add = input(usr, "Choose a gas to modify.", "Choose a gas.") as null|anything in GLOB.gas_data.ids + var/gas_to_add = input(usr, "Choose a gas to modify.", "Choose a gas.") as null|anything in subtypesof(/datum/gas) var/amount = input(usr, "Choose the amount of moles.", "Choose the amount.", 0) as num var/temp = input(usr, "Choose the temperature (Kelvin).", "Choose the temp (K).", 0) as num + var/datum/gas_mixture/C_air = C.return_air() + + SET_MOLES(gas_to_add, C_air, amount) - C.air_contents.set_moles(gas_to_add, amount) - C.air_contents.set_temperature(temp) + C_air.temperature = (temp) C.update_icon() message_admins(span_adminnotice("[key_name_admin(src)] modified \the [C.name] at [AREACOORD(C)] - Gas: [gas_to_add], Moles: [amount], Temp: [temp].")) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 8c9f3559c2da9..0ff09856fa324 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -4,7 +4,7 @@ if(!isturf(target)) return - atmosanalyzer_scan(usr, target, TRUE) + atmos_scan(usr, target, TRUE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Air Status") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/fix_next_move() diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm new file mode 100644 index 0000000000000..2be19a94680ad --- /dev/null +++ b/code/modules/admin/verbs/fix_air.dm @@ -0,0 +1,20 @@ +// Proc taken from yogstation, credit to nichlas0010 for the original +/client/proc/fix_air(turf/open/T in world) + set name = "Fix Air" + set category = "Admin.Game" + set desc = "Fixes air in specified radius." + + if(!holder) + to_chat(src, "Only administrators may use this command.") + return + if(check_rights(R_ADMIN,1)) + var/range=input("Enter range:","Num",2) as num + message_admins("[key_name_admin(usr)] fixed air with range [range] in area [T.loc.name]") + usr.log_message("fixed air with range [range] in area [T.loc.name]", LOG_ADMIN) + for(var/turf/open/F in range(range,T)) + if(F.blocks_air) + //skip walls + continue + var/datum/gas_mixture/GM = SSair.parse_gas_string(F.initial_gas_mix, /datum/gas_mixture/turf) + F.copy_air(GM) + F.update_visuals() diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 36dc95bc3aaec..78d0d33cbe55a 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -39,7 +39,6 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( #ifdef TESTING /client/proc/see_dirty_varedits, #endif - /client/proc/cmd_admin_test_atmos_controllers, /client/proc/cmd_admin_rejuvenate, /datum/admins/proc/show_traitor_panel, /client/proc/disable_communication, diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index 4b92f832ff08b..a04ea3aecbdf5 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -9,7 +9,7 @@ anchored = TRUE layer = BELOW_MOB_LAYER pass_flags_self = PASSBLOB - CanAtmosPass = ATMOS_PASS_PROC + can_atmos_pass = ATMOS_PASS_PROC var/point_return = 0 //How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed. max_integrity = 30 armor_type = /datum/armor/structure_blob @@ -39,7 +39,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) setDir(pick(GLOB.cardinals)) update_icon() if(atmosblock) - air_update_turf(1) + air_update_turf(TRUE, TRUE) ConsumeTile() /obj/structure/blob/proc/creation_action() //When it's created by the overmind, do this. @@ -48,7 +48,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) /obj/structure/blob/Destroy() if(atmosblock) atmosblock = FALSE - air_update_turf(1) + air_update_turf(TRUE, FALSE) if(overmind) overmind.blobs_legit -= src //if it was in the legit blobs list, it isn't now GLOB.blobs -= src //it's no longer in the all blobs list either @@ -72,10 +72,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) result++ . -= result - 1 -/obj/structure/blob/BlockThermalConductivity() - return atmosblock - -/obj/structure/blob/CanAtmosPass(turf/T) +/obj/structure/blob/can_atmos_pass(turf/T, vertical = FALSE) return !atmosblock /obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind. diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index f2eaf33da1d74..8488e8eea38fb 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -36,7 +36,7 @@ . = ..() if(. && atom_integrity > 0) atmosblock = atom_integrity < (max_integrity * 0.5) - air_update_turf(TRUE) + air_update_turf(TRUE, atmosblock) /obj/structure/blob/shield/update_icon_state() icon_state = "[initial(icon_state)][(atom_integrity < (max_integrity * 0.5)) ? "_damaged" : null]" diff --git a/code/modules/antagonists/clock_cult/clockwork_turfs.dm b/code/modules/antagonists/clock_cult/clockwork_turfs.dm index 7c72351124572..42e06fae2beda 100644 --- a/code/modules/antagonists/clock_cult/clockwork_turfs.dm +++ b/code/modules/antagonists/clock_cult/clockwork_turfs.dm @@ -343,7 +343,7 @@ damage_deflection = 30 normal_integrity = 240 air_tight = FALSE - CanAtmosPass = ATMOS_PASS_YES + can_atmos_pass = ATMOS_PASS_YES var/construction_state = GEAR_SECURE //Pinion airlocks have custom deconstruction allow_repaint = FALSE diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 1ff05139c58d1..dcc958f07924b 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -671,7 +671,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/rune/narsie) invocation = "Khari'd! Eske'te tannin!" icon_state = "4" color = RUNE_COLOR_DARKRED - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY var/datum/timedevent/density_timer var/recharging = FALSE @@ -691,9 +691,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/rune/wall) GLOB.wall_runes -= src return ..() -/obj/effect/rune/wall/BlockThermalConductivity() - return density - /obj/effect/rune/wall/invoke(var/list/invokers) if(recharging) return diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index 162662fc648cc..9d0a2d74df87c 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -59,7 +59,7 @@ return FALSE var/turf/open/our_turf = loc - if(our_turf.GetTemperature() > T0C) + if(our_turf.get_temperature() > T0C) loc.balloon_alert(user, "ritual failed, not cold enough!") return FALSE @@ -88,7 +88,7 @@ var/mob/living/carbon/carbon_target = target var/turf/open/target_turf = get_turf(carbon_target) - target_turf.TakeTemperature(-20) + target_turf.take_temperature(-20) carbon_target.adjust_bodytemperature(-40) carbon_target.silent += 4 @@ -250,7 +250,7 @@ return FALSE var/turf/open/our_turf = loc - if(our_turf.GetTemperature() > T0C) + if(our_turf.get_temperature() > T0C) loc.balloon_alert(user, "ritual failed, not cold enough!") return FALSE @@ -289,7 +289,7 @@ var/turf/open/source_turf = get_turf(source) if(!isopenturf(source_turf)) return - source_turf.TakeTemperature(-20) + source_turf.take_temperature(-20) var/area/source_area = get_area(source) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index a50aa96c7c704..523835c59f507 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -14,7 +14,24 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/syndicatebomb/badmin/clown, /obj/machinery/syndicatebomb/empty, /obj/machinery/syndicatebomb/self_destruct, - /obj/machinery/syndicatebomb/training + /obj/machinery/syndicatebomb/training, + /obj/machinery/atmospherics/pipe/layer_manifold, + /obj/machinery/atmospherics/pipe/multiz, + /obj/machinery/atmospherics/pipe/smart, + /obj/machinery/atmospherics/pipe/smart/manifold, //mapped one + /obj/machinery/atmospherics/pipe/smart/manifold4w, //mapped one + /obj/machinery/atmospherics/pipe/color_adapter, + /obj/machinery/atmospherics/pipe/bridge_pipe, + /obj/machinery/atmospherics/pipe/heat_exchanging/simple, + /obj/machinery/atmospherics/pipe/heat_exchanging/junction, + /obj/machinery/atmospherics/pipe/heat_exchanging/manifold, + /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, + /obj/machinery/atmospherics/components/tank, + /obj/machinery/atmospherics/components/unary/portables_connector, + /obj/machinery/atmospherics/components/unary/passive_vent, + /obj/machinery/atmospherics/components/unary/heat_exchanger, + /obj/machinery/atmospherics/components/binary/valve, + /obj/machinery/portable_atmospherics/canister, ))) //The malf AI action subtype. All malf actions are subtypes of this. @@ -521,7 +538,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 25 power_type = /datum/action/innate/ai/break_fire_alarms unlock_text = span_notice("You replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will.") - unlock_sound = 'goon/sound/machinery/firealarm.ogg' + unlock_sound = 'sound/machines/FireAlarm1.ogg' /datum/action/innate/ai/break_fire_alarms name = "Override Thermal Sensors" @@ -530,22 +547,26 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( uses = 1 /datum/action/innate/ai/break_fire_alarms/Activate() - for(var/obj/machinery/firealarm/F in GLOB.machines) - if(!is_station_level(F.z)) + for(var/obj/machinery/firealarm/bellman in GLOB.machines) + if(!is_station_level(bellman.z)) continue - F.obj_flags |= EMAGGED - F.update_icon() + bellman.obj_flags |= EMAGGED + bellman.update_icon() + for(var/obj/machinery/door/firedoor/firelock in GLOB.machines) + if(!is_station_level(firelock.z)) + continue + firelock.on_emag(owner_AI) owner.log_message("activated malf module [name]", LOG_GAME) to_chat(owner, span_notice("All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.")) owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) -//Air Alarm Safety Override: Unlocks the ability to enable flooding on all air alarms. +//Air Alarm Safety Override: Unlocks the ability to enable dangerous modes on all air alarms. /datum/AI_Module/large/break_air_alarms module_name = "Air Alarm Safety Override" mod_pick_name = "allow_flooding" - description = "Gives you the ability to disable safeties on all air alarms. This will allow you to use the environmental mode Flood, which disables scrubbers as well as pressure checks on vents. \ - Anyone can check the air alarm's interface and may be tipped off by their nonfunctionality." + description = "Gives you the ability to disable safeties on all air alarms. This will allow you to use extremely dangerous environmental modes. \ + Anyone can check the air alarm's interface and may be tipped off by their nonfunctionality." one_purchase = TRUE cost = 50 power_type = /datum/action/innate/ai/break_air_alarms @@ -554,7 +575,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/break_air_alarms name = "Override Air Alarm Safeties" - desc = "Enables the Flood setting on all air alarms." + desc = "Enables extremely dangerous settings on all air alarms." button_icon_state = "break_air_alarms" uses = 1 diff --git a/code/modules/atmospherics/Atmospherics.md b/code/modules/atmospherics/Atmospherics.md new file mode 100644 index 0000000000000..f0ebe8ba0041c --- /dev/null +++ b/code/modules/atmospherics/Atmospherics.md @@ -0,0 +1,528 @@ +# Atmospherics +## 1. Preamble + +This file will be written in the first person in the interest of having a laid back style, as some of the concepts here would be ass to read as technical writing. Understand that this isn't the work of one person, but the combined efforts of several contributors. It is a living document, and one you should strive to keep up to date. + +I have ~~stolen~~ adapted this document from the work of duncathan, an off and on maintainer who is responsible for the majority of the quality of the current atmos system. He pushed through several code cleanliness and sanity refactors to the system, and wrote the rundown of gas mixtures you'll find in this document. See the [original](https://gist.github.com/duncathan/77d918748d153b4f31a8f76f6085b91a) for his draft. + +Now, the purpose of this bit of documentation. + +Over the history of /tg/ there have been several periods where one or no active coders understood how atmospherics works, or even how it was intended to work. We've lost several major pieces of functionality, not because none knew how they worked, but because none knew that they should work, or even that they existed. + +Atmospherics tends to be a somewhat cloudy corner of our codebase, unless you know exactly what to look for noticing that something is broken can be a feat in and of itself. + +My goal here is to solve that problem once and for all. Not everything will be documented in this file, I won't go line by line. I will however describe how things ought to work, and how some of the more complex stuff is meant to run. + +Atmospherics is a very complicated and intimidating system of SS13, and as such very few contributors have ever made changes to it. Even fewer is the number of contributors who have made changes to the more fundamental aspects of atmos, such as Environmental Atmos or gas mixtures. There are several other factors for this, of course. In the case of Environmental, its arcane nature coupled with its extremely important gameplay effects leave it a very undesirable target for even the least sane coder. As for gas mixtures, they were virtually untouchable without extensive reworks of the code. This [paste-bin](https://pastebin.com/bwy4KpBE) is a good example; it lists all the files one would need to make changes in order to add a new type of gas in the old system. As you can imagine, the sheer bulk of work one would need to do to accomplish this essentially invalidated any such attempts. However, my primary goal is to bring atmos to a state where any coder will be able to understand how and why it works, as well as cleanly and relatively easily make changes or additions to the system. While much progress to this end has been achieved, still very few have taken advantage of the new frameworks to try to implement meaningful features or changes. The purpose of this document is to lay out the inner workings of the entire atmos system, such that someone who does not have an intimate understand of the system like myself will be able to contribute to the system nonetheless. + +Recognizing this desire, I hope and believe that you who are reading this are willing to learn and contribute. + +Thank you. + +## 2. Introduction to Atmos + +Hello! So glad you could join us. + +Atmospherics is the system we use to simulate gases. Might as well get that out of the way. It is made up of several major parts, and a few more minor ones. We'll be covering the air subsystem, gas mixtures, reactions, environmental flow, and pipenets in the document. + +If you'd like to understand more about how environmental atmos works after reading the relevant subsection, go to Appendix B. It discusses how to properly visualize the system, and what different behavior looks like. + +Now then, into the breach. + +## 3. The Air Controller + +![Cyclical graph of one atmos tick](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/Cycle.png) + +*Figure 3.1: The structure of one air controller tick. Not totally accurate, but it will do* + + The air controller is, at its core, quite simple, yet it is absolutely fundamental to the atmospheric system. The air controller is the clock which triggers all continuous actions within the atmos system, such as vents distributing air or gas moving between tiles. The actions taken by the air controller are quite simple, and will be enumerated here. Much of the substance of the air ticker is due to the game's master controller, whose intricacies I will not delve into for this document. I will however go into more detail about how SSAir in particular works in Chapter 6. In any case, this is a simplified list of the air controller's actions in a single tick: +1. Rebuild Pipenets + - Runs each time SSAir processes, sometimes out of order. It ensures that no pipeline sit unresolved or unbuilt + - Processes the `rebuild_queue` list into the `expansion_queue` list, and then builds a full pipeline piecemeal. We do a ton of fenagling here to reduce overrun +2. Pipenets + - Updates the internal gasmixes of attached pipe machinery, and reacts the gases in a pipeline + - Calls `process()` on each `/datum/pipenet` in the `networks` list +3. Machinery + - Handles machines that effect atmospherics, think vents, the supermatter, pumps, all that + - Calls `process_atmos()` on each `/obj/machinery` (typically `/obj/machinery/atmospherics`) in the `atmos_machinery` list + - May remove the machinery from said list if `process_atmos()` returns `PROCESS_KILL` +4. Active turfs + - This is the heart and soul of environmental atmos, see more details below + - All you need to know right now is it manages moving gas from tile to tile + - Calls `process_cell()` on each `/turf/open` in the `active_turfs` list +5. Excited groups + - Manages excited groups, which are core to working flow simulation + - More details to come, they handle differences between gasmixtures when active turfs can't do the job + - Increases the `breakdown_cooldown` and `dismantle_cooldown` for each `/datum/excited_group` in the `excited_groups` list + - If either cooldown for a given excited group has passed its threshold + - Calls `self_breakdown()` or `dismantle()` appropriately on the excited group. +6. High pressure deltas + - Takes the gas movement from Active Turfs and uses it to move objects on said turfs + - Calls `high_pressure_movements()` on each `/turf/open` in the `high_pressure_delta` list. + - Sets each turf's `pressure_difference` to 0 +7. Hotspots + - These are what you might know as fire, at least the effect of it. + - They deal with burning things, and color calculations, lots of color calculations + - Calls `process()` on each `/obj/effect/hotspot` in the `hotspots` list +8. Superconductivity + - Moves heat through turfs that don't allow gas to pass + - Deals with heating up the floor below windows, and some other more painful heat stuff + - Calls `super_conduct()` on each `/turf` in the `active_super_conductivity` list +9. Atoms + - Processes things in the world that should know about gas changes, used to account for turfs sleeping, I'll get more into that in a bit + - Calls `process_exposure()` on each `/atom` in the `atom_process` list + +## 4. Gas Mixtures +If the air controller is the heart of atmos, then gas mixtures make up its blood. The bulk of all atmos calculations are performed within a given gas mixture datum (an instance of `/datum/gas_mixture`), be it within a turf or within an emergency oxygen tank or within a pipe. In particular, `/datum/gas_mixture/proc/share()` is the cornerstone of atmos simulation, as it and its stack perform all the calculations for equalizing two gas mixtures. + +Gas mixtures contain some of the oldest code still in our codebase, and it is remarkable that overall, the logic behind the majority of gas mixture procs has gone unchanged since the days of Exadv1. Despite being in some sense "oldcode", the logic itself is quite robust and based in real world physics. Thankfully, gas mixtures already are quite well documented in terms of their behavior. Their file is well commented and kept up to date. I will, however, elaborate on some of the less obvious operations here. Additionally, I will document the structure of gas lists, and how one should interface with a gas mixture should you choose to use one in other code. + +Now don't be scared by the code mind, it's SPOOKY PHYSICS but it's not the devil, we can break it down into component parts to understand it. + +```DM +//transfer of thermal energy (via changed heat capacity) between self and sharer + if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY) + temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity +``` +*Snippet 4.1: excerpt from `/datum/gas_mixture/proc/share()`* + +The snippet above is an example of one particularly strange looking calculation. This part of share() is updating the temperature of a gas mixture to account for lost or gained thermal energy as gas moves to/from the mixture, since gases themselves carry heat. To understand this snippet, it is important to understand the difference between heat and temperature. For the most part, the average coder need only concern himself with temperature, as it is a familiar experience for anybody. However, internally in atmos, heat (thermal energy) is the truly important quantity. Heat is defined as temperature multiplied by heat capacity, and is measured in joules. Typically within atmos, we are more concerned with manipulating heat than temperature; however, temperature is tracked rather than heat largely to make interfacing with the system simpler for the average coder. Thus, this snippet modifies heat in terms of temperature - it adds/subtracts three terms, each of which measure heat, to determine the new heat in the gas mixture. This heat is then divided by the mixture's heat capacity in order to determine temperature. + +One trick to understanding passages like this is to do some simple dimensional analysis. Look only at the units, and ensure that whenever a variable is assigned that it is being assigned the appropriate unit. The snippet previously discussed can be represented with the following units: `temperature = ((J/K)*K - (J/K)*K + (J/K)*K)/(J/K)`. Simplified, you get `(J-J+J)*K/J` and then simply `J*K/J` and `K`, verifying that temperature is being set to a value in kelvins. This trick has proven invaluable to me when debugging the inner workings of gas mixtures. + +### Gases + +The true beauty of the gas mixture datum is how it represents the gases it contains. A bit of history: gas mixtures used to represent gas in two ways - there were the four primary gases (oxygen, nitrogen, carbon dioxide, and plasma) which were hardcoded. Each gas mixture had two vars (moles and archived moles, a concept to be explained later) to represent each of these gases. Calculations such as thermal energy made use of predefined constants for these hardcoded gases. The benefit of this was that they were extremely quick - only a single datum var access was needed for each one. In contrast, there were trace gases, for which there were a list of gas datums. The only trace gas available in normal gameplay was nitrous oxide (N2O or sleeping agent), though through adminnery it was possible to create oxygen agent B and volatile fuel, curious gases which will be described later for historical reasons. Trace gases, in contrast to hardcoded gases, were quite modular. To add a new trace gas one needed only to define a new subtype of /datum/gas and add appropriate behavior wherever desired, such as breath code. Unfortunately, of course, trace gases were slooooow. Calculations on trace gases were significantly more costly than hardcoded gases. The problem was obvious - it seemed impossible to have a gas definition which shared the modularity of trace gases without sacrificing too much of the performance of the hardcoded gases. + +What then to do? There was no option to port an improvement from another codebase. As far as I am aware, there have been no significant downstream improvements to gas mixtures. The other major upstream codebase, Baystation12, uses a very different atmos system; in particular, their XGM gas mixtures have their own solution to this problem. To summarize XGM, there is a singleton which has associative lists of gas metadata (information such as specific heat, or which overlay to display when the gas is present) which gets accessed whenever such information is needed. To count moles, each gas mixture has an associative list of gas ids mapped to mole counts. There were a couple of problems with this approach: 1. There was no measure of archived moles. While it would be easy to simply add a second associative list, this has non-trivial memory implications as well as a potential increase to total datum var accesses within internal atmos calculations. 2. The singleton used for storing metadata helps with the memory impact that using full datums would have, but does not properly address the cost of datum var accesses, as to access metadata you must still access a datum var on the singleton. + +For some time, without a clear solution, we simply stuck to the status quo and left gases non-modular. Eventually, however, there was an idea. + +Enter Listmos. + +### The Gas List +The solution we came to was beautifully simple, but founded on some unintuitive principles. While datum var accesses are quite slow, proc var accesses are acceptable. If we use a reference for a given var, this can be exploited by "caching" the reference inside of a proc var. How can we take advantage of this without using a datum, thus nullifying the benefit? + +The answer was to use a list. The critical realization was that a gas datum functioned more so as a struct than as a class. There were no procs attached to gas datums; only vars. While DM lacks a true struct with quick lookup times, a list works very well to perform the same function. Thus, the current structure of gas was created, under the name Listmos. + +Each gas mixture has an associative list, gases, which maps according to a key to a particular gas. This gas is itself a list (not an associative list, mind) with three elements; these elements correspond to the moles, archived moles, and to another list. This final list is a singleton - only one instance of it exists per gas, and all gas instances of a particular type point to this same list as their third element. The final list contains the metadata for the gas, such as specific heat or the name of the gas. The structure of the metadata list varies according to how many attributes are defined overall for all gases, but it is also non-associative since the structure can never change post-compile, so we save a little bit of performance by avoiding associative lookups. + +Each type of gas is defined by defining a new subtype of /datum/gas. These datums do not get instantiated; they merely serve as a convenient and familiar means for a coder unfamiliar with the inner workings of listmos to define a new gas. Additionally, the type paths serve a second use as the keys used to access a particular gas within the gases list. It is easiest to demonstrate the manipulation of gas, including these list accesses, with an example. + +### Interfacing with a Gas Mixture + +```DM +var/datum/gas_mixture/air = new +air.assert_gas(/datum/gas/oxygen) +air.gases[/datum/gas/oxygen][MOLES] = 100 +world << air.gases[/datum/gas/oxygen][GAS_META][META_GAS_NAME] //outputs "Oxygen" +world << air.gases.heat_capacity() //outputs 2000 (100 mol * 20 J/K/mol) +air.gases[/datum/gas/oxygen][MOLES] -= 110 +air.garbage_collect() //oxygen is now removed from the gases list, since it was empty +``` +*Snippet 4.2: gas mixture usage examples* + +Of particular note in this snippet are the two procs assert_gas() and garbage_collect(). These procs are very important while interfacing with gas mixtures. If you are uncertain about whether a given mixture has a particular gas, you must use assert_gas() before any reads or writes from the gas. If you fail to use assert_gas() then there will be runtime errors when you try to access the inner lists. When you remove any number of moles from a given gas, be sure to call garbage_collect(). This proc removes all gases which have mole counts less than or equal to 0. This is a memory and performance enhancement for list accesses achieved by reducing the size of the list, and also saves us from having to do sanity checks for negative moles whenever gas is removed. As a quick reference, here is a list of common procs/vars/list indices which the average coder may wish to use when interfacing with a gas mixture. + +##### Gas Mixture Datum +* *`/datum/gas_mixture/proc/assert_gas()`* - Used before accessing a particular type of gas. +* *`/datum/gas_mixture/proc/assert_gases()`* - Shorthand for calling assert_gas() multiple times. +* *`/datum/gas_mixture/proc/garbage_collect()`* - Used after removing any number of moles from a mixture. +* *`/datum/gas_mixture/proc/return_pressure()`* - Pressure is what should be displayed to players to quantify gas; measured in kilopascals. +* *`/datum/gas_mixture/var/temperature`* - Measured in kelvins. Useful constants are T0C and T20C for 0 and 20 degrees Celsius respectively, and TCMB,the temperature of space and the lower bound for temperature in atmos. +* *`/datum/gas_mixture/var/volume`* - Measured in liters. + +While we're on the subject, `/datum/gas_mixture` has two subtypes. +The first is `/datum/gas_mixture/turf`, which exists for literally one purpose. When a turf is empty, we want it to have the same heat capacity as space. This lets us achieve that by overriding `heat_capacity()` + +The second is `/datum/gas_mixture/immutable`, which itself has two subtypes. +The type is built to allow for gasmixtures that serve as infinite sources of "something", which can't be changed or mutated. +It's used by `/datum/gas_mixture/immutable/space`, which implements some particular things for `heat_capacity()` and some optimizations for gas operations. +It's also implemented by `/datum/gas_mixture/immutable/planetary`, which is used for planetary turfs, and has some code that makes actually having a gasmix possible. + + +##### Gas List +* *`gases[path][MOLES]`* - Quantity of a particular gas within a mixture. +* *`gases[path][GAS_META][META_GAS_NAME]`* - The long name of a gas, ex. "Oxygen" or "Hyper-noblium" +* *`gases[path][GAS_META][META_GAS_ID]`* - The internal ID of a given gas, ex. "o2" or "nob" + +### Reactions +While defining a new gas on its own is very simple, there is no gas-specific behavior defined within /datum/gas. This behavior gets defined in a few places, notably breath code (to be discussed later) and in reactions. The most important and well known reaction in SS13 is fire - the combustion of plasma. Reactions are used for several things - in particular, it is conventional (though by no means enforced) that to form a gas, a reaction must occur. Creating a new reaction is fairly simple, this is the area of atmos that has received the most attention over the last few years, and the best place to start. Don't be scared of the size of reactions.dm, it's not that complex. + +There are two procs needed when defining a new reaction, /datum/gas_reaction/proc/init_reqs() and /datum/gas_reaction/proc/react(). init_reqs() initializes the requirements for the reaction to occur. There is a list, min_requirements, which maps gas paths to required amount of moles. It also maps three specific strings ("TEMP", "MAX_TEMP" and "ENER") to temperature in kelvins and thermal energy in joules. More behavior could easily be added here, but it hasn't yet for performance reasons because no reactions have need of it. + +As for react(), it is where all the behavior of the reaction is defined. The proc must return one of NO_REACTION, REACTING, or STOP_REACTIONS. The proc takes one or optionally two arguments. The first, mandatory, argument is a gas mixture on which to perform calculations; this mixture is what is reacting. The second, optional, argument is a turf or pipenet, specifically the thing which contains the gas mixture. You may choose for the reaction to affect the object in some way. Note that it is conventional for constants within reactions to be #define'd at the top of the file and #undef'd at the end. + +## 5. Environmental Atmos + +This is a rather large subject, we will need to cover gas flow, turf sleeping, superconduction, and much more. Strap in and enjoy the ride! + +### A Word On `Share()` + +Each pair of turfs will only ever call `share()` on each other once. They use an archived cycle to keep track of +this ordering + +That means turf A calling share on turf B should work the same as turf B calling share on turf A + +The key idea of FEA, the core sharing system we use is that neighboring cells should effectively equalize with each other. +So taken on a line, you'd have two sharing partners, the cells to your left and right. The end goal of the simulation is for all the tiles on the line to have the same mix. But we can't just jump to that. So each "tick" we take our mix and average it with the mixes of the two tiles next to us. + +There's an equation for this that's considered standard in heat simulation. (Watch this video: https://www.youtube.com/watch?v=ly4S0oi3Yz8) +We can't use it because means each pair of turfs needs to talk to each other twice, which is pain expensive. That and I'm pretty sure it would prevent us from yielding + +So instead of a complex form of averaging, we portion up tiles. So if you have two neighbors and you have something they don't, you can give them each a third. Have to keep one for ourselves mind, because otherwise we'll run out of gas. They can then act on this portion however they like, and we can likewise act on a portion of them to our liking. + +We know how much gas a tile had at the outset because of the archived moles list index. If we take more then we're owed in any shares before all other turfs have had their say, we could end up with negative moles. We expend a lot of effort to avoid this. + +The math for this looks like (totaldeltagas)/(neighborcount + 1) + +You may notice something like this in `process_cell()`. It's not quite the same though. + +Back in the old FEA days, neighbor count was hardcoded to 4 (Likely because this is what cell sharing on an infinite grid would look like). This means that turf A -> turf B is the same as turf B -> turf A, because they're each portioning up the gas in the same way. + +But when we moved to LINDA, we started using the length of our atmos_adjacent_turfs list (or an analog). +We need this so things like multiz can work, and so tiles in a corner share in a way that makes sense. + +Because of this, turf A -> turf B was no longer the same as turf B -> turf A, assuming one of those turfs had a different neighbor count, from I DON'T KNOW WALLS? + +The fix for this was to use our neighbor count when moving gas from our tile to someone else's, and use the sharer's neighbor count when taking from it. + +This makes sense intuitively if you think of it like portioning up a tile, but I've included a rundown to make +it a bit easier to prove to yourself. + +
    +Take a look + +I have 10 +You have 20 +let's share +I've got 2 partners +you've got 3 partners +so you want to give me 1/4th of your gas +I want to give you 1/3rd of my gas + +the total gas diff between me and you is -10 +since it's negative you get to decide how to portion it +so the total amount to share is -2.5 +I end up with 12.5 +you end up with 17.5 + +again + +total diff is -5 +to share is 1.25 +I end up with 13.75 +you end up with 16.25 + +again + +total diff is -2.5 +to share is 0.3125 +I end up with 14.0625 +you end up with 15.9375 + +
    + +We need to do this because if the portions get mixed up, our archived gas list ends up lying about how much of each gas type we have available to share. +This can lead to negative moles, which the system is not prepared for. + +This is also why we queue space's sucking till the end of a tile's `process_cell()` btw, by that point we can ensure that no other tile will need to check for our mix, so we can freely violate our portioning. + + +### Active Turfs +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/FlowVisuals.png) + +*Figure 5.1: A visual of the algorithm `process_cell()` implements, ignoring our optimizations* + +Active turfs are the backbone of how gas moves from tile to tile. While most of `process_cell()` should be easy enough to understand, I am going to go into some detail about archiving, since I think it's a common source of hiccups. + +* *`archived_cycle`* this var stores the last cycle of the atmos loop that the turf processed on. The key point to notice here is that when processing a turf, we don't share with all its neighbors, we only talk to those who haven't processed yet. This is because the remainder of `process_cell()` and especially `share()` are like addition. We can add in any order we like, and we only need to add once. This is what archived gases are for by the way, they store the state of the relevant tile before any processing occurs. + +Alright then, with that out of the way, what is an active turf. + +This is actually the main success of LINDA, the math for gas movement is r4407 goon code or older, but that implementation (FEA) had a glaring issue. All turfs processed, or rather, all `/simulated` turfs processed. There was a separate type for `/unsimulated` turfs, but that was mostly used for things like centcom or space. Aside from that all the turfs that could in theory have gas on them needed to process each tick. `process_cell()` didn't quite look how it does now mind, but this was still a horrible state of affairs. + +The major difference between then and now is our turfs will stop processing. They sit idle most of the round, wake up when something changes around them, process until no major changes are happening, and then go to sleep. + +Active turfs also poke all the listening objects sitting on them, and start to process them so they can react to heat or gas changes. We do this so objects don't need to process when nothing has changed, but they also can operate through a turf sleeping. In essence this is like waking up things that ought to be listening to us. + +If we just used active turfs sleeping would be easy as pie, we could do it turf by turf. But we don't. + +### Excited Groups + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/Unsettled.png) +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/Settled.png) + +*Figure 5.2.1-5.2.2: Settled VS Unsettled gases, this is what excited groups do* + +I didn't mention this above, but active turf processing, or really `share()`, has a fatal flaw. The amount of gas moved per tick goes down exponentially the further away a turf is from the source of changes, or diffs. + +With only active turfs breaches would never settle, and as soon as a tile becomes active it would never rest again. (This is one of the reasons I wrote this document by the way, excited groups nearly totally broke around about 2016, and none at the time noticed because the code was so twisted none knew how it ought to work, so it persisted for 4 years past that) + +So active turfs are bad at evening out diffs. What can we do to solve this? + +Enter the excited group. We hold a list of all the turfs that have talked to each other, then we keep track of how active those turfs are. When they start to wind down, we spread all the gas out evenly between them, and the group starts to spread again. They tend to fill the space given to them, so be careful with open plan stations. + +This is `self_breakdown()`, our equalization step. It cuts down on churn, and keeps things flowing smoothly. + +I've been talking kinda abstractly about turfs sleeping. That's because turfs on their own don't stop waiting to process once they have an excited group. Groups have secondary roles as the grim reaper of active turfs. When a group is totally inactive, and nothing whatsoever is going on, it will `dismantle()`, putting all of the turfs inside it to sleep, and killing itself. + +### A brief romp to talk about excited groups and LAST_SHARE_CHECK + +Excited groups can tell the amount of diff being shared by hooking into a value `share()` sets on gasmixes, the absolute amount of gas shared by each tile. The issue is this isn't pressure, it's molar count. So heat being shared in a sealed room causes excited groups to break down, then reform from sources. This isn't a major issue due to how breakdown evens things out, but it's worth knowing. + +### Back to the main thread + +Now this would all be fine, but as I'm sure you've noticed, there's a crouching pile of lag hiding here. What happens if the excited group has turfs with a fire on them over in cargo, but the flow of gas started in medical? There's no point processing the majority of the tiles, but we still want to keep the group alive for equalization. + +### Turfs can have a little nap + +Originally LINDA only had the above 2 constructions, but we ran into a problem when making planetary turfs. The old implementation was mutable, but shared with a copy of its initial mix each tick. This lead to problems. In essence, the groups never stopped spreading so long as a source of diffs existed. This is because the job of excited groups is to move the diffs from the source, to the edges of the group. But we put these mixes on huge open planets. Doesn't really work out so well. + +To combat this, a timer was added to each turf. It reset when a significant share was made, but otherwise if enough time passed the turf was forcibly removed from the active_turfs list. Unfortunately for us, this had unintended side effects. + +When a turf is removed from active, the excited group is broken down, as it's assumed that the proc will only be called when the landscape of the map itself has changed. You begin to see the issue. With large enough space, excited groups broke, totally. Constant rebuilds into dismantles, cycling forever. + +Now this issue here is we'd like to keep this napping, but we don't want to `garbage_collect()` the excited group constantly. + +So, a new proc was added, `sleep_active_turf()`. It removes the active turf from processing, but doesn't `garbage_collect()` the group. + +You'd think this would cause issues with maintaining the shape of an excited group, however this isn't actually a priority, since `garbage_collect()` and the subsequent rebuild in `process_cell()` causes turfs that are actually active to reform, just as it always has. This has benefits, as it lessens the tendency of one group to cover a huge space, equalize all at once, and fuck with things. + +There's another issue here however, how do we deal with things that react to heat? A firelock shouldn't just open because the turf that the alarm is on went to sleep. Thus, atom_process, as I mentioned before, a list of atoms with requirements and things to do. It processes them until their requirements are not met, then it removes them from its list them. + +There's one more major aspect of environmental atmos to cover, and while it's not the most misunderstood, it is the code with the worst set dressing. + +### Superconduction, or why var names really matter + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/Superconduction.png) + +*Figure 5.3: The death of a pug, and a visual description of what superconduction does* + +Superconduction, an odd name really, it doesn't really describe much of anything aside from something to do with heat. It gets worse, trust me. + +Superconduction is the system that makes heat move through solid objects, so in theory walls, windows, airlocks, so on. This is another one that just broke one day, and none noticed cause none knew what it was meant to do. + +There's another issue with it, the var names don't mean what you think, and it is very old code, so it's hard to grasp. You can do it, you've made it this far. + +So then, what does superconduction do, and what do all these damn vars mean. + +### What does superconduction do? + +As I mentioned above, superconduction shares heat where heat can't normally travel. It does this by heating up the turf the heat is in, not the gasmix, the turf itself. This temperature is then shared with adjacent turfs, based on `thermal_conductivity`, a value between 0 and 1 that slows the heat share. Turfs also have a `heat_capacity`, which is how hard it is to heat, along with providing a threshold for the lowest temperature that can melt the turf. + +There's one more, and it's a doozy. `atmos_superconductivity` is a set of directions that we cannot share with. I know. It's set in can_atmos_pass(), a rather heady set of procs that build `atmos_adjacent_turfs`, and also modify `atmos_superconductivity`. + +So then, a review. + +* *`thermal_conductivity`* Ranges from 0 to 1, effects how easy it is for a turf to receive heat +* *`heat_capacity`* Large numbers mean it's harder to heat, but holds more heat. You get it. Also used for turf melting +* *`atmos_supeconductivity`* Bitfield of directions we **can't** share in, this is often set by firelocks and such + +One more thing, turfs will superconduct until they either run out of energy, or temperature. This is a stable system because turfs "conduct" with space, which is why floods of heat will equalize to about 690k over time. + +## 6. Processing time, Dynamic scaling, and what slows us down the most + +This will require/impart a light understanding of the master controller, I will go over what makes the atmos subsystem slow, what can be done, and what it effects. + +First, some new vocab. + +* *`wait`* Subsystem var, it is the amount of time to "wait" between each fire, or process. Measured in deciseconds. +* *`MC_TICK_CHECK`* A define that checks to see if the subsystem has taken more then it's allotted time. In the case of SSAir we use it to allow for dynamic scaling + +The MC entry for SSAir is very helpful for debugging, and it is good to understand before I talk about cost. + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/SSAirAtRest.png) + +*Figure 6.1: SSAir sitting doing little to nothing turf wise, only processing pipenets and atmos machines* + +As you can see here, SSAir is a bit of a jumble, don't worry, it'll make sense in a second. The first line is in this order: cost, tick_usage, tick_overrun, ticks. +All of these are averages by the way. + +* *`cost`* Cost is the raw time spent running the subsystem in milliseconds +* *`tick_usage`* The percent of each byond tick the last fire() took. Tends to be twice cost, good for comparing with overrun. +* *`tick_overrun`* A percentage of how far past our allotted time we ran. This is what causes Time Dilation, it's bad. +* *`ticks`* The amount of subsystem fires it takes to run through all the subprocesses once. + +The second line is the cost each subprocess contributed per full cycle, this is a rolling average. It'll give you a good feel for what is misbehaving. (The only exception to this is pipenet rebuilds, the last entry. Because of its nature as something that can happen at any time, it doesn't have a rolling average, instead it just displays the time it used last process) + +The third line is the amount of "whatever" in each subprocess. Handy for noticing dupe bugs and crying at active turf cost. Speaking of, the last entry is the active turfs per overall cost. Not a great metric, but larger is better. + +Now then, what the hell is going on in that image. + +### Dynamic scaling + +SSAir has a wait of 5 deciseconds, or 500ms. This means it wants to fire roughly twice a second. You'll see in a moment why this hardly ever happens. + +See that image from before? Notice how the cost of SSAir at rest is about 40ms? yeahhhhh. + +The atmos subsystem was used as a testing ground for the robustness of the master-controller. It used to have a wait of 2 seconds, but that was lowered to 0.5 as it was thought that the system could handle it. It can! But this can have annoying side effects. As you know, we edge right up against 1/10th of the wait when sitting at rest, and if we start to make diffs... + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/GasTypes.png) + +*Figure 6.2: SSAir when a high amount of active turfs are operating, with a large selection of gastypes for each tile* + +As you can see, active turfs can be really slow. Oh but it gets so much worse. + +Active turf cost is mostly held up in `react()`, `share()` and `compare()`. `react()` and `share()` scale directly with the amount of gas in the air. `compare()` does better, but none of them do that great. + +For this reason, and because excited groups spread gas out so much, we want to keep the variation of gastypes in the air relatively low. + +react() is called for every active turf, and every pipenet. On each react call for reasons I don't want to go into right now, we need to iterate over every reaction and do a preliminary test. Therefor, the more datum reactions we have, the slower those two processes go. + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/LargeExcitedGroup.png) + +*Figure 6.3: The effects of a large excited group on overtime* + +It's hard to tell here because I took the picture right as it happen, but when large excited groups go through `self_breakdown()` they can overtime by a significant deal. This is because `self_breakdown()` can't be delayed, or done in two parts. We can't let an older gasmix that's already been collected have say 1000 mols of plasma added, then go into breakdown and delete it all. Thus, the overtime cost. This was with a excited group 900 tiles large though, so it isn't nearly ever this bad. It also scales with the amount of gases in the same way that `share()` does. + +On the whole excited groups are the only major source of overrun, consider this a treatise on why that 900ms cost number next to atmos isn't making the server die. It's really that excited group mass equalizing constantly. + +## 7. What we want atmos code to be + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/DiffsSettling.png) + +*Figure 7.1: Diffs settling out as they should, around their sources* + +Our goal is not to simulate real life atmospherics. It is instead to put on a show of doing so. To sleep wherever we can, and fake it as hard as possible. + +This is matters the most with environmental stuff, but it's everywhere you look. + +The goal of active turfs, excited groups, and sleeping is to isolate the processing that needs to happen, and move diffs from their source to a consumer as much as we can. We don't simulate every tile, and most of the changes to LINDA have been directed at simulating as little as we can get away with. + +Hell, space being cold is a hack we use to make gameplay interesting. There's a lot more stuff like this, because this isn't a simulator, it's a theater production. + +Performance and gameplay are much more important then realism. In all your work on the subsystem, keep this in mind, and you'll build fast and quality code. + +## 8. Pipelines and pipeline machinery + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/PipelineVisuals.png) + +*Figure 8.1: The structure of pipelines shown in color, components are a mix* + +`/datum/pipeline` handles the simulation of piping and such. It has 2 main actions, one of which you should know very well. The other is slightly more of a hurdle. + +To understand pipelines you'll first need to understand how we process things like pumps or vents, atmos components that is. +To start with, a set of pipes is treated as one gas mixture, however several different components draw from this mix. Think pumps, heaters, mixers, vents, etc. + +Since these components change the mix itself, we can't just let them all act on the mix at once, because that would cause concerns around the order in which things process, and so on. +We don't want canisters that blow up half the time, and the other half of the time don't. Better then to give each component its own gas mix that it alone can act on, that will be shared with the pipeline as a whole. Pipelines do something similar to active turfs by the way, they won't re-equalize their mix if nothing about the state of things has changed. + +We do this sharing based on the proportion of volume between all the components. So if you want a component to consume more gas, give it a higher volume. + +On that note, I'd like to be clear about something. In lines of connected pipes, each pipe doesn't have its own gasmix, they instead share mixes, as the pipes themselves won't have any effect on the state of the mix. + +Oh, and pipelines react the gas mixture inside them, thought I should mention that. + +### A short note on rebuilding + +Everything that needs a pipeline should have it before it's allowed to do any processing. This is to prevent runtimes and shitcode related things. + +The act of rebuilding a pipeline is quite expensive however, since it involves iterating over all the connected pipes/components. +That's why we go to such great pains to make sure no large amount of work is allowed to happen at once. It's in an attempt to avoid the excited group settling type of lag I discussed above. It's ok for atmos to lock up for a short period if the system isn't killing the game as a whole. + + +All the other behavior of pipes and pipe components are handled by atmos machinery. I'll give a brief rundown of how they're classified, but the details of each machine are left as an exercise to the reader. + + +#### Pipes + +The raw pipes. They have some amount of nuance, mostly around layers, but it's not too tricky to deal with. + +##### Heat Exchange + +The HE pipes, used to transfer heat from the pipe to the turf it's sitting on. These work directly with the pipeline's mix, which is ehhhh? Might need some touching up, perhaps making them subnets that do one heat transfer. Not too big a deal in any case, since they're the only thing that acts directly on a pipeline mix. They have some other behavior, like glowing when hot, but it's minor. + +#### Components + +These are the components I described above, they have some sort of internal gas mix that they act on in some manner. + +The following classifications are very simple, but I'll run them over anyhow + +##### Unary + +Unary devices can only interact with one pipeline, aside from some exceptions, like the heat exchanger. The type path comes from the amount of pipelines a device expects gas-mixtures from. I'm sure you can see where this is going. + +##### Binary + +Binary devices connect to 2 pipelines. + +##### Trinary + +Trinary devices connect to 3 p- Listen you get it already. + +##### Fusion + +Finally something more interesting. Unfortunately I'm not familiar with the inner workings of this machine, but this folder deals with hypertorus code. + +#### Other + +This is for the oddballs, the one offs, the half useless things. Things that are tied to the module, but that we don't have a better spot for. Think meters, stuff like that. + +#### Portable + +These are the atmos machines you can move around. They interface with connectors to talk to pipelines, and can contain tanks. Not a whole lot more to discuss here. + +## 9. A word on processing + +You may have noticed that a large portion of the optimizations we do are focused around not checking to see if we need to do work. + +This is essentially what active turfs are built around, and it's a somewhat unfinished project. There's still quite a few things in atmos, mostly machinery, that check each fire to see if they should be doing work. There's a general pattern to solving this sort of thing by the way, centralize the ways a bit of outside code can interact with a "thing", and then when the outside code does something that might warrant processing, start processing. + +This attitude needs to be applied to a few large targets, and you may see it crop up when reading through the code. Keep this in mind, and make sure to respect the rules that describe how to work with the object, or things will go to shit. + +## Appendix A - Glossary + +* *LINDA* - Our environmental gas system, created by Aranclanos, Beautiful in Spanish +* *Naps* - A healthy pastime +* *Gas mixtures* - The datums that store gas information, key to listmos and our underlying method of handling well gas +* *Diffs* - The differences between gasmixes. We want to get rid of these over time, and clump them up with their sources so we don't need to process too many turfs +* *FEA* - Finite Element Analysis, the underlying system our atmos is built on top of. Ugly in Spanish +* *Pipelines* - The datum that represents and handles the gasmixtures of a set of pipes and their components +* *Components* - Atmos machines that act on pipelines, modifying their mix +* *Active Turfs* - An optimization of FEA implemented in LINDA that causes processing to only occur when differences are equalizing +* *Excited Groups* - Evens out groups of active turfs to compensate for the way `share()` works +* *Carbon dioxide* - What the fuck is this?] +* *MC* - The master controller, makes sure all subsystems get the time they need to process, prevents lockups from one subsystem having a lot of work + +## Appendix B - How to test environmental atmos +If you really want to get a feeling for how flow works you'll need to load up the game and make some diffs. What follows is a short description of how to set up testing. + +To start with, you should enable the `TESTING` define in compile_options.dm, this toggles `VISUALIZE_ACTIVE_TURFS` and `TRACK_MAX_SHARE`. These two debug methods are very helpful for understanding flow, but they aren't cheap, so we make them a compile time option. Active turfs will show up as green, don't worry about the second define, it's coming right up. + +Past that you'll want to turn on excited group highlighting, to do this open the atmos control panel in the debug tab and toggle both personal view and display all. Display all makes turfs display their group and personal view shows/hides the groups from you, it's faster to toggle this, and this way you don't piss off the other debuggers on live. + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/AtmosControlPanel.png) + +*Figure B.1: The atmospherics control panel* + +To go into more detail about the control panel, it is split into two parts. At the top there's a readout of some relevant stats, the amount of active turfs, how many times the subsystem has fired, etc. You can get the same information from the SSAir MC entry, but it's a bit harder to read. I detail this in the section on performance in environmental atmos. There's a button that turns the subsystem on/off in the top left, it's handy for debugging and seeing how things work step by step. Use it if you need to slow things down. + +The rest of the panel is where things get more interesting, it's a readout of excited groups, sorted by area name. Most of it ought to be obvious, this is where `TRACK_MAX_SHARE` comes into effect. If it's defined, excited groups will have an extra entry which displays the largest molar diff in the group. This is useful for diagnosing group breakdown issues, and getting a feel for when a group will next breakdown. You can also toggle the visibility of each individual group here, and teleport to the group by clicking on the area name. + +### What to look for + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/StartingOut.png) + +An excited group can contain 2 things, sources of diffs, and dead tiles. + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/MovingForward.png) + +Of course, if left unchecked active turfs will spread further and further out, slowly lowering the amount of dead tiles. + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/SleepWorking.png) + +Excited group breakdown causes them to recede and wrap around the things causing them + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/CleanupTroubles.png) + +Cleanup causes a major recession due to turfs becoming suddenly no longer having an excited group + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/StrangeGrowth.png) +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/OddGrowth%2BMonkey.png) + +Due to how process_cell() works, active turfs will spread strangely when low on diffs + +![](https://raw.githubusercontent.com/LemonInTheDark/documentation-assets/atmos-pics/atmos/Flickering.png) + +They will also occasionally nap, then immediately wake back up. This is either because of a discrepancy between `compare()` and `LAST_SHARE_CHECK`, or just the result of sleeping being a thing. diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm deleted file mode 100644 index a5e7c8ec7a73a..0000000000000 --- a/code/modules/atmospherics/auxgm/gas_types.dm +++ /dev/null @@ -1,128 +0,0 @@ -/datum/gas/oxygen - id = GAS_O2 - specific_heat = 20 - name = "Oxygen" - oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust - -/datum/gas/nitrogen - id = GAS_N2 - specific_heat = 20 - breath_alert_info = list( - not_enough_alert = list( - alert_category = "not_enough_nitro", - alert_type = /atom/movable/screen/alert/not_enough_nitro - ), - too_much_alert = list( - alert_category = "too_much_nitro", - alert_type = /atom/movable/screen/alert/too_much_nitro - ) - ) - name = "Nitrogen" - -/datum/gas/carbon_dioxide //what the fuck is this? - id = GAS_CO2 - specific_heat = 30 - name = "Carbon Dioxide" - breath_results = GAS_O2 - breath_alert_info = list( - not_enough_alert = list( - alert_category = "not_enough_co2", - alert_type = /atom/movable/screen/alert/not_enough_co2 - ), - too_much_alert = list( - alert_category = "too_much_co2", - alert_type = /atom/movable/screen/alert/too_much_co2 - ) - ) - fusion_power = 3 - enthalpy = -393500 - -/datum/gas/plasma - id = GAS_PLASMA - specific_heat = 200 - name = "Plasma" - gas_overlay = "plasma" - moles_visible = MOLES_GAS_VISIBLE - flags = GAS_FLAG_DANGEROUS - // no fire info cause it has its own bespoke reaction for trit generation reasons - enthalpy = FIRE_PLASMA_ENERGY_RELEASED // 3000000, 3 megajoules, 3000 kj - -/datum/gas/water_vapor - id = GAS_H2O - specific_heat = 40 - name = "Water Vapor" - gas_overlay = "water_vapor" - moles_visible = MOLES_GAS_VISIBLE - fusion_power = 8 - breath_reagent = /datum/reagent/water - enthalpy = -241800 // FIRE_HYDROGEN_ENERGY_RELEASED is actually what this was supposed to be - -/datum/gas/hypernoblium - id = GAS_HYPERNOB - specific_heat = 2000 - name = "Hyper-noblium" - gas_overlay = "freon" - moles_visible = MOLES_GAS_VISIBLE - -/datum/gas/nitrous_oxide - id = GAS_NITROUS - specific_heat = 40 - name = "Nitrous Oxide" - gas_overlay = "nitrous_oxide" - moles_visible = MOLES_GAS_VISIBLE * 2 - flags = GAS_FLAG_DANGEROUS - fire_products = list(GAS_N2 = 1) - oxidation_rate = 0.5 - oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100 - enthalpy = 81600 - -/datum/gas/nitryl - id = GAS_NITRYL - specific_heat = 20 - name = "Nitryl" - gas_overlay = "nitryl" - moles_visible = MOLES_GAS_VISIBLE - flags = GAS_FLAG_DANGEROUS - fusion_power = 15 - fire_products = list(GAS_N2 = 0.5) - oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 - enthalpy = 33200 - -/datum/gas/tritium - id = GAS_TRITIUM - specific_heat = 10 - name = "Tritium" - gas_overlay = "tritium" - moles_visible = MOLES_GAS_VISIBLE - flags = GAS_FLAG_DANGEROUS - fusion_power = 1 - /* - these are for when we add hydrogen, trit gets to keep its hardcoded fire for legacy reasons - fire_provides = list(GAS_H2O = 2) - fire_burn_rate = 2 - enthalpy = FIRE_HYDROGEN_ENERGY_RELEASED - fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 - */ - -/datum/gas/bz - id = GAS_BZ - specific_heat = 20 - name = "BZ" - flags = GAS_FLAG_DANGEROUS - fusion_power = 8 - enthalpy = FIRE_CARBON_ENERGY_RELEASED // it is a mystery - -/datum/gas/stimulum - id = GAS_STIMULUM - specific_heat = 5 - name = "Stimulum" - fusion_power = 7 - -/datum/gas/pluoxium - id = GAS_PLUOXIUM - specific_heat = 80 - name = "Pluoxium" - fusion_power = 10 - oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 1000 // it is VERY stable - oxidation_rate = 8 - enthalpy = -50000 // but it reduces the heat output a bit diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 8dd811cc64e8f..8b56f23c5ceef 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -1,4 +1,10 @@ - +/// Returns reactions which will contribute to a hotspot's size. +/proc/init_hotspot_reactions() + var/list/fire_reactions = list() + for (var/datum/gas_reaction/reaction as anything in subtypesof(/datum/gas_reaction)) + if(initial(reaction.expands_hotspot)) + fire_reactions += reaction + return fire_reactions /atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) return null @@ -8,26 +14,47 @@ /turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0) return +/** + * Handles the creation of hotspots and initial activation of turfs. + * Setting the conditions for the reaction to actually happen for gasmixtures + * is handled by the hotspot itself, specifically perform_exposure(). + */ /turf/open/hotspot_expose(exposed_temperature, exposed_volume, soh) - if(!air) + //If the air doesn't exist we just return false + var/list/air_gases = air?.gases + if(!air_gases) return - if (air.get_oxidation_power(exposed_temperature) < 0.5) + . = air_gases[/datum/gas/oxygen] + var/oxy = . ? .[MOLES] : 0 + if (oxy < 0.5) return - var/has_fuel = air.get_moles(GAS_PLASMA) > 0.5 || air.get_moles(GAS_TRITIUM) > 0.5 || air.get_fuel_amount(exposed_temperature) > 0.5 + . = air_gases[/datum/gas/plasma] + var/plas = . ? .[MOLES] : 0 + . = air_gases[/datum/gas/tritium] + var/trit = . ? .[MOLES] : 0 if(active_hotspot) if(soh) - if(has_fuel) + if(plas > 0.5 || trit > 0.5) if(active_hotspot.temperature < exposed_temperature) active_hotspot.temperature = exposed_temperature if(active_hotspot.volume < exposed_volume) active_hotspot.volume = exposed_volume return - if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && has_fuel) + if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (plas > 0.5 || trit > 0.5)) + active_hotspot = new /obj/effect/hotspot(src, exposed_volume*25, exposed_temperature) -//This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile + active_hotspot.just_spawned = (current_cycle < SSair.times_fired) + //remove just_spawned protection if no longer processing this cell + SSair.add_to_active(src) + + +/** + * Hotspot objects interfaces with the temperature of turf gasmixtures while also providing visual effects. + * One important thing to note about hotspots are that they can roughly be divided into two categories based on the bypassing variable. + */ /obj/effect/hotspot anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -37,15 +64,22 @@ blend_mode = BLEND_ADD light_system = MOVABLE_LIGHT light_range = LIGHT_RANGE_FIRE - // increase power for more bloom - light_power = 4 + light_power = 1 light_color = LIGHT_COLOR_FIRE + /** + * Volume is the representation of how big and healthy a fire is. + * Hotspot volume will be divided by turf volume to get the ratio for temperature setting on non bypassing mode. + * Also some visual stuffs for fainter fires. + */ var/volume = 125 + /// Temperature handles the initial ignition and the colouring. var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + /// Whether the hotspot is new or not. Used for bypass logic. + var/just_spawned = TRUE + /// Whether the hotspot becomes passive and follows the gasmix temp instead of changing it. var/bypassing = FALSE var/visual_update_tick = 0 - var/first_cycle = TRUE CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) @@ -59,41 +93,60 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) temperature = starting_temperature perform_exposure() setDir(pick(GLOB.cardinals)) - air_update_turf() - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = PROC_REF(on_entered), - ) + air_update_turf(FALSE, FALSE) + var/static/list/loc_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered)) AddElement(/datum/element/connect_loc, loc_connections) +/** + * Perform interactions between the hotspot and the gasmixture. + * + * For the first tick, hotspots will take a sample of the air in the turf, + * set the temperature equal to a certain amount, and then reacts it. + * In some implementations the ratio comes out to around 1, so all of the air in the turf. + * + * Afterwards if the reaction is big enough it mostly just tags along the fire, + * copying the temperature and handling the colouring. + * If the reaction is too small it will perform like the first tick. + * + * Also calls fire_act() which handles burning. + */ /obj/effect/hotspot/proc/perform_exposure() var/turf/open/location = loc + var/datum/gas_mixture/reference if(!istype(location) || !(location.air)) return location.active_hotspot = src - bypassing = !first_cycle && volume > CELL_VOLUME*0.95 || location.air.return_temperature() > FUSION_TEMPERATURE_THRESHOLD - if(first_cycle) - first_cycle = FALSE + bypassing = !just_spawned && (volume > CELL_VOLUME*0.95) + //Passive mode if(bypassing) - volume = location.air.reaction_results["fire"]*FIRE_GROWTH_RATE - temperature = location.air.return_temperature() + reference = location.air // Our color and volume will depend on the turf's gasmix + //Active mode else - var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.return_volume()) + var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.volume) if(affected) //in case volume is 0 - affected.set_temperature(temperature) + reference = affected // Our color and volume will depend on this small sparked gasmix + affected.temperature = temperature affected.react(src) - temperature = affected.return_temperature() - volume = affected.reaction_results["fire"]*FIRE_GROWTH_RATE location.assume_air(affected) + if(reference) + volume = 0 + var/list/cached_results = reference.reaction_results + for (var/reaction in SSair.hotspot_reactions) + volume += cached_results[reaction] * FIRE_GROWTH_RATE + temperature = reference.temperature + + // Handles the burning of atoms. for(var/A in location) var/atom/AT = A - if(!QDELETED(AT) && AT != src) // It's possible that the item is deleted in temperature_expose + if(!QDELETED(AT) && AT != src) AT.fire_act(temperature, volume) return +/// Mathematics to be used for color calculation. /obj/effect/hotspot/proc/gauss_lerp(x, x1, x2) var/b = (x1 + x2) * 0.5 var/c = (x2 - x1) / 6 @@ -115,22 +168,18 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) heat_b = LERP(heat_b,255,normal_amt) heat_a -= gauss_lerp(temperature, -5000, 5000) * 128 greyscale_fire -= normal_amt - light_power = 4 if(temperature > 40000) //Past this temperature the fire will gradually turn a bright purple var/purple_amt = temperature < LERP(40000,200000,0.5) ? gauss_lerp(temperature, 40000, 200000) : 1 heat_r = LERP(heat_r,255,purple_amt) - light_power = 5 if(temperature > 200000 && temperature < 500000) //Somewhere at this temperature nitryl happens. var/sparkle_amt = gauss_lerp(temperature, 200000, 500000) var/mutable_appearance/sparkle_overlay = mutable_appearance('icons/effects/effects.dmi', "shieldsparkles") sparkle_overlay.blend_mode = BLEND_ADD sparkle_overlay.alpha = sparkle_amt * 255 - light_power = 6 add_overlay(sparkle_overlay) if(temperature > 400000 && temperature < 1500000) //Lightning because very anime. var/mutable_appearance/lightning_overlay = mutable_appearance(icon, "overcharged") lightning_overlay.blend_mode = BLEND_ADD - light_power = 6 add_overlay(lightning_overlay) if(temperature > 4500000) //This is where noblium happens. Some fusion-y effects. var/fusion_amt = temperature < LERP(4500000,12000000,0.5) ? gauss_lerp(temperature, 4500000, 12000000) : 1 @@ -146,7 +195,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) heat_b = LERP(heat_b,150,fusion_amt) add_overlay(fusion_overlay) add_overlay(rainbow_overlay) - light_power = 8 set_light_color(rgb(LERP(250, heat_r, greyscale_fire), LERP(160, heat_g, greyscale_fire), LERP(25, heat_b, greyscale_fire))) @@ -157,19 +205,34 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) color = list(LERP(0.3, 1, 1-greyscale_fire) * heat_r,0.3 * heat_g * greyscale_fire,0.3 * heat_b * greyscale_fire, 0.59 * heat_r * greyscale_fire,LERP(0.59, 1, 1-greyscale_fire) * heat_g,0.59 * heat_b * greyscale_fire, 0.11 * heat_r * greyscale_fire,0.11 * heat_g * greyscale_fire,LERP(0.11, 1, 1-greyscale_fire) * heat_b, 0,0,0) alpha = heat_a -#define INSUFFICIENT(path) (location.air.get_moles(path) < 0.5) +#define INSUFFICIENT(path) (!location.air.gases[path] || location.air.gases[path][MOLES] < 0.5) + +/** + * Regular process proc for hotspots governed by the controller. + * Handles the calling of perform_exposure() which handles the bulk of temperature processing. + * Burning or fire_act() are also called by perform_exposure(). + * Also handles the dying and qdeletion of the hotspot and hotspot creations on adjacent cardinal turfs. + * And some visual stuffs too! Colors and fainter icons for specific conditions. + */ /obj/effect/hotspot/process() + if(just_spawned) + just_spawned = FALSE + return + var/turf/open/location = loc if(!istype(location)) qdel(src) return - location.eg_reset_cooldowns() + if(location.excited_group) + location.excited_group.reset_cooldowns() if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1)) qdel(src) return - if(!location.air || location.air.get_oxidation_power() < 0.5 || (INSUFFICIENT(GAS_PLASMA) && INSUFFICIENT(GAS_TRITIUM) && location.air.get_fuel_amount() < 0.5)) + + //Not enough / nothing to burn + if(!location.air || (INSUFFICIENT(/datum/gas/plasma) && INSUFFICIENT(/datum/gas/tritium)) || INSUFFICIENT(/datum/gas/oxygen)) qdel(src) return @@ -179,9 +242,9 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) icon_state = "3" location.burn_tile() - //Possible spread due to radiated heat - if(location.air.return_temperature() > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD) - var/radiated_temperature = location.air.return_temperature()*FIRE_SPREAD_RADIOSITY_SCALE + //Possible spread due to radiated heat. + if(location.air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD) + var/radiated_temperature = location.air.temperature*FIRE_SPREAD_RADIOSITY_SCALE for(var/t in location.atmos_adjacent_turfs) var/turf/open/T = t if(!T.active_hotspot) @@ -196,11 +259,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) if((visual_update_tick++ % 7) == 0) update_color() - if(temperature > location.max_fire_temperature_sustained) - location.max_fire_temperature_sustained = temperature - - if(location.heat_capacity && temperature > location.heat_capacity) - location.to_be_destroyed = TRUE return TRUE /obj/effect/hotspot/Destroy() @@ -208,27 +266,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) var/turf/open/T = loc if(istype(T) && T.active_hotspot == src) T.active_hotspot = null - DestroyTurf() return ..() -/obj/effect/hotspot/proc/DestroyTurf() - if(isturf(loc)) - var/turf/T = loc - if(T.to_be_destroyed && !T.changing_turf) - var/chance_of_deletion - if (T.heat_capacity) //beware of division by zero - chance_of_deletion = T.max_fire_temperature_sustained / T.heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0 - else - chance_of_deletion = 100 - if(prob(chance_of_deletion)) - T.Melt() - else - T.to_be_destroyed = FALSE - T.max_fire_temperature_sustained = 0 - /obj/effect/hotspot/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER - if(isliving(arrived)) var/mob/living/immolated = arrived immolated.fire_act(temperature, volume) diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 0e8fbf2666760..50234a068e44f 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -1,57 +1,64 @@ -/atom/var/CanAtmosPass = ATMOS_PASS_YES -/atom/var/CanAtmosPassVertical = ATMOS_PASS_YES +/atom + ///Check if atmos can pass in this atom (ATMOS_PASS_YES, ATMOS_PASS_NO, ATMOS_PASS_DENSITY, ATMOS_PASS_PROC) + var/can_atmos_pass = ATMOS_PASS_YES -/atom/proc/CanAtmosPass(turf/T) - switch (CanAtmosPass) +/atom/proc/can_atmos_pass(turf/target_turf, vertical = FALSE) + switch (can_atmos_pass) if (ATMOS_PASS_PROC) return ATMOS_PASS_YES if (ATMOS_PASS_DENSITY) return !density else - return CanAtmosPass - -/turf/CanAtmosPass = ATMOS_PASS_NO -/turf/CanAtmosPassVertical = ATMOS_PASS_NO - -/turf/open/CanAtmosPass = ATMOS_PASS_PROC -/turf/open/CanAtmosPassVertical = ATMOS_PASS_PROC - -/turf/open/CanAtmosPass(turf/T, vertical = FALSE) - var/dir = vertical ? get_dir_multiz(src, T) : get_dir(src, T) - var/opp = REVERSE_DIR(dir) - . = TRUE - if(vertical && !(zAirOut(dir, T) && T.zAirIn(dir, src))) - . = FALSE - if(isclosedturf(src) || isclosedturf(T)) - . = FALSE - if (T == src) - return . - for(var/obj/O in contents+T.contents) - var/turf/other = (O.loc == src ? T : src) - if(!(vertical? (CANVERTICALATMOSPASS(O, other)) : (CANATMOSPASS(O, other)))) - . = FALSE - if(O.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments - conductivity_blocked_directions |= dir - T.conductivity_blocked_directions |= opp - if(!.) - return . - -/atom/movable/proc/BlockThermalConductivity() // Objects that don't let heat through. - return FALSE - -/turf/proc/ImmediateCalculateAdjacentTurfs() - if(SSair.thread_running()) - CALCULATE_ADJACENT_TURFS(src) - return + return can_atmos_pass + +/turf + can_atmos_pass = ATMOS_PASS_NO + +/turf/open + can_atmos_pass = ATMOS_PASS_PROC + +///Do NOT use this to see if 2 turfs are connected, it mutates state, and we cache that info anyhow. +///Use TURFS_CAN_SHARE or TURF_SHARES depending on your usecase +/turf/open/can_atmos_pass(turf/target_turf, vertical = FALSE) + var/can_pass = TRUE + var/direction = vertical ? get_dir_multiz(src, target_turf) : get_dir(src, target_turf) + if(vertical && !(zAirOut(direction, target_turf) && target_turf.zAirIn(direction, src))) + can_pass = FALSE + if(blocks_air || target_turf.blocks_air) + can_pass = FALSE + //This path is a bit weird, if we're just checking with ourselves no sense asking objects on the turf + if (target_turf == src) + return can_pass + + //Can't just return if canpass is false here, we need to set superconductivity + for(var/obj/checked_object in contents + target_turf.contents) + var/turf/other = (checked_object.loc == src ? target_turf : src) + if(CANATMOSPASS(checked_object, other, vertical)) + continue + can_pass = FALSE + //the direction and open/closed are already checked on can_atmos_pass() so there are no arguments + return can_pass + +/// This proc is a more deeply optimized version of immediate_calculate_adjacent_turfs +/// It contains dumbshit, and also stuff I just can't do at runtime +/// If you're not editing behavior, just read that proc. It's less bad +/turf/proc/init_immediate_calculate_adjacent_turfs() + //Basic optimization, if we can't share why bother asking other people ya feel? + // You know it's gonna be stupid when they include a unit test in the atmos code + // Yes, inlining the string concat does save 0.1 seconds + #ifdef UNIT_TESTS + ASSERT(UP == 16) + ASSERT(DOWN == 32) + #endif LAZYINITLIST(src.atmos_adjacent_turfs) - var/is_closed = isclosedturf(src) var/list/atmos_adjacent_turfs = src.atmos_adjacent_turfs - var/canpass = CANATMOSPASS(src, src) - var/canvpass = CANVERTICALATMOSPASS(src, src) + var/canpass = CANATMOSPASS(src, src, FALSE) // I am essentially inlineing two get_dir_multizs here, because they're way too slow on their own. I'm sorry brother var/list/z_traits = SSmapping.multiz_levels[z] for(var/direction in GLOB.cardinals_multiz) // Yes this is a reimplementation of get_step_mutliz. It's faster tho. fuck you + // Oh also yes UP and DOWN do just point to +1 and -1 and not z offsets + // Multiz is shitcode welcome home var/turf/current_turf = (direction & (UP|DOWN)) ? \ (direction & UP) ? \ (z_traits[Z_LEVEL_UP]) ? \ @@ -61,9 +68,18 @@ (get_step(locate(x, y, z - 1), NONE)) : \ (null) : \ (get_step(src, direction)) - if(!isopenturf(current_turf)) + if(!isopenturf(current_turf)) // not interested in you brother continue - if(!is_closed && ((direction & (UP|DOWN)) ? (canvpass && CANVERTICALATMOSPASS(current_turf, src)) : (canpass && CANATMOSPASS(current_turf, src)))) + // The assumption is that ONLY DURING INIT if two tiles have the same cycle, there's no way canpass(a->b) will be different then canpass(b->a), so this is faster + // Saves like 1.2 seconds + // Note: current cycle here goes DOWN as we sleep. this is to ensure we can use the >= logic in the first step of process_cell + // It's not a massive thing, and I'm sorry for the cursed code, but it be this way + if(current_turf.current_cycle <= current_cycle) + continue + + //Can you and me form a deeper relationship, or is this just a passing wind + // (direction & (UP | DOWN)) is just "is this vertical" by the by + if(canpass && CANATMOSPASS(current_turf, src, (direction & (UP|DOWN))) && !(blocks_air || current_turf.blocks_air)) LAZYINITLIST(current_turf.atmos_adjacent_turfs) atmos_adjacent_turfs[current_turf] = TRUE current_turf.atmos_adjacent_turfs[src] = TRUE @@ -72,48 +88,42 @@ if (current_turf.atmos_adjacent_turfs) current_turf.atmos_adjacent_turfs -= src UNSETEMPTY(current_turf.atmos_adjacent_turfs) - current_turf.set_sleeping(isclosedturf(current_turf)) - current_turf.__update_auxtools_turf_adjacency_info() + SEND_SIGNAL(current_turf, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) + UNSETEMPTY(atmos_adjacent_turfs) src.atmos_adjacent_turfs = atmos_adjacent_turfs - set_sleeping(is_closed) - __update_auxtools_turf_adjacency_info() + SEND_SIGNAL(src, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) -/turf/proc/ImmediateDisableAdjacency(disable_adjacent = TRUE) - if(SSair.thread_running()) - SSadjacent_air.disable_queue[src] = disable_adjacent - return - if(disable_adjacent) - // I am essentially inlineing two get_dir_multizs here, because they're way too slow on their own. I'm sorry brother - var/list/z_traits = SSmapping.multiz_levels[z] - for(var/direction in GLOB.cardinals_multiz) - // Yes this is a reimplementation of get_step_mutliz. It's faster tho. - var/turf/current_turf = (direction & (UP|DOWN)) ? \ - (direction & UP) ? \ - (z_traits[Z_LEVEL_UP]) ? \ - (get_step(locate(x, y, z + 1), NONE)) : \ - (null) : \ - (z_traits[Z_LEVEL_DOWN]) ? \ - (get_step(locate(x, y, z - 1), NONE)) : \ - (null) : \ - (get_step(src, direction)) - if(!istype(current_turf)) - continue +/turf/proc/immediate_calculate_adjacent_turfs() + LAZYINITLIST(src.atmos_adjacent_turfs) + var/list/atmos_adjacent_turfs = src.atmos_adjacent_turfs + var/canpass = CANATMOSPASS(src, src, FALSE) + for(var/direction in GLOB.cardinals_multiz) + var/turf/current_turf = get_step_multiz(src, direction) + if(!isopenturf(current_turf)) // not interested in you brother + continue + + //Can you and me form a deeper relationship, or is this just a passing wind + // (direction & (UP | DOWN)) is just "is this vertical" by the by + if(canpass && CANATMOSPASS(current_turf, src, (direction & (UP|DOWN))) && !(blocks_air || current_turf.blocks_air)) + LAZYINITLIST(current_turf.atmos_adjacent_turfs) + atmos_adjacent_turfs[current_turf] = TRUE + current_turf.atmos_adjacent_turfs[src] = TRUE + else + atmos_adjacent_turfs -= current_turf if (current_turf.atmos_adjacent_turfs) current_turf.atmos_adjacent_turfs -= src UNSETEMPTY(current_turf.atmos_adjacent_turfs) - current_turf.__update_auxtools_turf_adjacency_info() - LAZYCLEARLIST(atmos_adjacent_turfs) - __update_auxtools_turf_adjacency_info() - -/turf/proc/set_sleeping(should_sleep) + SEND_SIGNAL(current_turf, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) -/turf/proc/__update_auxtools_turf_adjacency_info() + UNSETEMPTY(atmos_adjacent_turfs) + src.atmos_adjacent_turfs = atmos_adjacent_turfs + SEND_SIGNAL(src, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) //returns a list of adjacent turfs that can share air with this one. //alldir includes adjacent diagonal tiles that can share // air with both of the related adjacent cardinal tiles -/turf/proc/GetAtmosAdjacentTurfs(alldir = 0) +/turf/proc/get_atmos_adjacent_turfs(alldir = 0) var/adjacent_turfs if (atmos_adjacent_turfs) adjacent_turfs = atmos_adjacent_turfs.Copy() @@ -123,61 +133,73 @@ if (!alldir) return adjacent_turfs - var/turf/curloc = src + var/turf/current_location = src for (var/direction in GLOB.diagonals_multiz) - var/matchingDirections = 0 - var/turf/S = get_step_multiz(curloc, direction) - if(!S) + var/matching_directions = 0 + var/turf/checked_turf = get_step_multiz(current_location, direction) + if(!checked_turf) continue - for (var/checkDirection in GLOB.cardinals_multiz) - var/turf/checkTurf = get_step(S, checkDirection) - if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf]) + for (var/check_direction in GLOB.cardinals_multiz) + var/turf/secondary_turf = get_step(checked_turf, check_direction) + if(!checked_turf.atmos_adjacent_turfs || !checked_turf.atmos_adjacent_turfs[secondary_turf]) continue - if (adjacent_turfs[checkTurf]) - matchingDirections++ + if (adjacent_turfs[secondary_turf]) + matching_directions++ - if (matchingDirections >= 2) - adjacent_turfs += S + if (matching_directions >= 2) + adjacent_turfs += checked_turf break return adjacent_turfs -/** - * For the love of all that is holy, DO NOT SET `command` TO TRUE ON HOTCODE. This will cause atmos to freeze up for considerable amounts at a time. - * In fact- please just refrain from using this if you're not changing how atmos flows turf to turf - */ -/atom/proc/air_update_turf(command = 0) +/atom/proc/air_update_turf(update = FALSE, remove = FALSE) if(!SSair.initialized) // I'm sorry for polutting user code, I'll do 10 hail giacom's return - if(!isturf(loc) && command) + var/turf/local_turf = get_turf(loc) + if(!local_turf) return - var/turf/T = get_turf(loc) - T.air_update_turf(command) + local_turf.air_update_turf(update, remove) -/turf/air_update_turf(command = 0) +/** + * A helper proc for dealing with atmos changes + * + * Ok so this thing is pretty much used as a catch all for all the situations someone might wanna change something + * About a turfs atmos. It's real clunky, and someone needs to clean it up, but not today. + * Arguments: + * * update - Has the state of the structures in the world changed? If so, update our adjacent atmos turf list, if not, don't. + * * remove - Are you removing an active turf (Read wall), or adding one +*/ +/turf/air_update_turf(update = FALSE, remove = FALSE) if(!SSair.initialized) // I'm sorry for polutting user code, I'll do 10 hail giacom's return - if(command) - ImmediateCalculateAdjacentTurfs() + if(update) + immediate_calculate_adjacent_turfs() + if(remove) + SSair.remove_from_active(src) + else + SSair.add_to_active(src) -/atom/movable/proc/move_update_air(turf/T) - if(isturf(T)) - T.air_update_turf(1) - air_update_turf(1) +/atom/movable/proc/move_update_air(turf/target_turf) + if(isturf(target_turf)) + target_turf.air_update_turf(TRUE, FALSE) //You're empty now + air_update_turf(TRUE, TRUE) //You aren't /atom/proc/atmos_spawn_air(text) //because a lot of people loves to copy paste awful code lets just make an easy proc to spawn your plasma fires - var/turf/open/T = get_turf(src) - if(!istype(T)) + var/turf/open/local_turf = get_turf(src) + if(!istype(local_turf)) return - T.atmos_spawn_air(text) + local_turf.atmos_spawn_air(text) /turf/open/atmos_spawn_air(text) if(!text || !air) return - var/datum/gas_mixture/G = new - G.parse_gas_string(text) - assume_air(G) + var/datum/gas_mixture/turf_mixture = SSair.parse_gas_string(text, /datum/gas_mixture/turf) + + air.merge(turf_mixture) + archive() + SSair.add_to_active(src) + diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 5af7263477686..9365782070f83 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -1,123 +1,105 @@ /turf - //conductivity is divided by 10 when interacting with air for balance purposes + //used for temperature calculations in superconduction var/thermal_conductivity = 0.05 - var/heat_capacity = 1 + var/heat_capacity = INFINITY //This should be opt in rather then opt out + var/temperature_archived - //list of open turfs adjacent to us + ///list of turfs adjacent to us that air can flow onto var/list/atmos_adjacent_turfs - //bitfield of dirs in which we thermal conductivity is blocked - var/conductivity_blocked_directions = NONE - //used for mapping and for breathing while in walls (because that's a thing that needs to be accounted for...) - //string parsed by /datum/gas/proc/copy_from_turf + //used to determine whether we should archive + var/archived_cycle = 0 + var/current_cycle = 0 + + /** + * used for mapping and for breathing while in walls (because that's a thing that needs to be accounted for...) + * string parsed by /datum/gas/proc/copy_from_turf + * approximation of MOLES_O2STANDARD and MOLES_N2STANDARD pending byond allowing constant expressions to be embedded in constant strings + * If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that. + **/ var/initial_gas_mix = OPENTURF_DEFAULT_ATMOS //approximation of MOLES_O2STANDARD and MOLES_N2STANDARD pending byond allowing constant expressions to be embedded in constant strings // If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that. /turf/open //used for spacewind + ///Pressure difference between two turfs var/pressure_difference = 0 + ///Where the difference come from (from higher pressure to lower pressure) var/pressure_direction = 0 - var/turf/pressure_specific_target + ///Excited group we are part of + var/datum/excited_group/excited_group + ///Are we active? + var/excited = FALSE + ///Our gas mix var/datum/gas_mixture/turf/air + ///If there is an active hotspot on us store a reference to it here var/obj/effect/hotspot/active_hotspot - var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time - - var/list/atmos_overlay_types //gas IDs of current active gas overlays + /// air will slowly revert to initial_gas_mix + var/planetary_atmos = FALSE + /// once our paired turfs are finished with all other shares, do one 100% share + /// exists so things like space can ask to take 100% of a tile's gas + var/run_later = FALSE + + ///gas IDs of current active gas overlays + var/list/atmos_overlay_types + var/significant_share_ticker = 0 + #ifdef TRACK_MAX_SHARE + var/max_share = 0 + #endif /turf/open/Initialize(mapload) - if (planetary_atmos && Debugger?.enabled) - var/static/list/planet_atmos_types = list() - if(planet_atmos_types[type]) - air = planet_atmos_types[type] - else - air = new(2500,src) - air.copy_from_turf(src) - update_air_ref(1) - planet_atmos_types[type] = air - else - air = new(2500,src) - air.copy_from_turf(src) - update_air_ref(planetary_atmos ? 1 : 2) - . = ..() + if(!blocks_air) + air = create_gas_mixture() + if(planetary_atmos) + if(!SSair.planetary[initial_gas_mix]) + var/datum/gas_mixture/immutable/planetary/mix = new + mix.parse_string_immutable(initial_gas_mix) + SSair.planetary[initial_gas_mix] = mix + return ..() /turf/open/Destroy() if(active_hotspot) QDEL_NULL(active_hotspot) + // Adds the adjacent turfs to the current atmos processing + for(var/turf/open/near_turf in atmos_adjacent_turfs) + SSair.add_to_active(near_turf) return ..() -/turf/proc/update_air_ref() - /////////////////GAS MIXTURE PROCS/////////////////// -/turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air - return assume_air_ratio(giver, 1) +///Copies all gas info from the turf into a new gas_mixture, along with our temperature +///Returns the created gas_mixture +/turf/proc/create_gas_mixture() + var/datum/gas_mixture/mix = SSair.parse_gas_string(initial_gas_mix, /datum/gas_mixture/turf) -/turf/open/assume_air_moles(datum/gas_mixture/giver, moles) - if(!giver) - return FALSE - if(SSair.thread_running()) - var giver_moles = giver.total_moles() - if(giver_moles > 0) - SSair.deferred_airs += list(list(giver, air, moles / giver_moles)) - else - SSair.deferred_airs += list(list(giver, air, 0)) - else - giver.transfer_to(air, moles) - update_visuals() - return TRUE - -/turf/open/assume_air_ratio(datum/gas_mixture/giver, ratio) - if(!giver) - return FALSE - if(SSair.thread_running()) - SSair.deferred_airs += list(list(giver, air, ratio)) - else - giver.transfer_ratio_to(air, ratio) - update_visuals() - return TRUE + //acounts for changes in temperature + var/turf/parent = parent_type + if(temperature != initial(temperature) || temperature != initial(parent.temperature)) + mix.temperature = temperature -/turf/open/transfer_air(datum/gas_mixture/taker, moles) - if(!taker || !return_air()) // shouldn't transfer from space - return FALSE - if(SSair.thread_running()) - var air_moles = air.total_moles() - if(air_moles > 0) - SSair.deferred_airs += list(list(air, taker, moles / air_moles)) - else - SSair.deferred_airs += list(list(air, taker, 0)) - else - air.transfer_to(taker, moles) - update_visuals() - return TRUE + return mix -/turf/open/transfer_air_ratio(datum/gas_mixture/taker, ratio) - if(!taker || !return_air()) +/turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air + if(!giver) return FALSE - if(SSair.thread_running()) - SSair.deferred_airs += list(list(air, taker, ratio)) - else - air.transfer_ratio_to(taker, ratio) - update_visuals() + air.merge(giver) + update_visuals() + air_update_turf(FALSE, FALSE) return TRUE /turf/open/remove_air(amount) var/datum/gas_mixture/ours = return_air() var/datum/gas_mixture/removed = ours.remove(amount) update_visuals() + air_update_turf(FALSE, FALSE) return removed -/turf/open/remove_air_ratio(ratio) - var/datum/gas_mixture/ours = return_air() - var/datum/gas_mixture/removed = ours.remove_ratio(ratio) - update_visuals() - return removed - -/turf/open/proc/copy_air_with_tile(turf/open/T) - if(istype(T)) - air.copy_from(T.air) +/turf/open/proc/copy_air_with_tile(turf/open/target_turf) + if(istype(target_turf)) + air.copy_from(target_turf.air) /turf/open/proc/copy_air(datum/gas_mixture/copy) if(copy) @@ -125,9 +107,8 @@ /turf/return_air() RETURN_TYPE(/datum/gas_mixture) - var/datum/gas_mixture/GM = new - GM.copy_from_turf(src) - return GM + var/datum/gas_mixture/copied_mixture = create_gas_mixture() + return copied_mixture /turf/open/return_air() RETURN_TYPE(/datum/gas_mixture) @@ -136,24 +117,48 @@ /turf/open/return_analyzable_air() return return_air() -/turf/temperature_expose() - if(return_temperature() > heat_capacity) +/turf/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature >= heat_capacity || to_be_destroyed) + +/turf/atmos_expose(datum/gas_mixture/air, exposed_temperature) + if(exposed_temperature >= heat_capacity) to_be_destroyed = TRUE + if(to_be_destroyed && exposed_temperature >= max_fire_temperature_sustained) + max_fire_temperature_sustained = min(exposed_temperature, max_fire_temperature_sustained + heat_capacity / 4) //Ramp up to 100% yeah? + if(to_be_destroyed && !changing_turf) + burn_turf() + +/turf/proc/burn_turf() + burn_tile() + var/chance_of_deletion + if (heat_capacity) //beware of division by zero + chance_of_deletion = max_fire_temperature_sustained / heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0 + else + chance_of_deletion = 100 + if(prob(chance_of_deletion)) + Melt() + max_fire_temperature_sustained = 0 + else + to_be_destroyed = FALSE + +/turf/temperature_expose(datum/gas_mixture/air, exposed_temperature) + atmos_expose(air, exposed_temperature) + +/turf/open/temperature_expose(datum/gas_mixture/air, exposed_temperature) + SEND_SIGNAL(src, COMSIG_TURF_EXPOSE, air, exposed_temperature) + check_atmos_process(src, air, exposed_temperature) //Manually do this to avoid needing to use elements, don't want 200 second atom init times +/turf/proc/archive() + temperature_archived = temperature -/turf/open/proc/eg_reset_cooldowns() -/turf/open/proc/eg_garbage_collect() -/turf/open/proc/get_excited() -/turf/open/proc/set_excited() +/turf/open/archive() + LINDA_CYCLE_ARCHIVE(src) /////////////////////////GAS OVERLAYS////////////////////////////// /turf/open/proc/update_visuals() - var/list/atmos_overlay_types = src.atmos_overlay_types // Cache for free performance - var/list/new_overlay_types = list() - var/static/list/nonoverlaying_gases = typecache_of_gases_with_no_overlays() if(!air) // 2019-05-14: was not able to get this path to fire in testing. Consider removing/looking at callers -Naksu if (atmos_overlay_types) @@ -162,13 +167,10 @@ src.atmos_overlay_types = null return + var/list/gases = air.gases - for(var/id in air.get_gases()) - if (nonoverlaying_gases[id]) - continue - var/gas_overlay = GLOB.gas_data.overlays[id] - if(gas_overlay && air.get_moles(id) > GLOB.gas_data.visibility[id]) - new_overlay_types += gas_overlay[min(FACTOR_GAS_VISIBLE_MAX, CEILING(air.get_moles(id) / MOLES_GAS_VISIBLE_STEP, 1))] + var/list/new_overlay_types + GAS_OVERLAYS(gases, new_overlay_types) if (atmos_overlay_types) for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added @@ -183,108 +185,381 @@ UNSETEMPTY(new_overlay_types) src.atmos_overlay_types = new_overlay_types -/turf/open/proc/set_visuals(list/new_overlay_types) - if (atmos_overlay_types) - for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added - vis_contents -= overlay - - if (length(new_overlay_types)) - if (atmos_overlay_types) - vis_contents += new_overlay_types - atmos_overlay_types //don't add overlays that already exist - else - vis_contents += new_overlay_types - UNSETEMPTY(new_overlay_types) - src.atmos_overlay_types = new_overlay_types - /proc/typecache_of_gases_with_no_overlays() . = list() for (var/gastype in subtypesof(/datum/gas)) var/datum/gas/gasvar = gastype if (!initial(gasvar.gas_overlay)) - .[initial(gasvar.id)] = TRUE + .[gastype] = TRUE /////////////////////////////SIMULATION/////////////////////////////////// +#ifdef TRACK_MAX_SHARE +#define LAST_SHARE_CHECK \ + var/last_share = our_air.last_share;\ + max_share = max(last_share, max_share);\ + if(last_share > MINIMUM_AIR_TO_SUSPEND){\ + our_excited_group.reset_cooldowns();\ + cached_ticker = 0;\ + enemy_tile.significant_share_ticker = 0;\ + } else if(last_share > MINIMUM_MOLES_DELTA_TO_MOVE) {\ + our_excited_group.dismantle_cooldown = 0;\ + cached_ticker = 0;\ + enemy_tile.significant_share_ticker = 0;\ + } +#else +#define LAST_SHARE_CHECK \ + var/last_share = our_air.last_share;\ + if(last_share > MINIMUM_AIR_TO_SUSPEND){\ + our_excited_group.reset_cooldowns();\ + cached_ticker = 0;\ + enemy_tile.significant_share_ticker = 0;\ + } else if(last_share > MINIMUM_MOLES_DELTA_TO_MOVE) {\ + our_excited_group.dismantle_cooldown = 0;\ + cached_ticker = 0;\ + enemy_tile.significant_share_ticker = 0;\ + } +#endif +#ifdef TRACK_MAX_SHARE +#define PLANET_SHARE_CHECK \ + var/last_share = our_air.last_share;\ + max_share = max(last_share, max_share);\ + if(last_share > MINIMUM_AIR_TO_SUSPEND){\ + our_excited_group.reset_cooldowns();\ + cached_ticker = 0;\ + } else if(last_share > MINIMUM_MOLES_DELTA_TO_MOVE) {\ + our_excited_group.dismantle_cooldown = 0;\ + cached_ticker = 0;\ + } +#else +#define PLANET_SHARE_CHECK \ + var/last_share = our_air.last_share;\ + if(last_share > MINIMUM_AIR_TO_SUSPEND){\ + our_excited_group.reset_cooldowns();\ + cached_ticker = 0;\ + } else if(last_share > MINIMUM_MOLES_DELTA_TO_MOVE) {\ + our_excited_group.dismantle_cooldown = 0;\ + cached_ticker = 0;\ + } +#endif /turf/proc/process_cell(fire_count) + SSair.remove_from_active(src) + +/turf/open/process_cell(fire_count) + if(archived_cycle < fire_count) //archive self if not already done + LINDA_CYCLE_ARCHIVE(src) + + current_cycle = fire_count + var/cached_ticker = significant_share_ticker + cached_ticker += 1 -/turf/open/proc/equalize_pressure_in_zone(cyclenum) -/turf/open/proc/consider_firelocks(turf/T2) - var/reconsider_adj = FALSE - for(var/obj/machinery/door/firedoor/FD in T2) - if((FD.flags_1 & ON_BORDER_1) && get_dir(T2, src) != FD.dir) + //cache for sanic speed + var/list/adjacent_turfs = atmos_adjacent_turfs + var/datum/excited_group/our_excited_group = excited_group + var/our_share_coeff = 1/(LAZYLEN(adjacent_turfs) + 1) + + var/datum/gas_mixture/our_air = air + + var/list/share_end + + #ifdef TRACK_MAX_SHARE + max_share = 0 //Gotta reset our tracker + #endif + + for(var/turf/open/enemy_tile as anything in adjacent_turfs) + #ifdef UNIT_TESTS + if(!istype(enemy_tile)) + stack_trace("closed turf inside of adjacent turfs") continue - FD.emergency_pressure_stop() - reconsider_adj = TRUE - for(var/obj/machinery/door/firedoor/FD in src) - if((FD.flags_1 & ON_BORDER_1) && get_dir(src, T2) != FD.dir) + #endif + + if(!istype(enemy_tile)) continue - FD.emergency_pressure_stop() - reconsider_adj = TRUE - if(reconsider_adj) - T2.ImmediateCalculateAdjacentTurfs() // We want those firelocks closed yesterday. -/turf/proc/handle_decompression_floor_rip() -/turf/open/floor/handle_decompression_floor_rip(sum) - if(sum > 20 && prob(clamp(sum / 20, 0, 15))) - if(floor_tile) - new floor_tile(src) - make_plating() + // This var is only rarely set, exists so turfs can request to share at the end of our sharing + // We need this so we can assume share is communative, which we need to do to avoid a hellish amount of garbage_collect()s + if(enemy_tile.run_later) + LAZYADD(share_end, enemy_tile) -/turf/open/floor/plating/handle_decompression_floor_rip() - return + if(fire_count <= enemy_tile.current_cycle) + continue + LINDA_CYCLE_ARCHIVE(enemy_tile) + + /******************* GROUP HANDLING START *****************************************************************/ + + var/should_share_air = FALSE + var/datum/gas_mixture/enemy_air = enemy_tile.air + + //cache for sanic speed + var/datum/excited_group/enemy_excited_group = enemy_tile.excited_group + //If we are both in an excited group, and they aren't the same, merge. + //If we are both in an excited group, and you're active, share + //If we pass compare, and if we're not already both in a group, lets join up + //If we both pass compare, add to active and share + if(our_excited_group && enemy_excited_group) + if(our_excited_group != enemy_excited_group) + //combine groups (this also handles updating the excited_group var of all involved turfs) + our_excited_group.merge_groups(enemy_excited_group) + our_excited_group = excited_group //update our cache + if(our_excited_group && enemy_excited_group && enemy_tile.excited) //If you're both excited, no need to compare right? + should_share_air = TRUE + else if(our_air.compare(enemy_air, ARCHIVE)) //Lets see if you're up for it + SSair.add_to_active(enemy_tile) //Add yourself young man + var/datum/excited_group/existing_group = our_excited_group || enemy_excited_group || new + if(!our_excited_group) + existing_group.add_turf(src) + if(!enemy_excited_group) + existing_group.add_turf(enemy_tile) + our_excited_group = excited_group + should_share_air = TRUE + + //air sharing + if(should_share_air) + var/difference = our_air.share(enemy_air, our_share_coeff, 1 / (LAZYLEN(enemy_tile.atmos_adjacent_turfs) + 1)) + if(difference) + if(difference > 0) + consider_pressure_difference(enemy_tile, difference) + else + enemy_tile.consider_pressure_difference(src, -difference) + //This acts effectivly as a very slow timer, the max deltas of the group will slowly lower until it breaksdown, they then pop up a bit, and fall back down until irrelevant + LAST_SHARE_CHECK + + + /******************* GROUP HANDLING FINISH *********************************************************************/ + + if (planetary_atmos) //share our air with the "atmosphere" "above" the turf + var/datum/gas_mixture/planetary_mix = SSair.planetary[initial_gas_mix] + // archive ourself again so we don't accidentally share more gas than we currently have + LINDA_CYCLE_ARCHIVE(src) + if(our_air.compare(planetary_mix, ARCHIVE)) + if(!our_excited_group) + var/datum/excited_group/new_group = new + new_group.add_turf(src) + our_excited_group = excited_group + // shares 4/5 of our difference in moles with the atmosphere + our_air.share(planetary_mix, 0.8, 0.8) + // temperature share with the atmosphere with an inflated heat capacity to simulate faster sharing with a large atmosphere + our_air.temperature_share(planetary_mix, OPEN_HEAT_TRANSFER_COEFFICIENT, planetary_mix.temperature_archived, planetary_mix.heat_capacity() * 5) + planetary_mix.garbage_collect() + PLANET_SHARE_CHECK + + for(var/turf/open/enemy_tile as anything in share_end) + var/datum/gas_mixture/enemy_mix = enemy_tile.air + archive() + // We share 100% of our mix in this step. Let's jive + var/difference = our_air.share(enemy_mix, 1, 1) + LAST_SHARE_CHECK + if(!difference) + continue + if(difference > 0) + consider_pressure_difference(enemy_tile, difference) + else + enemy_tile.consider_pressure_difference(src, difference) -/turf/open/floor/engine/handle_decompression_floor_rip() - return + var/reacting = our_air.react(src) + if(our_excited_group) + our_excited_group.turf_reactions |= reacting //Adds the flag to turf_reactions so excited groups can check for them before dismantling. -/turf/open/process_cell(fire_count) + update_visuals() + if(!active_hotspot && !(reacting & (REACTING | STOP_REACTIONS))) + if(!our_excited_group) //If nothing of interest is happening, kill the active turf + SSair.remove_from_active(src) //This will kill any connected excited group, be careful (This broke atmos for 4 years) + if(cached_ticker > EXCITED_GROUP_DISMANTLE_CYCLES) //If you're stalling out, take a rest + SSair.sleep_active_turf(src) -//////////////////////////SPACEWIND///////////////////////////// + significant_share_ticker = cached_ticker //Save our changes + temperature_expose(our_air, our_air.temperature) -/turf/proc/consider_pressure_difference() - return +//////////////////////////SPACEWIND///////////////////////////// -/turf/open/consider_pressure_difference(turf/T, difference) +/turf/open/proc/consider_pressure_difference(turf/target_turf, difference) SSair.high_pressure_delta |= src if(difference > pressure_difference) - pressure_direction = get_dir(src, T) + pressure_direction = get_dir(src, target_turf) pressure_difference = difference /turf/open/proc/high_pressure_movements() - var/atom/movable/M - var/multiplier = 1 - if(locate(/obj/structure/rack) in src) - multiplier *= 0.1 - else if(locate(/obj/structure/table) in src) - multiplier *= 0.2 + var/atom/movable/moving_atom for(var/thing in src) - M = thing - if (!M.anchored && !M.pulledby && M.last_high_pressure_movement_air_cycle < SSair.times_fired) - M.experience_pressure_difference(pressure_difference * multiplier, pressure_direction, 0, pressure_specific_target) + moving_atom = thing + if (!moving_atom.anchored && !moving_atom.pulledby && moving_atom.last_high_pressure_movement_air_cycle < SSair.times_fired) + moving_atom.experience_pressure_difference(pressure_difference, pressure_direction) -/atom/movable/var/pressure_resistance = 10 -/atom/movable/var/last_high_pressure_movement_air_cycle = 0 +/atom/movable + ///How much delta pressure is needed for us to move + var/pressure_resistance = 10 + var/last_high_pressure_movement_air_cycle = 0 -/atom/movable/proc/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0, throw_target) +/atom/movable/proc/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0) set waitfor = FALSE if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_PRESSURE_PUSH) & COMSIG_MOVABLE_BLOCKS_PRESSURE) return - - var/const/PROBABILITY_OFFSET = 40 - var/const/PROBABILITY_BASE_PRECENT = 10 - var/max_force = sqrt(pressure_difference)*(MOVE_FORCE_DEFAULT / 5) + var/const/PROBABILITY_OFFSET = 25 + var/const/PROBABILITY_BASE_PRECENT = 75 + var/max_force = sqrt(pressure_difference) * (MOVE_FORCE_DEFAULT / 5) var/move_prob = 100 - if(pressure_resistance > 0) - move_prob = (pressure_difference/pressure_resistance*PROBABILITY_BASE_PRECENT)-PROBABILITY_OFFSET + if (pressure_resistance > 0) + move_prob = (pressure_difference / pressure_resistance * PROBABILITY_BASE_PRECENT) - PROBABILITY_OFFSET move_prob += pressure_resistance_prob_delta - if(move_prob > PROBABILITY_OFFSET && prob(move_prob) && (move_resist != INFINITY) && (!anchored && (max_force >= (move_resist * MOVE_FORCE_PUSH_RATIO))) || (anchored && (max_force >= (move_resist * MOVE_FORCE_FORCEPUSH_RATIO)))) - var/move_force = max_force * clamp(move_prob, 0, 100) / 100 - if(move_force > 6000) - // WALLSLAM HELL TIME OH BOY - var/turf/throw_turf = get_ranged_target_turf(get_turf(src), direction, round(move_force / 2000)) - if(throw_target && (get_dir(src, throw_target) & direction)) - throw_turf = get_turf(throw_target) - var/throw_speed = clamp(round(move_force / 3000), 1, 10) - throw_at(throw_turf, move_force / 3000, throw_speed) - else - step(src, direction) + if (move_prob > PROBABILITY_OFFSET && prob(move_prob) && (move_resist != INFINITY) && (!anchored && (max_force >= (move_resist * MOVE_FORCE_PUSH_RATIO))) || (anchored && (max_force >= (move_resist * MOVE_FORCE_FORCEPUSH_RATIO)))) + step(src, direction) last_high_pressure_movement_air_cycle = SSair.times_fired + +///////////////////////////EXCITED GROUPS///////////////////////////// + +/datum/excited_group + ///Stores a reference to the turfs we are controlling + var/list/turf_list = list() + ///If this is over EXCITED_GROUP_BREAKDOWN_CYCLES we call self_breakdown() + var/breakdown_cooldown = 0 + ///If this is over EXCITED_GROUP_DISMANTLE_CYCLES we call dismantle() + var/dismantle_cooldown = 0 + ///Used for debug to show the excited groups active and their turfs + var/should_display = FALSE + ///Id of the index color of the displayed group + var/display_id = 0 + ///Wrapping loop of the index colors + var/static/wrapping_id = 0 + ///All turf reaction flags we have received. + var/turf_reactions = NONE + +/datum/excited_group/New() + SSair.excited_groups += src + +/datum/excited_group/proc/add_turf(turf/open/target_turf) + turf_list += target_turf + target_turf.excited_group = src + dismantle_cooldown = 0 + if(should_display || SSair.display_all_groups) + display_turf(target_turf) + +/datum/excited_group/proc/merge_groups(datum/excited_group/target_group) + if(turf_list.len > target_group.turf_list.len) + SSair.excited_groups -= target_group + for(var/turf/open/group_member as anything in target_group.turf_list) + group_member.excited_group = src + turf_list += group_member + should_display = target_group.should_display | should_display + if(should_display || SSair.display_all_groups) + target_group.hide_turfs() + display_turfs() + breakdown_cooldown = min(breakdown_cooldown, target_group.breakdown_cooldown) //Take the smaller of the two options + dismantle_cooldown = 0 + else + SSair.excited_groups -= src + for(var/turf/open/group_member as anything in turf_list) + group_member.excited_group = target_group + target_group.turf_list += group_member + target_group.should_display = target_group.should_display | should_display + if(target_group.should_display || SSair.display_all_groups) + hide_turfs() + target_group.display_turfs() + target_group.breakdown_cooldown = min(breakdown_cooldown, target_group.breakdown_cooldown) + target_group.dismantle_cooldown = 0 + +/datum/excited_group/proc/reset_cooldowns() + breakdown_cooldown = 0 + dismantle_cooldown = 0 + +/datum/excited_group/proc/self_breakdown(roundstart = FALSE, poke_turfs = FALSE) + var/datum/gas_mixture/shared_mix = new + + //make local for sanic speed + var/list/shared_gases = shared_mix.gases + var/list/turf_list = src.turf_list + var/turflen = turf_list.len + var/imumutable_in_group = FALSE + var/energy = 0 + var/heat_cap = 0 + + for(var/turf/open/group_member as anything in turf_list) + //Cache? + var/datum/gas_mixture/turf/mix = group_member.air + if (roundstart) + if(istype(group_member.air, /datum/gas_mixture/immutable)) + imumutable_in_group = TRUE + shared_mix.copy_from(group_member.air) //This had better be immutable young man + shared_gases = shared_mix.gases //update the cache + break + // If we're planetary use THAT mix, and stop here + if(group_member.planetary_atmos) + imumutable_in_group = TRUE + var/datum/gas_mixture/planetary_mix = SSair.planetary[group_member.initial_gas_mix] + shared_mix.copy_from(planetary_mix) + shared_gases = shared_mix.gases // Cache update + break + //"borrowing" this code from merge(), I need to play with the temp portion. Lets expand it out + //temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity + var/capacity = mix.heat_capacity() + energy += mix.temperature * capacity + heat_cap += capacity + + var/list/giver_gases = mix.gases + for(var/giver_id in giver_gases) + ASSERT_GAS_IN_LIST(giver_id, shared_gases) + shared_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES] + + if(!imumutable_in_group) + shared_mix.temperature = energy / heat_cap + for(var/id in shared_gases) + shared_gases[id][MOLES] /= turflen + shared_mix.garbage_collect() + + for(var/turf/open/group_member as anything in turf_list) + if(group_member.planetary_atmos) //We do this as a hack to try and minimize unneeded excited group spread over planetary turfs + group_member.air.copy_from(SSair.planetary[group_member.initial_gas_mix]) //Comes with a cost of "slower" drains, but it's worth it + else + group_member.air.copy_from(shared_mix) //Otherwise just set the mix to a copy of our equalized mix + group_member.update_visuals() + if(poke_turfs) //Because we only activate all these once every breakdown, in event of lag due to this code and slow space + vent things, increase the wait time for breakdowns + SSair.add_to_active(group_member) + group_member.significant_share_ticker = EXCITED_GROUP_DISMANTLE_CYCLES //Max out the ticker, if they don't share next tick, nuke em + + breakdown_cooldown = 0 + +///Dismantles the excited group, puts allll the turfs to sleep +/datum/excited_group/proc/dismantle() + for(var/turf/open/current_turf as anything in turf_list) + current_turf.excited = FALSE + current_turf.significant_share_ticker = 0 + SSair.active_turfs -= current_turf + #ifdef VISUALIZE_ACTIVE_TURFS //Use this when you want details about how the turfs are moving, display_all_groups should work for normal operation + current_turf.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_VIBRANT_LIME) + #endif + garbage_collect() + +//Breaks down the excited group, this doesn't sleep the turfs mind, just removes them from the group +/datum/excited_group/proc/garbage_collect() + if(display_id) //If we ever did make those changes + hide_turfs() + for(var/turf/open/current_turf as anything in turf_list) + current_turf.excited_group = null + turf_list.Cut() + SSair.excited_groups -= src + if(SSair.currentpart == SSAIR_EXCITEDGROUPS) + SSair.currentrun -= src + +/datum/excited_group/proc/display_turfs() + if(display_id == 0) //Hasn't been shown before + wrapping_id = wrapping_id % GLOB.colored_turfs.len + wrapping_id++ //We do this after because lists index at 1 + display_id = wrapping_id + for(var/thing in turf_list) + var/turf/display = thing + display.vis_contents += GLOB.colored_turfs[display_id] + +/datum/excited_group/proc/hide_turfs() + for(var/thing in turf_list) + var/turf/display = thing + display.vis_contents -= GLOB.colored_turfs[display_id] + display_id = 0 + +/datum/excited_group/proc/display_turf(turf/thing) + if(display_id == 0) //Hasn't been shown before + wrapping_id = wrapping_id % GLOB.colored_turfs.len + wrapping_id++ //We do this after because lists index at 1 + display_id = wrapping_id + thing.vis_contents += GLOB.colored_turfs[display_id] + +#undef LAST_SHARE_CHECK +#undef PLANET_SHARE_CHECK diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm deleted file mode 100644 index 25e58dd50e898..0000000000000 --- a/code/modules/atmospherics/gasmixtures/auxgm.dm +++ /dev/null @@ -1,130 +0,0 @@ -GLOBAL_LIST_INIT(hardcoded_gases, list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLASMA)) //the main four gases, which were at one time hardcoded -GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLUOXIUM, GAS_STIMULUM, GAS_NITRYL))) //unable to react amongst themselves - -// Auxgm -// It's a send-up of XGM, like what baystation got. -// It's got the same architecture as XGM, but it's structured -// differently to make it more convenient for auxmos. - -// Most important compared to TG is that it does away with hardcoded typepaths, -// which lead to problems on the auxmos end anyway. We cache the string value -// references on the Rust end, so no performance is lost here. - -// Also allows you to add new gases at runtime - -/proc/_auxtools_register_gas(datum/gas/gas) // makes sure auxtools knows stuff about this gas - -/datum/auxgm - var/list/datums = list() - var/list/specific_heats = list() - var/list/names = list() - var/list/visibility = list() - var/list/overlays = list() - var/list/flags = list() - var/list/ids = list() - var/list/typepaths = list() - var/list/fusion_powers = list() - var/list/breathing_classes = list() - var/list/breath_results = list() - var/list/breath_reagents = list() - var/list/breath_reagents_dangerous = list() - var/list/breath_alert_info = list() - var/list/oxidation_temperatures = list() - var/list/oxidation_rates = list() - var/list/fire_temperatures = list() - var/list/enthalpies = list() - var/list/fire_products = list() - var/list/fire_burn_rates = list() - - -/datum/gas - var/id = "" - var/specific_heat = 0 - var/name = "" - var/gas_overlay = "" //icon_state in icons/effects/atmospherics.dmi - var/moles_visible = null - var/flags = NONE //currently used by canisters - var/fusion_power = 0 // How much the gas destabilizes a fusion reaction - var/breath_results = GAS_CO2 // what breathing this breathes out - var/breath_reagent = null // what breathing this adds to your reagents - var/breath_reagent_dangerous = null // what breathing this adds to your reagents IF it's above a danger threshold - var/list/breath_alert_info = null // list for alerts that pop up when you have too much/not enough of something - var/oxidation_temperature = null // temperature above which this gas is an oxidizer; null for none - var/oxidation_rate = 1 // how many moles of this can oxidize how many moles of material - var/fire_temperature = null // temperature above which gas may catch fire; null for none - var/list/fire_products = null // what results when this gas is burned (oxidizer or fuel); null for none - var/enthalpy = 0 // how much energy is released per mole of fuel burned - var/fire_burn_rate = 1 // how many moles are burned per product released - -/datum/gas/proc/breath(partial_pressure, light_threshold, heavy_threshold, moles, mob/living/carbon/C, obj/item/organ/lungs/lungs) - // This is only called on gases with the GAS_FLAG_BREATH_PROC flag. When possible, do NOT use this-- - // greatly prefer just adding a reagent. This is mostly around for legacy reasons. - return null - -/datum/auxgm/proc/add_gas(datum/gas/gas) - var/g = gas.id - if(g) - datums[g] = gas - specific_heats[g] = gas.specific_heat - names[g] = gas.name - if(gas.moles_visible) - visibility[g] = gas.moles_visible - overlays[g] = new /list(FACTOR_GAS_VISIBLE_MAX) - for(var/i in 1 to FACTOR_GAS_VISIBLE_MAX) - overlays[g][i] = new /obj/effect/overlay/gas(gas.gas_overlay, i * 255 / FACTOR_GAS_VISIBLE_MAX) - else - visibility[g] = 0 - overlays[g] = 0 - flags[g] = gas.flags - ids[g] = g - typepaths[g] = gas.type - fusion_powers[g] = gas.fusion_power - - if(gas.breath_alert_info) - breath_alert_info[g] = gas.breath_alert_info - breath_results[g] = gas.breath_results - if(gas.breath_reagent) - breath_reagents[g] = gas.breath_reagent - if(gas.breath_reagent_dangerous) - breath_reagents_dangerous[g] = gas.breath_reagent_dangerous - - if(gas.oxidation_temperature) - oxidation_temperatures[g] = gas.oxidation_temperature - oxidation_rates[g] = gas.oxidation_rate - if(gas.fire_products) - fire_products[g] = gas.fire_products - enthalpies[g] = gas.enthalpy - else if(gas.fire_temperature) - fire_temperatures[g] = gas.fire_temperature - fire_burn_rates[g] = gas.fire_burn_rate - if(gas.fire_products) - fire_products[g] = gas.fire_products - enthalpies[g] = gas.enthalpy - - _auxtools_register_gas(gas) - -/proc/finalize_gas_refs() - -/datum/auxgm/New() - for(var/gas_path in subtypesof(/datum/gas)) - var/datum/gas/gas = new gas_path - add_gas(gas) - for(var/breathing_class_path in subtypesof(/datum/breathing_class)) - var/datum/breathing_class/class = new breathing_class_path - breathing_classes[breathing_class_path] = class - finalize_gas_refs() - -GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new) - -/obj/effect/overlay/gas - icon = 'icons/effects/atmospherics.dmi' - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - anchored = TRUE // should only appear in vis_contents, but to be safe - layer = FLY_LAYER - appearance_flags = TILE_BOUND - vis_flags = NONE - -/obj/effect/overlay/gas/New(state, alph) - . = ..() - icon_state = state - alpha = alph diff --git a/code/modules/atmospherics/auxgm/breathing_classes.dm b/code/modules/atmospherics/gasmixtures/breathing_classes.dm similarity index 67% rename from code/modules/atmospherics/auxgm/breathing_classes.dm rename to code/modules/atmospherics/gasmixtures/breathing_classes.dm index cfc82adbffa16..57d557a89612c 100644 --- a/code/modules/atmospherics/auxgm/breathing_classes.dm +++ b/code/modules/atmospherics/gasmixtures/breathing_classes.dm @@ -17,27 +17,36 @@ /datum/breathing_class/proc/get_effective_pp(datum/gas_mixture/breath) var/mol = 0 for(var/gas in gases) - mol += breath.get_moles(gas) * gases[gas] + mol += GET_MOLES(gas,breath) * gases[gas] return (mol/breath.total_moles()) * breath.return_pressure() /datum/breathing_class/oxygen gases = list( - GAS_O2 = 1, - GAS_PLUOXIUM = 8, - GAS_CO2 = -0.7, // CO2 isn't actually toxic, just an asphyxiant + /datum/gas/oxygen = 1, + /datum/gas/pluoxium = 8, + /datum/gas/carbon_dioxide = -0.7, // CO2 isn't actually toxic, just an asphyxiant ) products = list( - GAS_CO2 = 1, + /datum/gas/carbon_dioxide = 1, ) /datum/breathing_class/plasma gases = list( - GAS_PLASMA = 1 + /datum/gas/plasma = 1 ) products = list( - GAS_CO2 = 1 + /datum/gas/carbon_dioxide = 1 ) low_alert_category = "not_enough_tox" low_alert_datum = /atom/movable/screen/alert/not_enough_tox high_alert_category = "too_much_tox" high_alert_datum = /atom/movable/screen/alert/too_much_tox + +/proc/breathing_class_list() + var/list/breathing_classes = list() + for(var/breathing_class_path in subtypesof(/datum/breathing_class)) + var/datum/breathing_class/class = new breathing_class_path + breathing_classes[breathing_class_path] = class + return breathing_classes + +GLOBAL_LIST_INIT(breathing_class_info, breathing_class_list()) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index a98e8ab5df44d..46c127ae01cd6 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -1,306 +1,769 @@ +/** + *I feel the need to document what happens here. Basically this is used + *catch rounding errors, and make gas go away in small portions. + *People have raised it to higher levels in the past, do not do this. Consider this number a soft limit + *If you're making gasmixtures that have unexpected behavior related to this value, you're doing something wrong. + * + *On an unrelated note this may cause a bug that creates negative gas, related to round(). When it has a second arg it will round up. + *So for instance round(0.5, 1) == 1. I've hardcoded a fix for this into share, by forcing the garbage collect. + *Any other attempts to fix it just killed atmos. I leave this to a greater man then I + */ +GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm +GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) + +/proc/init_gaslist_cache() + var/list/gases = list() + for(var/id in GLOB.meta_gas_info) + var/list/cached_gas = new(3) + + gases[id] = cached_gas + + cached_gas[MOLES] = 0 + cached_gas[ARCHIVE] = 0 + cached_gas[GAS_META] = GLOB.meta_gas_info[id] + return gases + /datum/gas_mixture - /// Never ever set this variable, hooked into vv_get_var for view variables viewing. - var/gas_list_view_only - var/initial_volume = CELL_VOLUME //liters + var/list/gases + /// The temperature of the gas mix in kelvin. Should never be lower then TCMB + var/temperature = TCMB + /// Used, like all archived variables, to ensure turf sharing is consistent inside a tick, no matter + /// The order of operations + var/tmp/temperature_archived = TCMB + /// Volume in liters (duh) + var/volume = CELL_VOLUME + /// The last tick this gas mixture shared on. A counter that turfs use to manage activity + var/last_share = 0 + /// Tells us what reactions have happened in our gasmix. Assoc list of reaction - moles reacted pair. var/list/reaction_results - var/list/analyzer_results //used for analyzer feedback - not initialized until its used - var/_extools_pointer_gasmixture // Contains the index in the gas vector for this gas mixture in rust land. Don't. Touch. This. Var. - -GLOBAL_LIST_INIT(auxtools_atmos_initialized, FALSE) - -/proc/auxtools_atmos_init() + /// Used for analyzer feedback - not initialized until its used + var/list/analyzer_results + /// Whether to call garbage_collect() on the sharer during shares, used for immutable mixtures + var/gc_share = FALSE + /// When this gas mixture was last touched by pipenet processing + /// I am sorry + var/pipenet_cycle = -1 /datum/gas_mixture/New(volume) - if (!isnull(volume)) - initial_volume = volume - AUXTOOLS_CHECK(AUXMOS) - if(!GLOB.auxtools_atmos_initialized && auxtools_atmos_init()) - GLOB.auxtools_atmos_initialized = TRUE - __gasmixture_register() + gases = new + if(!isnull(volume)) + src.volume = volume + if(src.volume <= 0) + stack_trace("Created a gas mixture with zero volume!") reaction_results = new -/* -we use a hook instead -/datum/gas_mixture/Del() - __gasmixture_unregister() - . = ..() -*/ - -/datum/gas_mixture/vv_edit_var(var_name, var_value) - if(var_name == "_extools_pointer_gasmixture") - return FALSE // please no. segfaults bad. - if(var_name == "gas_list_view_only") - return FALSE - return ..() - -/datum/gas_mixture/vv_get_var(var_name) - . = ..() - if(var_name == "gas_list_view_only") - var/list/dummy = get_gases() - for(var/gas in dummy) - dummy[gas] = get_moles(gas) - dummy["CAP [gas]"] = partial_heat_capacity(gas) - dummy["TEMP"] = return_temperature() - dummy["PRESSURE"] = return_pressure() - dummy["HEAT CAPACITY"] = heat_capacity() - dummy["TOTAL MOLES"] = total_moles() - dummy["VOLUME"] = return_volume() - dummy["THERMAL ENERGY"] = thermal_energy() - return debug_variable("gases (READ ONLY)", dummy, 0, src) - -/datum/gas_mixture/vv_get_dropdown() - . = ..() - VV_DROPDOWN_OPTION("", "---") - VV_DROPDOWN_OPTION(VV_HK_PARSE_GASSTRING, "Parse Gas String") - VV_DROPDOWN_OPTION(VV_HK_EMPTY, "Empty") - VV_DROPDOWN_OPTION(VV_HK_SET_MOLES, "Set Moles") - VV_DROPDOWN_OPTION(VV_HK_SET_TEMPERATURE, "Set Temperature") - VV_DROPDOWN_OPTION(VV_HK_SET_VOLUME, "Set Volume") - -/datum/gas_mixture/vv_do_topic(list/href_list) - . = ..() +//listmos procs +//use the macros in performance intensive areas. for their definitions, refer to code/__DEFINES/atmospherics.dm +///assert_gas(gas_id) - used to guarantee that the gas list for this id exists in gas_mixture.gases. +//Must be used before adding to a gas. May be used before reading from a gas. +/datum/gas_mixture/proc/assert_gas(gas_id) + ASSERT_GAS(gas_id, src) + +///assert_gases(args) - shorthand for calling ASSERT_GAS() once for each gas type. +/datum/gas_mixture/proc/assert_gases(...) + for(var/id in args) + ASSERT_GAS(id, src) + +///add_gas(gas_id) - similar to assert_gas(), but does not check for an existing gas list for this id. This can clobber existing gases. +///Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas(). +/datum/gas_mixture/proc/add_gas(gas_id) + ADD_GAS(gas_id, gases) + +///add_gases(args) - shorthand for calling add_gas() once for each gas_type. +/datum/gas_mixture/proc/add_gases(...) + var/cached_gases = gases + for(var/id in args) + ADD_GAS(id, cached_gases) + +///garbage_collect() - removes any gas list which is empty. +///If called with a list as an argument, only removes gas lists with IDs from that list. +///Must be used after subtracting from a gas. Must be used after assert_gas() +///if assert_gas() was called only to read from the gas. +///By removing empty gases, processing speed is increased. +/datum/gas_mixture/proc/garbage_collect(list/tocheck) + var/list/cached_gases = gases + for(var/id in (tocheck || cached_gases)) + if(QUANTIZE(cached_gases[id][MOLES]) <= 0) + cached_gases -= id + +//PV = nRT +///joules per kelvin +/datum/gas_mixture/proc/heat_capacity(data = MOLES) + var/list/cached_gases = gases + . = 0 + for(var/id in cached_gases) + var/gas_data = cached_gases[id] + . += gas_data[data] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT] + +/// Same as above except vacuums return HEAT_CAPACITY_VACUUM +/datum/gas_mixture/turf/heat_capacity(data = MOLES) + var/list/cached_gases = gases + . = 0 + for(var/id in cached_gases) + var/gas_data = cached_gases[id] + . += gas_data[data] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT] if(!.) - return - if(href_list[VV_HK_PARSE_GASSTRING]) - var/gasstring = input(usr, "Input Gas String (WARNING: Advanced. Don't use this unless you know how these work.", "Gas String Parse") as text|null - if(!istext(gasstring)) - return - log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].") - message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].") - parse_gas_string(gasstring) - if(href_list[VV_HK_EMPTY]) - log_admin("[key_name(usr)] emptied gas mixture [REF(src)].") - message_admins("[key_name(usr)] emptied gas mixture [REF(src)].") - clear() - if(href_list[VV_HK_SET_MOLES]) - var/list/gases = get_gases() - for(var/gas in gases) - gases[gas] = get_moles(gas) - var/gasid = input(usr, "What kind of gas?", "Set Gas") as null|anything in GLOB.gas_data.ids - if(!gasid) - return - var/amount = input(usr, "Input amount", "Set Gas", gases[gasid] || 0) as num|null - if(!isnum(amount)) - return - amount = max(0, amount) - log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") - message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") - set_moles(gasid, amount) - if(href_list[VV_HK_SET_TEMPERATURE]) - var/temp = input(usr, "Set the temperature of this mixture to?", "Set Temperature", return_temperature()) as num|null - if(!isnum(temp)) - return - temp = max(2.7, temp) - log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].") - message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].") - set_temperature(temp) - if(href_list[VV_HK_SET_VOLUME]) - var/volume = input(usr, "Set the volume of this mixture to?", "Set Volume", return_volume()) as num|null - if(!isnum(volume)) - return - volume = max(0, volume) - log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed volume to [volume].") - message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed volume to [volume].") - set_volume(volume) - -/datum/gas_mixture/proc/__gasmixture_unregister() -/datum/gas_mixture/proc/__gasmixture_register() - -/proc/gas_types() - var/list/L = subtypesof(/datum/gas) - for(var/gt in L) - var/datum/gas/G = gt - L[gt] = initial(G.specific_heat) - return L - -/datum/gas_mixture/proc/heat_capacity() //joules per kelvin - -/datum/gas_mixture/proc/partial_heat_capacity(gas_type) + . += HEAT_CAPACITY_VACUUM //we want vacuums in turfs to have the same heat capacity as space +/// Calculate moles /datum/gas_mixture/proc/total_moles() + var/cached_gases = gases + TOTAL_MOLES(cached_gases, .) + +/// Checks to see if gas amount exists in mixture. +/// Do NOT use this in code where performance matters! +/// It's better to batch calls to garbage_collect(), especially in places where you're checking many gastypes +/datum/gas_mixture/proc/has_gas(gas_id, amount=0) + ASSERT_GAS(gas_id, src) + var/is_there_gas = amount < gases[gas_id][MOLES] + garbage_collect() + return is_there_gas + +/// Calculate pressure in kilopascals +/datum/gas_mixture/proc/return_pressure() + if(volume) // to prevent division by zero + var/cached_gases = gases + TOTAL_MOLES(cached_gases, .) + return . * R_IDEAL_GAS_EQUATION * temperature / volume + return 0 + +/// Calculate temperature in kelvins +/datum/gas_mixture/proc/return_temperature() + return temperature + +/// Calculate volume in liters +/datum/gas_mixture/proc/return_volume() + return max(0, volume) + +/// Calculate thermal energy in joules +/datum/gas_mixture/proc/thermal_energy() + return THERMAL_ENERGY(src) //see code/__DEFINES/atmospherics.dm; use the define in performance critical areas + +///Update archived versions of variables. Returns: 1 in all cases +/datum/gas_mixture/proc/archive() + var/list/cached_gases = gases -/datum/gas_mixture/proc/return_pressure() //kilopascals - -/datum/gas_mixture/proc/return_temperature() //kelvins - -/datum/gas_mixture/proc/set_min_heat_capacity(n) -/datum/gas_mixture/proc/set_temperature(new_temp) -/datum/gas_mixture/proc/set_volume(new_volume) -/datum/gas_mixture/proc/get_moles(gas_type) -/datum/gas_mixture/proc/get_by_flag(flag) -/datum/gas_mixture/proc/set_moles(gas_type, moles) -/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, ratio, list/gases) -/datum/gas_mixture/proc/mark_immutable() -/datum/gas_mixture/proc/get_gases() -/datum/gas_mixture/proc/add(amt) -/datum/gas_mixture/proc/subtract(amt) -/datum/gas_mixture/proc/multiply(factor) -/datum/gas_mixture/proc/divide(factor) -/datum/gas_mixture/proc/get_last_share() -/datum/gas_mixture/proc/clear() - -/datum/gas_mixture/proc/adjust_moles(gas_type, amt = 0) - set_moles(gas_type, clamp(get_moles(gas_type) + amt,0,INFINITY)) - -/datum/gas_mixture/proc/adjust_moles_temp(gas_type, amt, temperature) - -/datum/gas_mixture/proc/adjust_multi() - -/datum/gas_mixture/proc/return_volume() //liters + temperature_archived = temperature + for(var/id in cached_gases) + cached_gases[id][ARCHIVE] = cached_gases[id][MOLES] -/datum/gas_mixture/proc/thermal_energy() //joules - -/datum/gas_mixture/proc/archive() - //Update archived versions of variables - //Returns: 1 in all cases + return TRUE +///Merges all air from giver into self. Deletes giver. Returns: 1 if we are mutable, 0 otherwise /datum/gas_mixture/proc/merge(datum/gas_mixture/giver) - //Merges all air from giver into self. Does NOT delete the giver. - //Returns: 1 if we are mutable, 0 otherwise + if(!giver) + return FALSE + //heat transfer + if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity() + var/giver_heat_capacity = giver.heat_capacity() + var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity + if(combined_heat_capacity) + temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity + + var/list/cached_gases = gases //accessing datum vars is slower than proc vars + var/list/giver_gases = giver.gases + //gas transfer + for(var/giver_id in giver_gases) + ASSERT_GAS_IN_LIST(giver_id, cached_gases) + cached_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES] + + SEND_SIGNAL(src, COMSIG_GASMIX_MERGED) + return TRUE + +///Proportionally removes amount of gas from the gas_mixture. +///Returns: gas_mixture with the gases removed /datum/gas_mixture/proc/remove(amount) - //Proportionally removes amount of gas from the gas_mixture - //Returns: gas_mixture with the gases removed - -/datum/gas_mixture/proc/remove_by_flag(flag, amount) - //Removes amount of gas from the gas mixture by flag - //Returns: gas_mixture with gases that match the flag removed - -/datum/gas_mixture/proc/transfer_to(datum/gas_mixture/target, amount) - -/datum/gas_mixture/proc/transfer_ratio_to(datum/gas_mixture/target, ratio) - //Transfers ratio of gas to target. Equivalent to target.merge(remove_ratio(amount)) but faster. + var/sum + var/list/cached_gases = gases + TOTAL_MOLES(cached_gases, sum) + amount = min(amount, sum) //Can not take more air than tile has! + if(amount <= 0) + return null + var/ratio = amount / sum + var/datum/gas_mixture/removed = new type(volume) + var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars + + removed.temperature = temperature + for(var/id in cached_gases) + ADD_GAS(id, removed.gases) + removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES] * ratio) + cached_gases[id][MOLES] -= removed_gases[id][MOLES] + garbage_collect() + + SEND_SIGNAL(src, COMSIG_GASMIX_REMOVED) + return removed +///Proportionally removes amount of gas from the gas_mixture. +///Returns: gas_mixture with the gases removed /datum/gas_mixture/proc/remove_ratio(ratio) - //Proportionally removes amount of gas from the gas_mixture - //Returns: gas_mixture with the gases removed + if(ratio <= 0) + var/datum/gas_mixture/removed = new(volume) + return removed + ratio = min(ratio, 1) -/datum/gas_mixture/proc/copy() - //Creates new, identical gas mixture - //Returns: duplicate gas mixture + var/list/cached_gases = gases + var/datum/gas_mixture/removed = new type(volume) + var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars -/datum/gas_mixture/proc/copy_from(datum/gas_mixture/sample) - //Copies variables from sample - //Returns: 1 if we are mutable, 0 otherwise - -/datum/gas_mixture/proc/copy_from_turf(turf/model) - //Copies all gas info from the turf into the gas list along with temperature - //Returns: 1 if we are mutable, 0 otherwise + removed.temperature = temperature + for(var/id in cached_gases) + ADD_GAS(id, removed.gases) + removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES] * ratio) + cached_gases[id][MOLES] -= removed_gases[id][MOLES] -/datum/gas_mixture/proc/parse_gas_string(gas_string) - //Copies variables from a particularly formatted string. - //Returns: 1 if we are mutable, 0 otherwise + garbage_collect() -/datum/gas_mixture/proc/share(datum/gas_mixture/sharer) - //Performs air sharing calculations between two gas_mixtures assuming only 1 boundary length - //Returns: amount of gas exchanged (+ if sharer received) + SEND_SIGNAL(src, COMSIG_GASMIX_REMOVED) + return removed -/datum/gas_mixture/proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient) - //Performs temperature sharing calculations (via conduction) between two gas_mixtures assuming only 1 boundary length - //Returns: new temperature of the sharer +///Removes an amount of a specific gas from the gas_mixture. +///Returns: gas_mixture with the gas removed +/datum/gas_mixture/proc/remove_specific(gas_id, amount) + var/list/cached_gases = gases + amount = min(amount, cached_gases[gas_id][MOLES]) + if(amount <= 0) + return null + var/datum/gas_mixture/removed = new type + var/list/removed_gases = removed.gases + removed.temperature = temperature + ADD_GAS(gas_id, removed.gases) + removed_gases[gas_id][MOLES] = amount + cached_gases[gas_id][MOLES] -= amount -/datum/gas_mixture/proc/compare(datum/gas_mixture/sample) - //Compares sample to self to see if within acceptable ranges that group processing may be enabled - //Returns: a string indicating what check failed, or "" if check passes + garbage_collect(list(gas_id)) + return removed -/datum/gas_mixture/proc/react(turf/open/dump_location) - //Performs various reactions such as combustion or fusion (LOL) - //Returns: 1 if any reaction took place; 0 otherwise +/datum/gas_mixture/proc/remove_specific_ratio(gas_id, ratio) + if(ratio <= 0) + return null + ratio = min(ratio, 1) -/datum/gas_mixture/proc/adjust_heat(amt) - //Adjusts the thermal energy of the gas mixture, rather than having to do the full calculation. - //Returns: null + var/list/cached_gases = gases + var/datum/gas_mixture/removed = new type + var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars -/datum/gas_mixture/proc/equalize_with(datum/gas_mixture/giver) - //Makes this mix have the same temperature and gas ratios as the giver, but with the same pressure, accounting for volume. - //Returns: null + removed.temperature = temperature + ADD_GAS(gas_id, removed.gases) + removed_gases[gas_id][MOLES] = QUANTIZE(cached_gases[gas_id][MOLES] * ratio) + cached_gases[gas_id][MOLES] -= removed_gases[gas_id][MOLES] -/datum/gas_mixture/proc/get_oxidation_power(temp) - //Gets how much oxidation this gas can do, optionally at a given temperature. + garbage_collect(list(gas_id)) -/datum/gas_mixture/proc/get_fuel_amount(temp) - //Gets how much fuel for fires (not counting trit/plasma!) this gas has, optionally at a given temperature. + return removed -/proc/equalize_all_gases_in_list(list/L) - //Makes every gas in the given list have the same pressure, temperature and gas proportions. - //Returns: null +///Distributes the contents of two mixes equally between themselves +//Returns: bool indicating whether gases moved between the two mixes +/datum/gas_mixture/proc/equalize(datum/gas_mixture/other) + . = FALSE + if(abs(return_temperature() - other.return_temperature()) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + . = TRUE + var/self_heat_cap = heat_capacity() + var/other_heat_cap = other.heat_capacity() + var/new_temp = (temperature * self_heat_cap + other.temperature * other_heat_cap) / (self_heat_cap + other_heat_cap) + temperature = new_temp + other.temperature = new_temp + + var/min_p_delta = 0.1 + var/total_volume = volume + other.volume + var/list/gas_list = gases | other.gases + for(var/gas_id in gas_list) + assert_gas(gas_id) + other.assert_gas(gas_id) + //math is under the assumption temperatures are equal + if(abs(gases[gas_id][MOLES] / volume - other.gases[gas_id][MOLES] / other.volume) > min_p_delta / (R_IDEAL_GAS_EQUATION * temperature)) + . = TRUE + var/total_moles = gases[gas_id][MOLES] + other.gases[gas_id][MOLES] + gases[gas_id][MOLES] = total_moles * (volume/total_volume) + other.gases[gas_id][MOLES] = total_moles * (other.volume/total_volume) + garbage_collect() + other.garbage_collect() + +///Creates new, identical gas mixture +///Returns: duplicate gas mixture +/datum/gas_mixture/proc/copy() + // Type as /list/list to make spacemandmm happy with the inlined access we do down there + var/list/list/cached_gases = gases + var/datum/gas_mixture/copy = new type + var/list/copy_gases = copy.gases -/datum/gas_mixture/proc/__remove_by_flag() + copy.temperature = temperature + for(var/id in cached_gases) + // Sort of a sideways way of doing ADD_GAS() + // Faster tho, gotta save those cpu cycles + copy_gases[id] = cached_gases[id].Copy() + copy_gases[id][ARCHIVE] = 0 -/datum/gas_mixture/remove_by_flag(flag, amount) - var/datum/gas_mixture/removed = new type - __remove_by_flag(removed, flag, amount) + return copy - return removed -/datum/gas_mixture/proc/__remove() -/datum/gas_mixture/remove(amount) - var/datum/gas_mixture/removed = new type - __remove(removed, amount) +///Copies variables from sample +///Returns: TRUE if we are mutable, FALSE otherwise +/datum/gas_mixture/proc/copy_from(datum/gas_mixture/sample) + var/list/cached_gases = gases //accessing datum vars is slower than proc vars + // Type as /list/list to make spacemandmm happy with the inlined access we do down there + var/list/list/sample_gases = sample.gases + + //remove all gases + cached_gases.Cut() + + temperature = sample.temperature + for(var/id in sample_gases) + cached_gases[id] = sample_gases[id].Copy() + cached_gases[id][ARCHIVE] = 0 + + return TRUE + +///Copies variables from sample, moles multiplicated by partial +///Returns: TRUE if we are mutable, FALSE otherwise +/datum/gas_mixture/proc/copy_from_ratio(datum/gas_mixture/sample, partial = 1) + var/list/cached_gases = gases //accessing datum vars is slower than proc vars + var/list/sample_gases = sample.gases + + //remove all gases not in the sample + cached_gases &= sample_gases + + temperature = sample.temperature + for(var/id in sample_gases) + ASSERT_GAS_IN_LIST(id, cached_gases) + cached_gases[id][MOLES] = sample_gases[id][MOLES] * partial + + return TRUE + +/// Performs air sharing calculations between two gas_mixtures +/// share() is communitive, which means A.share(B) needs to be the same as B.share(A) +/// If we don't retain this, we will get negative moles. Don't do it +/// Returns: amount of gas exchanged (+ if sharer received) +/datum/gas_mixture/proc/share(datum/gas_mixture/sharer, our_coeff, sharer_coeff) + var/list/cached_gases = gases + var/list/sharer_gases = sharer.gases + + var/list/only_in_sharer = sharer_gases - cached_gases + var/list/only_in_cached = cached_gases - sharer_gases + + var/temperature_delta = temperature_archived - sharer.temperature_archived + var/abs_temperature_delta = abs(temperature_delta) + + var/old_self_heat_capacity = 0 + var/old_sharer_heat_capacity = 0 + if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + old_self_heat_capacity = heat_capacity() + old_sharer_heat_capacity = sharer.heat_capacity() + + var/heat_capacity_self_to_sharer = 0 //heat capacity of the moles transferred from us to the sharer + var/heat_capacity_sharer_to_self = 0 //heat capacity of the moles transferred from the sharer to us + + var/moved_moles = 0 + var/abs_moved_moles = 0 + + //GAS TRANSFER + + //Prep + for(var/id in only_in_sharer) //create gases not in our cache + ADD_GAS(id, cached_gases) + for(var/id in only_in_cached) //create gases not in the sharing mix + ADD_GAS(id, sharer_gases) + + for(var/id in cached_gases) //transfer gases + var/gas = cached_gases[id] + var/sharergas = sharer_gases[id] + var/delta = QUANTIZE(gas[ARCHIVE] - sharergas[ARCHIVE]) //the amount of gas that gets moved between the mixtures + + if(!delta) + continue + + // If we have more gas then they do, gas is moving from us to them + // This means we want to scale it by our coeff. Vis versa for their case + if(delta > 0) + delta = delta * our_coeff + else + delta = delta * sharer_coeff + + if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/gas_heat_capacity = delta * gas[GAS_META][META_GAS_SPECIFIC_HEAT] + if(delta > 0) + heat_capacity_self_to_sharer += gas_heat_capacity + else + heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative. + + gas[MOLES] -= delta + sharergas[MOLES] += delta + moved_moles += delta + abs_moved_moles += abs(delta) + + last_share = abs_moved_moles + + //THERMAL ENERGY TRANSFER + if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer + var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self + + //transfer of thermal energy (via changed heat capacity) between self and sharer + if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY) + temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity + + if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) + sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity + //thermal energy of the system (self and sharer) is unchanged + + if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY) + if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.1) // <10% change in sharer heat capacity + temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT) + + if(length(only_in_sharer + only_in_cached)) //if all gases were present in both mixtures, we know that no gases are 0 + garbage_collect(only_in_cached) //any gases the sharer had, we are guaranteed to have. gases that it didn't have we are not. + sharer.garbage_collect(only_in_sharer) //the reverse is equally true + else if (initial(sharer.gc_share)) + sharer.garbage_collect() + + if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) + var/our_moles + TOTAL_MOLES(cached_gases,our_moles) + var/their_moles + TOTAL_MOLES(sharer_gases,their_moles) + return (temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)) * R_IDEAL_GAS_EQUATION / volume + +///Performs temperature sharing calculations (via conduction) between two gas_mixtures assuming only 1 boundary length +///Returns: new temperature of the sharer +/datum/gas_mixture/proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity) + //transfer of thermal energy (via conduction) between self and sharer + if(sharer) + sharer_temperature = sharer.temperature_archived + var/temperature_delta = temperature_archived - sharer_temperature + if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity(ARCHIVE) + sharer_heat_capacity = sharer_heat_capacity || sharer.heat_capacity(ARCHIVE) + + if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + // coefficient applied first because some turfs have very big heat caps. + var/heat = CALCULATE_CONDUCTION_ENERGY(conduction_coefficient * temperature_delta, sharer_heat_capacity, self_heat_capacity) + + temperature = max(temperature - heat/self_heat_capacity, TCMB) + sharer_temperature = max(sharer_temperature + heat/sharer_heat_capacity, TCMB) + if(sharer) + sharer.temperature = sharer_temperature + if (initial(sharer.gc_share)) + sharer.garbage_collect() + return sharer_temperature + //thermal energy of the system (self and sharer) is unchanged + +///Compares sample to self to see if within acceptable ranges that group processing may be enabled +///Takes the gas index to read from as a second arg (either MOLES or ARCHIVE) +///Returns: a string indicating what check failed, or "" if check passes +/datum/gas_mixture/proc/compare(datum/gas_mixture/sample, index) + var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars + var/list/cached_gases = gases + var/moles_sum = 0 + + for(var/id in cached_gases | sample_gases) // compare gases from either mixture + // Yes this is actually fast. I too hate it here + var/gas_moles = cached_gases[id]?[index] || 0 + var/sample_moles = sample_gases[id]?[index] || 0 + // Brief explanation. We are much more likely to not pass this first check then pass the first and fail the second + // Because of this, double calculating the delta is FASTER then inserting it into a var + if(abs(gas_moles - sample_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) + if(abs(gas_moles - sample_moles) > gas_moles * MINIMUM_AIR_RATIO_TO_MOVE) + return id + // similarly, we will rarely get cut off, so this is cheaper then doing it later + moles_sum += gas_moles + + if(moles_sum > MINIMUM_MOLES_DELTA_TO_MOVE) //Don't consider temp if there's not enough mols + if(index == ARCHIVE) + if(abs(temperature_archived - sample.temperature_archived) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + return "temp" + else + if(abs(temperature - sample.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + return "temp" + + return "" + +///Performs various reactions such as combustion or fusion (LOL) +///Returns: 1 if any reaction took place; 0 otherwise +/datum/gas_mixture/proc/react(datum/holder) + . = NO_REACTION + var/list/cached_gases = gases + if(!length(cached_gases)) + return - return removed + var/list/pre_formation = list() + var/list/mid_formation = list() + var/list/post_formation = list() + var/list/fires = list() + var/list/gas_reactions = SSair.gas_reactions + for(var/gas_id in cached_gases) + var/list/reaction_set = gas_reactions[gas_id] + if(!reaction_set) + continue + pre_formation += reaction_set[1] + mid_formation += reaction_set[2] + post_formation += reaction_set[3] + fires += reaction_set[4] + + var/list/reactions = pre_formation + mid_formation + post_formation + fires + + if(!length(reactions)) + return -/datum/gas_mixture/proc/__remove_ratio() -/datum/gas_mixture/remove_ratio(ratio) - var/datum/gas_mixture/removed = new type - __remove_ratio(removed, ratio) + //Fuck you + if(cached_gases[/datum/gas/hypernoblium] && cached_gases[/datum/gas/hypernoblium][MOLES] >= REACTION_OPPRESSION_THRESHOLD && temperature > 20) + return STOP_REACTIONS - return removed + reaction_results = new + //It might be worth looking into updating these after each reaction, but that makes us care more about order of operations, so be careful + var/temp = temperature + reaction_loop: + for(var/datum/gas_reaction/reaction as anything in reactions) + + var/list/reqs = reaction.requirements + if((reqs["MIN_TEMP"] && temp < reqs["MIN_TEMP"]) || (reqs["MAX_TEMP"] && temp > reqs["MAX_TEMP"])) + continue + + for(var/id in reqs) + if (id == "MIN_TEMP" || id == "MAX_TEMP") + continue + if(!cached_gases[id] || cached_gases[id][MOLES] < reqs[id]) + continue reaction_loop + + //at this point, all requirements for the reaction are satisfied. we can now react() + . |= reaction.react(src, holder) + + + if(.) //If we changed the mix to any degree + garbage_collect() + SEND_SIGNAL(src, COMSIG_GASMIX_REACTED) + + +/** + * Takes the amount of the gas you want to PP as an argument + * So I don't have to do some hacky switches/defines/magic strings + * eg: + * Plas_PP = get_partial_pressure(gas_mixture.plasma) + * O2_PP = get_partial_pressure(gas_mixture.oxygen) + * get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp + * get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() + * + * 10/20*5 = 2.5 + * 10 = 2.5/5*20 + */ + +/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure) + return (gas_pressure * R_IDEAL_GAS_EQUATION * temperature) / BREATH_VOLUME +///inverse +/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure) + return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * temperature) + +/** + * Counts how much pressure will there be if we impart MOLAR_ACCURACY amounts of our gas to the output gasmix. + * We do all of this without actually transferring it so dont worry about it changing the gasmix. + * Returns: Resulting pressure (number). + * Args: + * - output_air (gasmix). + */ +/datum/gas_mixture/proc/gas_pressure_minimum_transfer(datum/gas_mixture/output_air) + var/resulting_energy = output_air.thermal_energy() + (MOLAR_ACCURACY / total_moles() * thermal_energy()) + var/resulting_capacity = output_air.heat_capacity() + (MOLAR_ACCURACY / total_moles() * heat_capacity()) + return (output_air.total_moles() + MOLAR_ACCURACY) * R_IDEAL_GAS_EQUATION * (resulting_energy / resulting_capacity) / output_air.volume + + +/** Returns the amount of gas to be pumped to a specific container. + * Args: + * - output_air. The gas mix we want to pump to. + * - target_pressure. The target pressure we want. + * - ignore_temperature. Returns a cheaper form of gas calculation, useful if the temperature difference between the two gasmixes is low or nonexistant. + */ +/datum/gas_mixture/proc/gas_pressure_calculate(datum/gas_mixture/output_air, target_pressure, ignore_temperature = FALSE) + // So we dont need to iterate the gaslist multiple times. + var/our_moles = total_moles() + var/output_moles = output_air.total_moles() + var/output_pressure = output_air.return_pressure() + + if(our_moles <= 0 || temperature <= 0) + return FALSE -/datum/gas_mixture/copy() - var/datum/gas_mixture/copy = new type - copy.copy_from(src) + var/pressure_delta = 0 + if(output_air.temperature <= 0 || output_moles <= 0) + ignore_temperature = TRUE + pressure_delta = target_pressure + else + pressure_delta = target_pressure - output_pressure - return copy + if(pressure_delta < 0.01 || gas_pressure_minimum_transfer(output_air) > target_pressure) + return FALSE -/datum/gas_mixture/copy_from_turf(turf/model) - set_temperature(initial(model.initial_temperature)) - parse_gas_string(model.initial_gas_mix) - return 1 + if(ignore_temperature) + return (pressure_delta*output_air.volume)/(temperature * R_IDEAL_GAS_EQUATION) + + // Lower and upper bound for the moles we must transfer to reach the pressure. The answer is bound to be here somewhere. + var/pv = target_pressure * output_air.volume + /// The PV/R part in the equation we will use later. Counted early because pv/(r*t) might not be equal to pv/r/t, messing our lower and upper limit. + var/pvr = pv / R_IDEAL_GAS_EQUATION + // These works by assuming our gas has extremely high heat capacity + // and the resultant gasmix will hit either the highest or lowest temperature possible. + /// This is the true lower limit, but numbers still can get lower than this due to floats. + var/lower_limit = max((pvr / max(temperature, output_air.temperature)) - output_moles, 0) + var/upper_limit = (pvr / min(temperature, output_air.temperature)) - output_moles // In theory this should never go below zero, the pressure_delta check above should account for this. + + lower_limit = max(lower_limit - ATMOS_PRESSURE_ERROR_TOLERANCE, 0) + upper_limit += ATMOS_PRESSURE_ERROR_TOLERANCE + + /* + * We have PV=nRT as a nice formula, we can rearrange it into nT = PV/R + * But now both n and T can change, since any incoming moles also change our temperature. + * So we need to unify both our n and T, somehow. + * + * We can rewrite T as (our old thermal energy + incoming thermal energy) divided by (our old heat capacity + incoming heat capacity) + * T = (W1 + n/N2 * W2) / (C1 + n/N2 * C2). C being heat capacity, W being work, N being total moles. + * + * In total we now have our equation be: (N1 + n) * (W1 + n/N2 * W2) / (C1 + n/N2 * C2) = PV/R + * Now you can rearrange this and find out that it's a quadratic equation and pretty much solvable with the formula. Will be a bit messy though. + * + * W2/N2n^2 + + * (N1*W2/N2)n + W1n - ((PV/R)*C2/N2)n + + * (-(PV/R)*C1) + N1W1 = 0 + * + * We will represent each of these terms with A, B, and C. A for the n^2 part, B for the n^1 part, and C for the n^0 part. + * We then put this into the famous (-b +/- sqrt(b^2-4ac)) / 2a formula. + * + * Oh, and one more thing. By "our" we mean the gasmix in the argument. We are the incoming one here. We are number 2, target is number 1. + * If all this counting fucks up, we revert first to Newton's approximation, then the old simple formula. + */ + + // Our thermal energy and moles + var/w2 = thermal_energy() + var/n2 = our_moles + var/c2 = heat_capacity() + + // Target thermal energy and moles + var/w1 = output_air.thermal_energy() + var/n1 = output_moles + var/c1 = output_air.heat_capacity() + + /// x^2 in the quadratic + var/a_value = w2/n2 + /// x^1 in the quadratic + var/b_value = ((n1*w2)/n2) + w1 - (pvr*c2/n2) + /// x^0 in the quadratic + var/c_value = (-1*pvr*c1) + n1 * w1 + + . = gas_pressure_quadratic(a_value, b_value, c_value, lower_limit, upper_limit) + if(.) + return + . = gas_pressure_approximate(a_value, b_value, c_value, lower_limit, upper_limit) + if(.) + return + // Inaccurate and will probably explode but whatever. + return (pressure_delta*output_air.volume)/(temperature * R_IDEAL_GAS_EQUATION) + +/// Actually tries to solve the quadratic equation. +/// Do mind that the numbers can get very big and might hit BYOND's single point float limit. +/datum/gas_mixture/proc/gas_pressure_quadratic(a, b, c, lower_limit, upper_limit) + var/solution + if(!IS_INF_OR_NAN(a) && !IS_INF_OR_NAN(b) && !IS_INF_OR_NAN(c)) + solution = max(SolveQuadratic(a, b, c)) + if(solution > lower_limit && solution < upper_limit) //SolveQuadratic can return empty lists so be careful here + return solution + stack_trace("Failed to solve pressure quadratic equation. A: [a]. B: [b]. C:[c]. Current value = [solution]. Expected lower limit: [lower_limit]. Expected upper limit: [upper_limit].") + return FALSE -/datum/gas_mixture/proc/__auxtools_parse_gas_string(gas_string) +/// Approximation of the quadratic equation using Newton-Raphson's Method. +/// We use the slope of an approximate value to get closer to the root of a given equation. +/datum/gas_mixture/proc/gas_pressure_approximate(a, b, c, lower_limit, upper_limit) + var/solution + if(!IS_INF_OR_NAN(a) && !IS_INF_OR_NAN(b) && !IS_INF_OR_NAN(c)) + // We start at the extrema of the equation, added by a number. + // This way we will hopefully always converge on the positive root, while starting at a reasonable number. + solution = (-b / (2 * a)) + 200 + for (var/iteration in 1 to ATMOS_PRESSURE_APPROXIMATION_ITERATIONS) + var/diff = (a*solution**2 + b*solution + c) / (2*a*solution + b) // f(sol) / f'(sol) + solution -= diff // xn+1 = xn - f(sol) / f'(sol) + if(abs(diff) < MOLAR_ACCURACY && (solution > lower_limit) && (solution < upper_limit)) + return solution + stack_trace("Newton's Approximation for pressure failed after [ATMOS_PRESSURE_APPROXIMATION_ITERATIONS] iterations. A: [a]. B: [b]. C:[c]. Current value: [solution]. Expected lower limit: [lower_limit]. Expected upper limit: [upper_limit].") + return FALSE -/datum/gas_mixture/parse_gas_string(gas_string) - return __auxtools_parse_gas_string(gas_string) +/// Pumps gas from src to output_air. Amount depends on target_pressure +/datum/gas_mixture/proc/pump_gas_to(datum/gas_mixture/output_air, target_pressure, specific_gas = null, datum/gas_mixture/output_pipenet_air = null) + var/datum/gas_mixture/input_air = specific_gas ? remove_specific_ratio(specific_gas, 1) : src + var/temperature_delta = abs(input_air.temperature - output_air.temperature) + var/datum/gas_mixture/removed -/datum/gas_mixture/proc/set_analyzer_results(instability) - if(!analyzer_results) - analyzer_results = new - analyzer_results["fusion"] = instability + var/transfer_moles_output = input_air.gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5) + var/transfer_moles_pipenet = output_pipenet_air?.volume ? input_air.gas_pressure_calculate(output_pipenet_air, target_pressure, temperature_delta <= 5) : 0 + var/transfer_moles = max(transfer_moles_output, transfer_moles_pipenet) -//Mathematical proofs: -/* -get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp -get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() + if(specific_gas) + removed = input_air.remove_specific(specific_gas, transfer_moles) + merge(input_air) // Merge the remaining gas back to the input node + else + removed = input_air.remove(transfer_moles) -10/20*5 = 2.5 -10 = 2.5/5*20 -*/ + if(!removed) + return FALSE -/datum/gas_mixture/turf + output_air.merge(removed) + return removed /// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure. -/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure) +/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure, rate=1, datum/gas_mixture/output_pipenet_air = null) var/output_starting_pressure = output_air.return_pressure() var/input_starting_pressure = return_pressure() - if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) - //No need to pump gas if target is already reached or input pressure is too low - //Need at least 10 kPa difference to overcome friction in the mechanism + //Need at least 10 KPa difference to overcome friction in the mechanism + if(output_starting_pressure >= min(target_pressure, input_starting_pressure-10)) return FALSE + //Can not have a pressure delta that would cause output_pressure > input_pressure + target_pressure = output_starting_pressure + min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) + var/temperature_delta = abs(temperature - output_air.temperature) - //Calculate necessary moles to transfer using PV = nRT - if((total_moles() > 0) && (return_temperature()>0)) - var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) - //Can not have a pressure delta that would cause output_pressure > input_pressure + var/transfer_moles_output = gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5) + var/transfer_moles_pipenet = output_pipenet_air?.volume ? gas_pressure_calculate(output_pipenet_air, target_pressure, temperature_delta <= 5) : 0 + var/transfer_moles = max(transfer_moles_output, transfer_moles_pipenet) - var/transfer_moles = pressure_delta*output_air.return_volume()/(return_temperature() * R_IDEAL_GAS_EQUATION) + //Actually transfer the gas + var/datum/gas_mixture/removed = remove(transfer_moles * rate) - //Actually transfer the gas - var/datum/gas_mixture/removed = remove(transfer_moles) - output_air.merge(removed) - return TRUE - return FALSE + if(!removed) + return FALSE + + output_air.merge(removed) + return TRUE + +/datum/gas_mixture/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---") + VV_DROPDOWN_OPTION(VV_HK_EMPTY, "Empty") + VV_DROPDOWN_OPTION(VV_HK_SET_MOLES, "Set Moles") + VV_DROPDOWN_OPTION(VV_HK_SET_TEMPERATURE, "Set Temperature") -/datum/gas_mixture/proc/vv_react(datum/holder) - return react(holder) +/datum/gas_mixture/vv_do_topic(list/href_list) + . = ..() + if(!.) + return + if(href_list[VV_HK_EMPTY]) + log_admin("[key_name(usr)] emptied gas mixture [REF(src)].") + message_admins("[key_name(usr)] emptied gas mixture [REF(src)].") + gases = new() + if(href_list[VV_HK_SET_MOLES]) + var/gas_input = tgui_input_list(usr, "What kind of gas?", "Set Gas", GLOB.meta_gas_info) + if(!gas_input) + return + var/list/gas_list = GLOB.meta_gas_info[gas_input] + var/gasid = gas_id2path(gas_list[META_GAS_ID]) + if(!gasid) + return + var/amount = tgui_input_number(usr, "Input amount", "Set Gas", 0, INFINITY, 0, round_value = FALSE) + if(!isnum(amount)) + return + amount = max(0, amount) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") + SET_MOLES(gasid, src, amount) + if(href_list[VV_HK_SET_TEMPERATURE]) + var/new_temperature = input(usr, "Set the temperature of this mixture to?", "Set Temperature", return_temperature()) as num|null + if(!isnum(new_temperature)) + return + new_temperature = max(2.7, new_temperature) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [new_temperature].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [new_temperature].") + temperature = new_temperature diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm new file mode 100644 index 0000000000000..a630e387c67f3 --- /dev/null +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -0,0 +1,220 @@ +GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/plasma)) //the main four gases, which were at one time hardcoded + +/proc/meta_gas_list() + . = subtypesof(/datum/gas) + for(var/gas_path in .) + var/list/gas_info = new(13) + var/datum/gas/gas = gas_path + + gas_info[META_GAS_SPECIFIC_HEAT] = initial(gas.specific_heat) + gas_info[META_GAS_NAME] = initial(gas.name) + + gas_info[META_GAS_MOLES_VISIBLE] = initial(gas.moles_visible) + if(initial(gas.moles_visible) != null) + gas_info[META_GAS_OVERLAY] = generate_gas_overlay(gas) + + gas_info[META_GAS_FUSION_POWER] = initial(gas.fusion_power) + gas_info[META_GAS_DANGER] = initial(gas.dangerous) + gas_info[META_GAS_ID] = initial(gas.id) + gas_info[META_GAS_DESC] = initial(gas.desc) + .[gas_path] = gas_info + +/proc/generate_gas_overlay(datum/gas/gas_type) + var/fill = list() + for(var/j in 1 to TOTAL_VISIBLE_STATES) + var/obj/effect/overlay/gas/gas = new (initial(gas_type.gas_overlay), log(4, (j+0.4*TOTAL_VISIBLE_STATES) / (0.35*TOTAL_VISIBLE_STATES)) * 255) + fill += gas + return fill + +/proc/gas_id2path(id) + var/list/meta_gas = GLOB.meta_gas_info + if(id in meta_gas) + return id + for(var/path in meta_gas) + if(meta_gas[path][META_GAS_ID] == id) + return path + return "" + +/*||||||||||||||/----------\||||||||||||||*\ +||||||||||||||||[GAS DATUMS]|||||||||||||||| +||||||||||||||||\__________/|||||||||||||||| +||||These should never be instantiated. |||| +||||They exist only to make it easier |||| +||||to add a new gas. They are accessed |||| +||||only by meta_gas_list(). |||| +\*||||||||||||||||||||||||||||||||||||||||*/ + +/datum/gas + var/id = "" + var/specific_heat = 0 + var/name = "" + ///icon_state in icons/effects/atmospherics.dmi + var/gas_overlay = "" + var/moles_visible = null + ///currently used by canisters + var/dangerous = FALSE + ///How much the gas accelerates a fusion reaction + var/fusion_power = 0 + /// relative rarity compared to other gases, used when setting up the reactions list. + var/rarity = 0 + ///Can gas of this type can purchased through cargo? + var/purchaseable = FALSE + ///How does a single mole of this gas sell for? Formula to calculate maximum value is in code\modules\cargo\exports\large_objects.dm. Doesn't matter for roundstart gasses. + var/base_value = 0 + //Description + var/desc + ///RGB code for use when a generic color representing the gas is needed. Colors taken from contants.ts + var/primary_color + +/datum/gas/oxygen + id = GAS_O2 + specific_heat = 20 + name = "Oxygen" + rarity = 900 + purchaseable = TRUE + base_value = 0.2 + desc = "The gas most life forms need to be able to survive. Also an oxidizer." + primary_color = "#0000ff" + +/datum/gas/nitrogen + id = GAS_N2 + specific_heat = 20 + name = "Nitrogen" + rarity = 1000 + purchaseable = TRUE + base_value = 0.1 + desc = "A very common gas that used to pad artificial atmospheres to habitable pressure." + primary_color = COLOR_RED + +/datum/gas/carbon_dioxide //what the fuck is this? + id = GAS_CO2 + specific_heat = 30 + name = "Carbon Dioxide" + dangerous = TRUE + rarity = 700 + purchaseable = TRUE + base_value = 0.2 + desc = "What the fuck is carbon dioxide?" + primary_color = COLOR_GRAY + +/datum/gas/plasma + id = GAS_PLASMA + specific_heat = 200 + name = "Plasma" + gas_overlay = "plasma" + moles_visible = MOLES_GAS_VISIBLE + dangerous = TRUE + rarity = 800 + base_value = 1.5 + desc = "A flammable gas with many other curious properties. Its research is one of NT's primary objective." + primary_color = "#A020F0" + +/datum/gas/water_vapor + id = GAS_WATER_VAPOR + specific_heat = 40 + name = "Water Vapor" + gas_overlay = "water_vapor" + moles_visible = MOLES_GAS_VISIBLE + fusion_power = 8 + rarity = 500 + purchaseable = TRUE + base_value = 0.5 + desc = "Water, in gas form. Makes things slippery." + primary_color = "#b0c4de" + +/datum/gas/hypernoblium + id = GAS_HYPER_NOBLIUM + specific_heat = 2000 + name = "Hypernoblium" + gas_overlay = "freon" + moles_visible = MOLES_GAS_VISIBLE + fusion_power = 10 + rarity = 50 + base_value = 2.5 + desc = "The most noble gas of them all. High quantities of hyper-noblium actively prevents reactions from occurring." + primary_color = COLOR_TEAL + +/datum/gas/nitrous_oxide + id = GAS_N2O + specific_heat = 40 + name = "Nitrous Oxide" + gas_overlay = "nitrous_oxide" + moles_visible = MOLES_GAS_VISIBLE * 2 + fusion_power = 10 + dangerous = TRUE + rarity = 600 + purchaseable = TRUE + base_value = 1.5 + desc = "Causes drowsiness, euphoria, and eventually unconsciousness." + primary_color = "#ffe4c4" + +/datum/gas/nitryl + id = GAS_NITRYL + specific_heat = 10 + name = "Nitryl" + fusion_power = 7 + gas_overlay = "nitryl" + moles_visible = MOLES_GAS_VISIBLE + dangerous = TRUE + rarity = 1 + base_value = 6 + desc = "An experimental performance enhancing gas. Nitryl can have amplified effects as more of it gets into your bloodstream." + primary_color = "#a52a2a" + +/datum/gas/tritium + id = GAS_TRITIUM + specific_heat = 10 + name = "Tritium" + gas_overlay = "tritium" + moles_visible = MOLES_GAS_VISIBLE + dangerous = TRUE + fusion_power = 5 + rarity = 300 + base_value = 2.5 + desc = "A highly flammable and radioactive gas." + primary_color = "#32cd32" + +/datum/gas/bz + id = GAS_BZ + specific_heat = 20 + name = "BZ" + dangerous = TRUE + fusion_power = 8 + rarity = 400 + purchaseable = TRUE + base_value = 1.5 + desc = "A powerful hallucinogenic nerve agent able to induce cognitive damage." + primary_color = "#9370db" + +/datum/gas/pluoxium + id = GAS_PLUOXIUM + specific_heat = 80 + name = "Pluoxium" + fusion_power = -10 + rarity = 200 + base_value = 2.5 + desc = "A gas that could supply even more oxygen to the bloodstream when inhaled, without being an oxidizer." + primary_color = "#7b68ee" + +/datum/gas/stimulum + id = GAS_STIMULUM + specific_heat = 80 + name = "Stimulum" + rarity = 200 + base_value = 3 + desc = "An experimental gas that makes you stun and sleep immune and slightly regenerates stamina, but also causes suffocation the longer you've been breathing it." + primary_color = "#ffc0cb" + + +/obj/effect/overlay/gas + icon = 'icons/effects/atmospherics.dmi' + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE // should only appear in vis_contents, but to be safe + layer = FLY_LAYER + appearance_flags = TILE_BOUND + vis_flags = NONE + +/obj/effect/overlay/gas/New(state, alph) + . = ..() + icon_state = state + alpha = alph diff --git a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm index cd8b88d60fb49..45f9f96ad339c 100644 --- a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm +++ b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm @@ -2,35 +2,98 @@ //it can be changed, but any changes will ultimately be undone before they can have any effect /datum/gas_mixture/immutable - var/initial_temperature = 0 + var/initial_temperature + gc_share = TRUE /datum/gas_mixture/immutable/New() ..() - set_temperature(initial_temperature) - populate() - mark_immutable() + garbage_collect() -/datum/gas_mixture/immutable/proc/populate() - return +/datum/gas_mixture/immutable/garbage_collect() + temperature = initial_temperature + temperature_archived = initial_temperature + gases.Cut() + +/datum/gas_mixture/immutable/archive() + return TRUE //nothing changes, so we do nothing and the archive is successful + +/datum/gas_mixture/immutable/merge() + return FALSE //we're immutable. + +/datum/gas_mixture/immutable/share(datum/gas_mixture/sharer, our_coeff, sharer_coeff) + . = ..() + sharer.temperature = initial_temperature + garbage_collect() + +/datum/gas_mixture/immutable/react() + return FALSE //we're immutable. + +/datum/gas_mixture/immutable/copy() + return new type //we're immutable, so we can just return a new instance. + +/datum/gas_mixture/immutable/copy_from() + return FALSE //we're immutable. + +/datum/gas_mixture/immutable/copy_from_ratio() + return FALSE //we're immutable. + +/datum/gas_mixture/immutable/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity) + . = ..() + temperature = initial_temperature //used by space tiles /datum/gas_mixture/immutable/space initial_temperature = TCMB -/datum/gas_mixture/immutable/space/populate() - set_min_heat_capacity(HEAT_CAPACITY_VACUUM) +/datum/gas_mixture/immutable/space/heat_capacity() + return HEAT_CAPACITY_VACUUM -//used by cloners -/datum/gas_mixture/immutable/cloner - initial_temperature = T20C +/datum/gas_mixture/immutable/space/remove() + return copy() //we're always empty, so we can just return a copy. -/datum/gas_mixture/immutable/cloner/populate() - set_moles(GAS_N2, MOLES_O2STANDARD + MOLES_N2STANDARD) +/datum/gas_mixture/immutable/space/remove_ratio() + return copy() //we're always empty, so we can just return a copy. -//breathable planet surface +//planet side stuff /datum/gas_mixture/immutable/planetary - initial_temperature = T20C + var/list/initial_gas = list() + +/datum/gas_mixture/immutable/planetary/garbage_collect() + ..() + gases.Cut() + for(var/id in initial_gas) + ADD_GAS(id, gases) + gases[id][MOLES] = initial_gas[id][MOLES] + gases[id][ARCHIVE] = initial_gas[id][ARCHIVE] + +/datum/gas_mixture/immutable/planetary/proc/parse_string_immutable(gas_string) //I know I know, I need this tho + gas_string = SSair.preprocess_gas_string(gas_string) -/datum/gas_mixture/immutable/planetary/populate() - set_moles(GAS_O2, MOLES_O2STANDARD) - set_moles(GAS_N2, MOLES_N2STANDARD) + var/list/mix = initial_gas + var/list/gas = params2list(gas_string) + if(gas["TEMP"]) + initial_temperature = text2num(gas["TEMP"]) + temperature_archived = initial_temperature + temperature = initial_temperature + gas -= "TEMP" + mix.Cut() + for(var/id in gas) + var/path = id + if(!ispath(path)) + path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around + ADD_GAS(path, mix) + mix[path][MOLES] = text2num(gas[id]) + mix[path][ARCHIVE] = mix[path][MOLES] + + for(var/id in mix) + ADD_GAS(id, gases) + gases[id][MOLES] = mix[id][MOLES] + gases[id][ARCHIVE] = mix[id][MOLES] + +//used by cloners +//you may be wondering - why planetary? +//because this allows us to specify an initial gas mix AND keep it +//hoped for an initial_gas_string but apparently that's a turf thing +/datum/gas_mixture/immutable/planetary/cloner + initial_temperature = T20C + initial_gas = list(/datum/gas/nitrogen = list(MOLES = 104, ARCHIVE = 104)) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 476cb163fc20c..a071265b54879 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -1,68 +1,102 @@ -//All defines used in reactions are located in ..\__DEFINES\reactions.dm +//Most other defines used in reactions are located in ..\__DEFINES\reactions.dm #define SET_REACTION_RESULTS(amount) air.reaction_results[type] = amount /proc/init_gas_reactions() - . = list() - - for(var/r in subtypesof(/datum/gas_reaction)) - var/datum/gas_reaction/reaction = r + var/list/priority_reactions = list() + + //Builds a list of gas id to reaction group + for(var/gas_id in GLOB.meta_gas_info) + priority_reactions[gas_id] = list( + PRIORITY_PRE_FORMATION = list(), + PRIORITY_FORMATION = list(), + PRIORITY_POST_FORMATION = list(), + PRIORITY_FIRE = list() + ) + + for(var/datum/gas_reaction/reaction as anything in subtypesof(/datum/gas_reaction)) if(initial(reaction.exclude)) continue - reaction = new r - . += reaction - sortTim(., GLOBAL_PROC_REF(cmp_gas_reactions)) - -/proc/cmp_gas_reactions(list/datum/gas_reaction/a, list/datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list - if (!length(a) || !length(b)) - return length(b) - length(a) - var/maxa - var/maxb - for (var/datum/gas_reaction/R in a) - if (R.priority > maxa) - maxa = R.priority - for (var/datum/gas_reaction/R in b) - if (R.priority > maxb) - maxb = R.priority - return maxb - maxa + reaction = new reaction + var/datum/gas/reaction_key + for (var/req in reaction.requirements) + if (ispath(req)) + var/datum/gas/req_gas = req + if (!reaction_key || initial(reaction_key.rarity) > initial(req_gas.rarity)) + reaction_key = req_gas + reaction.major_gas = reaction_key + priority_reactions[reaction_key][reaction.priority_group] += reaction + + //Culls empty gases + for(var/gas_id in GLOB.meta_gas_info) + var/passed = FALSE + for(var/list/priority_grouping in priority_reactions[gas_id]) + if(length(priority_grouping)) + passed = TRUE + break + if(passed) + continue + priority_reactions[gas_id] = null + + return priority_reactions /datum/gas_reaction - //regarding the requirements lists: the minimum or maximum requirements must be non-zero. - //when in doubt, use MINIMUM_MOLE_COUNT. - var/list/min_requirements - var/list/max_requirements + /** + * Regarding the requirements list: the minimum or maximum requirements must be non-zero. + * When in doubt, use MINIMUM_MOLE_COUNT. + * Another thing to note is that reactions will not fire if we have any requirements outside of gas id path or MIN_TEMP or MAX_TEMP. + * More complex implementations will require modifications to gas_mixture.react() + */ + var/list/requirements + var/major_gas //the highest rarity gas used in the reaction. var/exclude = FALSE //do it this way to allow for addition/removal of reactions midmatch in the future - var/priority = 100 //lower numbers are checked/react later than higher numbers. if two reactions have the same priority they may happen in either order + ///The priority group this reaction is a part of. You can think of these as processing in batches, put your reaction into the one that's most fitting + var/priority_group var/name = "reaction" var/id = "r" + /// Whether the presence of our reaction should make fires bigger or not. + var/expands_hotspot = FALSE + /// A short string describing this reaction. + var/desc + /** REACTION FACTORS + * + * Describe (to a human) factors influencing this reaction in an assoc list format. + * Also include gases formed by the reaction + * Implement various interaction for different keys under subsystem/air/proc/atmos_handbook_init() + * + * E.G. + * factor["Temperature"] = "Minimum temperature of 20 kelvins, maximum temperature of 100 kelvins" + * factor[GAS_O2] = "Minimum oxygen amount of 20 moles, more oxygen increases reaction rate up to 150 moles" + */ + var/list/factor /datum/gas_reaction/New() init_reqs() + init_factors() -/datum/gas_reaction/proc/init_reqs() +/datum/gas_reaction/proc/init_reqs() // Override this + CRASH("Reaction [type] made without specifying requirements.") + +/datum/gas_reaction/proc/init_factors() /datum/gas_reaction/proc/react(datum/gas_mixture/air, atom/location) return NO_REACTION -/datum/gas_reaction/nobliumsupression - priority = INFINITY - name = "Hyper-Noblium Reaction Suppression" - id = "nobstop" - -/datum/gas_reaction/nobliumsupression/init_reqs() - min_requirements = list(GAS_HYPERNOB = REACTION_OPPRESSION_THRESHOLD) - -/datum/gas_reaction/nobliumsupression/react() - return STOP_REACTIONS -//water vapor: puts out fires? +/** + * Steam Condensation/Deposition: + * + * Makes turfs slippery. + * Can frost things if the gas is cold enough. + */ /datum/gas_reaction/water_vapor - priority = 1 - name = "Water Vapor" + priority_group = PRIORITY_POST_FORMATION + name = "Water Vapor Condensation" id = "vapor" + desc = "Water vapor condensation that can make things slippery." /datum/gas_reaction/water_vapor/init_reqs() - min_requirements = list( - GAS_H2O = MOLES_GAS_VISIBLE, + requirements = list( + /datum/gas/water_vapor = MOLES_GAS_VISIBLE, "MAX_TEMP" = WATER_VAPOR_CONDENSATION_POINT, ) @@ -73,7 +107,7 @@ var/turf/open/location = holder var/consumed = 0 - switch(air.return_temperature()) + switch(air.temperature) if(-INFINITY to WATER_VAPOR_DEPOSITION_POINT) if(location?.freeze_turf()) consumed = MOLES_GAS_VISIBLE @@ -82,286 +116,538 @@ consumed = MOLES_GAS_VISIBLE if(consumed) - air.adjust_moles(GAS_H2O, -consumed) + air.gases[/datum/gas/water_vapor][MOLES] -= consumed SET_REACTION_RESULTS(consumed) . = REACTING -//tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic -/datum/gas_reaction/nitrous_decomp - priority = 0 - name = "Nitrous Oxide Decomposition" - id = "nitrous_decomp" +// Fire: -/datum/gas_reaction/nitrous_decomp/init_reqs() - min_requirements = list( - "TEMP" = N2O_DECOMPOSITION_MIN_ENERGY, - GAS_NITROUS = MINIMUM_MOLE_COUNT - ) +/** + * Plasma combustion: + * + * Combustion of oxygen and plasma (mostly treated as hydrocarbons). + * The reaction rate is dependent on the temperature of the gasmix. + * May produce either tritium or carbon dioxide and water vapor depending on the fuel/oxydizer ratio of the gasmix. + */ +/datum/gas_reaction/plasmafire + priority_group = PRIORITY_FIRE + name = "Plasma Combustion" + id = "plasmafire" + expands_hotspot = TRUE + desc = "Combustion of oxygen and plasma. Able to produce tritium or carbon dioxade and water vapor." -/datum/gas_reaction/nitrous_decomp/react(datum/gas_mixture/air, datum/holder) - var/energy_released = 0 - var/old_heat_capacity = air.heat_capacity() //this speeds things up because accessing datum vars is slow - var/temperature = air.return_temperature() - var/burned_fuel = 0 +/datum/gas_reaction/plasmafire/init_reqs() + requirements = list( + /datum/gas/plasma = MINIMUM_MOLE_COUNT, + /datum/gas/oxygen = MINIMUM_MOLE_COUNT, + "MIN_TEMP" = PLASMA_MINIMUM_BURN_TEMPERATURE, + ) +/datum/gas_reaction/plasmafire/react(datum/gas_mixture/air, datum/holder) + // This reaction should proceed faster at higher temperatures. + var/temperature = air.temperature + var/temperature_scale = 0 + if(temperature > PLASMA_UPPER_TEMPERATURE) + temperature_scale = 1 + else + temperature_scale = (temperature - PLASMA_MINIMUM_BURN_TEMPERATURE) / (PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) + if(temperature_scale <= 0) + return NO_REACTION - burned_fuel = max(0,0.00002*(temperature-(0.00001*(temperature**2))))*air.get_moles(GAS_NITROUS) - air.set_moles(GAS_NITROUS, air.get_moles(GAS_NITROUS) - burned_fuel) + var/oxygen_burn_ratio = OXYGEN_BURN_RATIO_BASE - temperature_scale + var/plasma_burn_rate = 0 + var/super_saturation = FALSE // Whether we should make tritium. + var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow + switch(cached_gases[/datum/gas/oxygen][MOLES] / cached_gases[/datum/gas/plasma][MOLES]) + if(SUPER_SATURATION_THRESHOLD to INFINITY) + plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES] / PLASMA_BURN_RATE_DELTA) * temperature_scale + super_saturation = TRUE // Begin to form tritium + if(PLASMA_OXYGEN_FULLBURN to SUPER_SATURATION_THRESHOLD) + plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES] / PLASMA_BURN_RATE_DELTA) * temperature_scale + else + plasma_burn_rate = ((cached_gases[/datum/gas/oxygen][MOLES] / PLASMA_OXYGEN_FULLBURN) / PLASMA_BURN_RATE_DELTA) * temperature_scale - if(burned_fuel) - energy_released += (N2O_DECOMPOSITION_ENERGY_RELEASED * burned_fuel) + if(plasma_burn_rate < MINIMUM_HEAT_CAPACITY) + return NO_REACTION - air.set_moles(GAS_O2, air.get_moles(GAS_O2) + burned_fuel/2) - air.set_moles(GAS_N2, air.get_moles(GAS_N2) + burned_fuel) + var/old_heat_capacity = air.heat_capacity() + plasma_burn_rate = min(plasma_burn_rate, cached_gases[/datum/gas/plasma][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(oxygen_burn_ratio)) //Ensures matter is conserved properly + cached_gases[/datum/gas/plasma][MOLES] = QUANTIZE(cached_gases[/datum/gas/plasma][MOLES] - plasma_burn_rate) + cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (plasma_burn_rate * oxygen_burn_ratio)) + if (super_saturation) + ASSERT_GAS(/datum/gas/tritium, air) + cached_gases[/datum/gas/tritium][MOLES] += plasma_burn_rate + else + ASSERT_GAS(/datum/gas/carbon_dioxide, air) + ASSERT_GAS(/datum/gas/water_vapor, air) + cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate * 0.75 + cached_gases[/datum/gas/water_vapor][MOLES] += plasma_burn_rate * 0.25 + + SET_REACTION_RESULTS((plasma_burn_rate) * (1 + oxygen_burn_ratio)) + var/energy_released = FIRE_PLASMA_ENERGY_RELEASED * plasma_burn_rate + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = (temperature * old_heat_capacity + energy_released) / new_heat_capacity + + // Let the floor know a fire is happening + var/turf/open/location = holder + if(istype(location)) + temperature = air.temperature + if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + location.hotspot_expose(temperature, CELL_VOLUME) - var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature((temperature*old_heat_capacity + energy_released)/new_heat_capacity) - return REACTING - return NO_REACTION + return REACTING -//tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic +/** + * Tritium combustion: + * + * Combustion of oxygen and tritium (treated as hydrogen). + * Highly exothermic. + * Creates hotspots. + * Creates radiation. + */ /datum/gas_reaction/tritfire - priority = -1 //fire should ALWAYS be last, but tritium fires happen before plasma fires + priority_group = PRIORITY_FIRE name = "Tritium Combustion" id = "tritfire" + expands_hotspot = TRUE + desc = "Combustion of tritium with oxygen. Can be extremely fast and energetic if a few conditions are fulfilled." /datum/gas_reaction/tritfire/init_reqs() - min_requirements = list( - "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, - GAS_TRITIUM = MINIMUM_MOLE_COUNT, - GAS_O2 = MINIMUM_MOLE_COUNT + requirements = list( + /datum/gas/tritium = MINIMUM_MOLE_COUNT, + /datum/gas/oxygen = MINIMUM_MOLE_COUNT, + "MIN_TEMP" = TRITIUM_MINIMUM_BURN_TEMPERATURE, ) -/proc/fire_expose(turf/open/location, datum/gas_mixture/air, temperature) - if(istype(location) && temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) - location.hotspot_expose(temperature, CELL_VOLUME) - for(var/I in location) - var/atom/movable/item = I - item.temperature_expose(air, temperature, CELL_VOLUME) - location.temperature_expose(air, temperature, CELL_VOLUME) - -/proc/radiation_burn(turf/open/location, energy_released) - if(istype(location) && prob(10)) - radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR) - /datum/gas_reaction/tritfire/react(datum/gas_mixture/air, datum/holder) + var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow var/energy_released = 0 var/old_heat_capacity = air.heat_capacity() - var/temperature = air.return_temperature() - var/list/cached_results = air.reaction_results - cached_results["fire"] = 0 - var/turf/open/location = isturf(holder) ? holder : null + var/temperature = air.temperature + var/initial_tritium = cached_gases[/datum/gas/tritium][MOLES] var/burned_fuel = 0 - var/initial_trit = air.get_moles(GAS_TRITIUM)// Yogs - if(air.get_moles(GAS_O2) < initial_trit || MINIMUM_TRIT_OXYBURN_ENERGY > (temperature * old_heat_capacity))// Yogs -- Maybe a tiny performance boost? I'unno - burned_fuel = air.get_moles(GAS_O2)/TRITIUM_BURN_OXY_FACTOR - if(burned_fuel > initial_trit) burned_fuel = initial_trit //Yogs -- prevents negative moles of Tritium - air.adjust_moles(GAS_TRITIUM, -burned_fuel) + + if(cached_gases[/datum/gas/oxygen][MOLES] < initial_tritium || MINIMUM_TRIT_OXYBURN_ENERGY > (temperature * old_heat_capacity))// Yogs -- Maybe a tiny performance boost? I'unno + burned_fuel = cached_gases[/datum/gas/oxygen][MOLES] / TRITIUM_BURN_OXY_FACTOR + if(burned_fuel > initial_tritium) + burned_fuel = initial_tritium //Yogs -- prevents negative moles of Tritium + cached_gases[/datum/gas/tritium][MOLES] -= burned_fuel else - burned_fuel = initial_trit // Yogs -- Conservation of Mass fix - air.set_moles(GAS_TRITIUM, air.get_moles(GAS_TRITIUM) * (1 - 1/TRITIUM_BURN_TRIT_FACTOR)) // Yogs -- Maybe a tiny performance boost? I'unno - air.adjust_moles(GAS_O2, -air.get_moles(GAS_TRITIUM)) - energy_released += (FIRE_HYDROGEN_ENERGY_RELEASED * burned_fuel * (TRITIUM_BURN_TRIT_FACTOR - 1)) // Yogs -- Fixes low-energy tritium fires + burned_fuel = initial_tritium // Yogs -- Conservation of Mass fix + cached_gases[/datum/gas/tritium][MOLES] = ((cached_gases[/datum/gas/tritium][MOLES]) * (1 - 1 / TRITIUM_BURN_TRIT_FACTOR)) // Yogs -- Maybe a tiny performance boost? I'unno + cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/tritium][MOLES] + energy_released += (FIRE_TRITIUM_ENERGY_RELEASED * burned_fuel * (TRITIUM_BURN_TRIT_FACTOR - 1)) // Yogs -- Fixes low-energy tritium fires - if(burned_fuel) - energy_released += (FIRE_HYDROGEN_ENERGY_RELEASED * burned_fuel) - if(location && prob(10) && burned_fuel > TRITIUM_MINIMUM_RADIATION_ENERGY) //woah there let's not crash the server - radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR) + ASSERT_GAS(/datum/gas/water_vapor, air) + cached_gases[/datum/gas/water_vapor][MOLES] += burned_fuel + + SET_REACTION_RESULTS(burned_fuel) - //oxygen+more-or-less hydrogen=H2O - air.adjust_moles(GAS_H2O, burned_fuel )// Yogs -- Conservation of Mass + var/turf/open/location + if(istype(holder, /datum/pipenet)) //Find the tile the reaction is occurring on, or a random part of the network if it's a pipenet. + var/datum/pipenet/pipenet = holder + location = pick(pipenet.members) + else if(isatom(holder)) + location = holder - cached_results["fire"] += burned_fuel + if(burned_fuel) + energy_released += (FIRE_TRITIUM_ENERGY_RELEASED * burned_fuel) + if(location && prob(10) && burned_fuel > TRITIUM_MINIMUM_RADIATION_ENERGY) //woah there let's not crash the server + radiation_pulse(location, energy_released / TRITIUM_BURN_RADIOACTIVITY_FACTOR) if(energy_released > 0) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature((temperature*old_heat_capacity + energy_released)/new_heat_capacity) + air.temperature = ((temperature * old_heat_capacity + energy_released) / new_heat_capacity) //let the floor know a fire is happening if(istype(location)) - temperature = air.return_temperature() + temperature = air.temperature if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) location.hotspot_expose(temperature, CELL_VOLUME) - for(var/I in location) - var/atom/movable/item = I - item.temperature_expose(air, temperature, CELL_VOLUME) - location.temperature_expose(air, temperature, CELL_VOLUME) - return cached_results["fire"] ? REACTING : NO_REACTION + return burned_fuel ? REACTING : NO_REACTION + +// N2O + +/** + * Nitrous oxide Formation: + * + * Formation of N2O. + * Endothermic. + * Requires BZ as a catalyst. + */ +/datum/gas_reaction/nitrousformation //formation of n2o, exothermic, requires bz as catalyst + priority_group = PRIORITY_FORMATION + name = "Nitrous Oxide Formation" + id = "nitrousformation" + desc = "Production of nitrous oxide with BZ as a catalyst." + +/datum/gas_reaction/nitrousformation/init_reqs() + requirements = list( + /datum/gas/oxygen = 10, + /datum/gas/nitrogen = 20, + /datum/gas/bz = 5, + "MIN_TEMP" = N2O_FORMATION_MIN_TEMPERATURE, + "MAX_TEMP" = N2O_FORMATION_MAX_TEMPERATURE, + ) -//plasma combustion: combustion of oxygen and plasma (treated as hydrocarbons). creates hotspots. exothermic -/datum/gas_reaction/plasmafire - priority = -2 //fire should ALWAYS be last, but plasma fires happen after tritium fires - name = "Plasma Combustion" - id = "plasmafire" +/datum/gas_reaction/nitrousformation/react(datum/gas_mixture/air) + var/list/cached_gases = air.gases + var/heat_efficiency = min(cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5), cached_gases[/datum/gas/nitrogen][MOLES]) + if ((cached_gases[/datum/gas/oxygen][MOLES] - heat_efficiency * 0.5 < 0 ) || (cached_gases[/datum/gas/nitrogen][MOLES] - heat_efficiency < 0)) + return NO_REACTION // Shouldn't produce gas from nothing. -/datum/gas_reaction/plasmafire/init_reqs() - min_requirements = list( - "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, - GAS_PLASMA = MINIMUM_MOLE_COUNT, - GAS_O2 = MINIMUM_MOLE_COUNT + var/old_heat_capacity = air.heat_capacity() + cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficiency * 0.5 + cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficiency + ASSERT_GAS(/datum/gas/nitrous_oxide, air) + cached_gases[/datum/gas/nitrous_oxide][MOLES] += heat_efficiency + + SET_REACTION_RESULTS(heat_efficiency) + var/energy_released = heat_efficiency * N2O_FORMATION_ENERGY + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = max(((air.temperature * old_heat_capacity + energy_released) / new_heat_capacity), TCMB) // The air cools down when reacting. + return REACTING + + +/** + * Nitrous Oxide Decomposition + * + * Decomposition of N2O. + * Exothermic. + */ +/datum/gas_reaction/nitrous_decomp + priority_group = PRIORITY_POST_FORMATION + name = "Nitrous Oxide Decomposition" + id = "nitrous_decomp" + desc = "Decomposition of nitrous oxide under high temperature." + +/datum/gas_reaction/nitrous_decomp/init_reqs() + requirements = list( + /datum/gas/nitrous_oxide = MINIMUM_MOLE_COUNT * 2, + "MIN_TEMP" = N2O_DECOMPOSITION_MIN_TEMPERATURE, + "MAX_TEMP" = N2O_DECOMPOSITION_MAX_TEMPERATURE, ) -/datum/gas_reaction/plasmafire/react(datum/gas_mixture/air, datum/holder) - var/energy_released = 0 +/datum/gas_reaction/nitrous_decomp/react(datum/gas_mixture/air, datum/holder) + var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow + var/temperature = air.temperature + var/burned_fuel = (cached_gases[/datum/gas/nitrous_oxide][MOLES] / N2O_DECOMPOSITION_RATE_DIVISOR) * ((temperature - N2O_DECOMPOSITION_MIN_SCALE_TEMP) * (temperature - N2O_DECOMPOSITION_MAX_SCALE_TEMP) / (N2O_DECOMPOSITION_SCALE_DIVISOR)) + if(burned_fuel <= 0) + return NO_REACTION + if(cached_gases[/datum/gas/nitrous_oxide][MOLES] - burned_fuel < 0) + return NO_REACTION + var/old_heat_capacity = air.heat_capacity() - var/temperature = air.return_temperature() - var/list/cached_results = air.reaction_results - cached_results["fire"] = 0 - var/turf/open/location = isturf(holder) ? holder : null + cached_gases[/datum/gas/nitrous_oxide][MOLES] -= burned_fuel + ASSERT_GAS(/datum/gas/nitrogen, air) + cached_gases[/datum/gas/nitrogen][MOLES] += burned_fuel + ASSERT_GAS(/datum/gas/oxygen, air) + cached_gases[/datum/gas/oxygen][MOLES] += burned_fuel / 2 + + SET_REACTION_RESULTS(burned_fuel) + var/energy_released = N2O_DECOMPOSITION_ENERGY * burned_fuel + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = (temperature * old_heat_capacity + energy_released) / new_heat_capacity + return REACTING + + +// BZ + +/** + * BZ Formation + * + * Formation of BZ by combining plasma and nitrous oxide at low pressures. + * Exothermic. + */ +/datum/gas_reaction/bzformation + priority_group = PRIORITY_FORMATION + name = "BZ Gas Formation" + id = "bzformation" + desc = "Production of BZ using plasma and nitrous oxide." - //Handle plasma burning - var/plasma_burn_rate = 0 - var/oxygen_burn_rate = 0 - //more plasma released at higher temperatures - var/temperature_scale = 0 - //to make tritium - var/super_saturation = FALSE +/datum/gas_reaction/bzformation/init_reqs() + requirements = list( + /datum/gas/nitrous_oxide = 10, + /datum/gas/plasma = 10, + "MAX_TEMP" = BZ_FORMATION_MAX_TEMPERATURE, + ) - if(temperature > PLASMA_UPPER_TEMPERATURE) - temperature_scale = 1 - else - temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) - if(temperature_scale > 0) - oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale - if(air.get_moles(GAS_O2) / air.get_moles(GAS_PLASMA) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium. - super_saturation = TRUE - if(air.get_moles(GAS_O2) > air.get_moles(GAS_PLASMA)*PLASMA_OXYGEN_FULLBURN) - plasma_burn_rate = (air.get_moles(GAS_PLASMA)*temperature_scale)/PLASMA_BURN_RATE_DELTA - else - plasma_burn_rate = (temperature_scale*(air.get_moles(GAS_O2)/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA +/datum/gas_reaction/bzformation/react(datum/gas_mixture/air) + var/list/cached_gases = air.gases + var/pressure = air.return_pressure() + var/volume = air.return_volume() + var/environment_effciency = volume/pressure //More volume and less pressure gives better rates + var/ratio_efficency = min(cached_gases[/datum/gas/nitrous_oxide][MOLES]/cached_gases[/datum/gas/plasma][MOLES], 1) //Less n2o than plasma give lower rates + var/nitrous_oxide_decomposed_factor = max(4 * (cached_gases[/datum/gas/plasma][MOLES] / (cached_gases[/datum/gas/nitrous_oxide][MOLES] + cached_gases[/datum/gas/plasma][MOLES]) - 0.75), 0) // Nitrous oxide decomposes when there are more than 3 parts plasma per n2o. + var/bz_formed = min(0.01 * ratio_efficency * environment_effciency, cached_gases[/datum/gas/nitrous_oxide][MOLES] * INVERSE(0.4), cached_gases[/datum/gas/plasma][MOLES] * INVERSE(0.8 * (1 - nitrous_oxide_decomposed_factor))) + + if (cached_gases[/datum/gas/nitrous_oxide][MOLES] - bz_formed * 0.4 < 0 || cached_gases[/datum/gas/plasma][MOLES] - 0.8 * bz_formed * (1 - nitrous_oxide_decomposed_factor) < 0 || bz_formed <= 0) + return NO_REACTION + + var/old_heat_capacity = air.heat_capacity() - if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) - plasma_burn_rate = min(plasma_burn_rate,air.get_moles(GAS_PLASMA),air.get_moles(GAS_O2)/oxygen_burn_rate) //Ensures matter is conserved properly - air.set_moles(GAS_PLASMA, QUANTIZE(air.get_moles(GAS_PLASMA) - plasma_burn_rate)) - air.set_moles(GAS_O2, QUANTIZE(air.get_moles(GAS_O2) - (plasma_burn_rate * oxygen_burn_rate))) - if (super_saturation) - air.adjust_moles(GAS_TRITIUM, plasma_burn_rate) - else - air.adjust_moles(GAS_CO2, plasma_burn_rate) + /** + *If n2o-plasma ratio is less than 1:3 start decomposing n2o. + *Rate of decomposition vs BZ production increases as n2o concentration gets lower + *Plasma acts as a catalyst on decomposition, so it doesn't get consumed in the process. + *N2O decomposes with its normal decomposition energy + */ + if (nitrous_oxide_decomposed_factor>0) + ASSERT_GAS(/datum/gas/nitrogen, air) + ASSERT_GAS(/datum/gas/oxygen, air) + var/amount_decomposed = 0.4 * bz_formed * nitrous_oxide_decomposed_factor + cached_gases[/datum/gas/nitrogen] += amount_decomposed + cached_gases[/datum/gas/oxygen] += 0.5 * amount_decomposed + + ASSERT_GAS(/datum/gas/bz, air) + cached_gases[/datum/gas/bz][MOLES] += bz_formed * (1-nitrous_oxide_decomposed_factor) + cached_gases[/datum/gas/nitrous_oxide][MOLES] -= 0.4 * bz_formed + cached_gases[/datum/gas/plasma][MOLES] -= 0.8 * bz_formed * (1-nitrous_oxide_decomposed_factor) + + SET_REACTION_RESULTS(bz_formed) + var/energy_released = bz_formed * (BZ_FORMATION_ENERGY + nitrous_oxide_decomposed_factor * (N2O_DECOMPOSITION_ENERGY - BZ_FORMATION_ENERGY)) + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = max(((air.temperature * old_heat_capacity + energy_released) / new_heat_capacity), TCMB) + return REACTING + + +// Pluoxium + +/** + * Pluoxium Formation: + * + * Consumes a tiny amount of tritium to convert CO2 and oxygen to pluoxium. + * Exothermic. + */ +/datum/gas_reaction/pluox_formation + priority_group = PRIORITY_FORMATION + name = "Pluoxium Formation" + id = "pluox_formation" + desc = "Alternate production for pluoxium which uses tritium." + +/datum/gas_reaction/pluox_formation/init_reqs() + requirements = list( + /datum/gas/carbon_dioxide = MINIMUM_MOLE_COUNT, + /datum/gas/oxygen = MINIMUM_MOLE_COUNT, + /datum/gas/tritium = MINIMUM_MOLE_COUNT, + "MIN_TEMP" = PLUOXIUM_FORMATION_MIN_TEMP, + "MAX_TEMP" = PLUOXIUM_FORMATION_MAX_TEMP, + ) - energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) +/datum/gas_reaction/pluox_formation/react(datum/gas_mixture/air, datum/holder) + var/list/cached_gases = air.gases + var/produced_amount = min(PLUOXIUM_FORMATION_MAX_RATE, cached_gases[/datum/gas/carbon_dioxide][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5), cached_gases[/datum/gas/tritium][MOLES] * INVERSE(0.01)) + if (produced_amount <= 0 || cached_gases[/datum/gas/carbon_dioxide][MOLES] - produced_amount < 0 || cached_gases[/datum/gas/oxygen][MOLES] - produced_amount * 0.5 < 0 || cached_gases[/datum/gas/tritium][MOLES] - produced_amount * 0.01 < 0) + return NO_REACTION - cached_results["fire"] += (plasma_burn_rate)*(1+oxygen_burn_rate) + var/old_heat_capacity = air.heat_capacity() + cached_gases[/datum/gas/carbon_dioxide][MOLES] -= produced_amount + cached_gases[/datum/gas/oxygen][MOLES] -= produced_amount * 0.5 + cached_gases[/datum/gas/tritium][MOLES] -= produced_amount * 0.01 + ASSERT_GAS(/datum/gas/pluoxium, air) + cached_gases[/datum/gas/pluoxium][MOLES] += produced_amount + + SET_REACTION_RESULTS(produced_amount) + var/energy_released = produced_amount * PLUOXIUM_FORMATION_ENERGY + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = max((air.temperature * old_heat_capacity + energy_released) / new_heat_capacity, TCMB) + return REACTING + + +// Nitryl + +/** + * Nitryl Formation: + * + * The formation of nitryl. + * Endothermic. + * Requires BZ. + */ +/datum/gas_reaction/nitryl_formation + priority_group = PRIORITY_FORMATION + name = "Nitryl Formation" + id = "nitryl_formation" + desc = "Production of nitryl from BZ, tritium, and nitrogen." + +/datum/gas_reaction/nitryl_formation/init_reqs() + requirements = list( + /datum/gas/tritium = 20, + /datum/gas/nitrogen = 10, + /datum/gas/bz = 5, + "MIN_TEMP" = NITRYL_FORMATION_MIN_TEMP, + ) - if(energy_released > 0) +/datum/gas_reaction/nitryl_formation/react(datum/gas_mixture/air) + var/list/cached_gases = air.gases + var/temperature = air.temperature + var/heat_efficiency = min(temperature / NITRYL_FORMATION_TEMP_DIVISOR, cached_gases[/datum/gas/tritium][MOLES], cached_gases[/datum/gas/nitrogen][MOLES], cached_gases[/datum/gas/bz][MOLES] * INVERSE(0.05)) + + if( heat_efficiency <= 0 || (cached_gases[/datum/gas/tritium][MOLES] - heat_efficiency < 0 ) || (cached_gases[/datum/gas/nitrogen][MOLES] - heat_efficiency < 0) || (cached_gases[/datum/gas/bz][MOLES] - heat_efficiency * 0.05 < 0)) //Shouldn't produce gas from nothing. + return NO_REACTION + + var/old_heat_capacity = air.heat_capacity() + ASSERT_GAS(/datum/gas/nitryl, air) + cached_gases[/datum/gas/tritium][MOLES] -= heat_efficiency + cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficiency + cached_gases[/datum/gas/bz][MOLES] -= heat_efficiency * 0.05 //bz gets consumed to balance the nitryl production and not make it too common and/or easy + cached_gases[/datum/gas/nitryl][MOLES] += heat_efficiency + + SET_REACTION_RESULTS(heat_efficiency) + var/energy_used = heat_efficiency * NITRYL_FORMATION_ENERGY + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = max(((temperature * old_heat_capacity - energy_used) / new_heat_capacity), TCMB) //the air cools down when reacting + return REACTING + + +/** + * Nitryl Decomposition: + * + * The decomposition of nitryl. + * Exothermic. + * Requires oxygen as catalyst. + */ +/datum/gas_reaction/nitryl_decomposition + priority_group = PRIORITY_PRE_FORMATION + name = "Nitryl Decomposition" + id = "nitryl_decomp" + desc = "Decomposition of nitryl when exposed to oxygen under normal temperatures." + +/datum/gas_reaction/nitryl_decomposition/init_reqs() + requirements = list( + /datum/gas/oxygen = MINIMUM_MOLE_COUNT, + /datum/gas/nitryl = MINIMUM_MOLE_COUNT, + "MAX_TEMP" = NITRYL_DECOMPOSITION_MAX_TEMP, + ) + +/datum/gas_reaction/nitryl_decomposition/react(datum/gas_mixture/air) + var/list/cached_gases = air.gases + var/temperature = air.temperature + + //This reaction is aggressively slow. like, a tenth of a mole per fire slow. Keep that in mind + var/heat_efficiency = min(temperature / NITRYL_DECOMPOSITION_TEMP_DIVISOR, cached_gases[/datum/gas/nitryl][MOLES]) + + if (heat_efficiency <= 0 || (cached_gases[/datum/gas/nitryl][MOLES] - heat_efficiency < 0)) //Shouldn't produce gas from nothing. + return NO_REACTION + + var/old_heat_capacity = air.heat_capacity() + air.assert_gases(/datum/gas/nitrogen) + cached_gases[/datum/gas/nitryl][MOLES] -= heat_efficiency + cached_gases[/datum/gas/nitrogen][MOLES] += heat_efficiency + + SET_REACTION_RESULTS(heat_efficiency) + var/energy_released = heat_efficiency * NITRYL_DECOMPOSITION_ENERGY + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = max(((temperature * old_heat_capacity + energy_released) / new_heat_capacity), TCMB) //the air heats up when reacting + return REACTING + + + +/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic. + priority_group = PRIORITY_FORMATION + name = "Stimulum formation" + id = "stimformation" + +/datum/gas_reaction/stimformation/init_reqs() + requirements = list( + /datum/gas/tritium = 30, + /datum/gas/bz = 20, + /datum/gas/nitryl = 30, + /datum/gas/plasma = MINIMUM_MOLE_COUNT, + "MIN_TEMP" = STIMULUM_MINIMUM_TEMPERATURE) + +/datum/gas_reaction/stimformation/react(datum/gas_mixture/air) + var/list/cached_gases = air.gases + + var/old_heat_capacity = air.heat_capacity() + var/heat_scale = min(air.temperature/STIMULUM_HEAT_SCALE, cached_gases[/datum/gas/tritium][MOLES], cached_gases[/datum/gas/plasma][MOLES], cached_gases[/datum/gas/nitryl][MOLES]) + var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE * (heat_scale ** 2) - STIMULUM_FIRST_DROP * (heat_scale ** 3) + STIMULUM_SECOND_RISE * (heat_scale ** 4) - STIMULUM_ABSOLUTE_DROP * (heat_scale ** 5) + ASSERT_GAS(/datum/gas/stimulum, air) + if ((cached_gases[/datum/gas/tritium][MOLES] - heat_scale < 0 ) || (cached_gases[/datum/gas/nitryl][MOLES] - heat_scale < 0)) //Shouldn't produce gas from nothing. + return NO_REACTION + cached_gases[/datum/gas/tritium][MOLES] -= heat_scale + cached_gases[/datum/gas/nitryl][MOLES] -= heat_scale + cached_gases[/datum/gas/stimulum][MOLES] += heat_scale * 0.75 + + if(stim_energy_change) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature((temperature*old_heat_capacity + energy_released)/new_heat_capacity) + air.temperature = max(((air.temperature * old_heat_capacity + stim_energy_change) / new_heat_capacity), TCMB) + return REACTING - //let the floor know a fire is happening - if(istype(location)) - temperature = air.return_temperature() - if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) - location.hotspot_expose(temperature, CELL_VOLUME) - for(var/I in location) - var/atom/movable/item = I - item.temperature_expose(air, temperature, CELL_VOLUME) - location.temperature_expose(air, temperature, CELL_VOLUME) - - return cached_results["fire"] ? REACTING : NO_REACTION - -/datum/gas_reaction/genericfire - priority = -3 // very last reaction - name = "Combustion" - id = "genericfire" - -/datum/gas_reaction/genericfire/init_reqs() - var/lowest_fire_temp = INFINITY - var/list/fire_temperatures = GLOB.gas_data.fire_temperatures - for(var/gas in fire_temperatures) - lowest_fire_temp = min(lowest_fire_temp, fire_temperatures[gas]) - var/lowest_oxi_temp = INFINITY - var/list/oxidation_temperatures = GLOB.gas_data.oxidation_temperatures - for(var/gas in oxidation_temperatures) - lowest_oxi_temp = min(lowest_oxi_temp, oxidation_temperatures[gas]) - min_requirements = list( - "TEMP" = max(lowest_oxi_temp, lowest_fire_temp), - "FIRE_REAGENTS" = MINIMUM_MOLE_COUNT +/** + * Hyper-Noblium Formation: + * + * Extremely exothermic. + * Requires very low temperatures. + * Due to its high mass, hyper-noblium uses large amounts of nitrogen and tritium. + * BZ can be used as a catalyst to make it less exothermic. + */ +/datum/gas_reaction/nobliumformation + priority_group = PRIORITY_FORMATION + name = "Hyper-Noblium Condensation" + id = "nobformation" + desc = "Production of hyper-noblium from nitrogen and tritium under very low temperatures. Extremely energetic." + +/datum/gas_reaction/nobliumformation/init_reqs() + requirements = list( + /datum/gas/nitrogen = 10, + /datum/gas/tritium = 5, + "MIN_TEMP" = NOBLIUM_FORMATION_MIN_TEMP, + "MAX_TEMP" = NOBLIUM_FORMATION_MAX_TEMP, ) -// no requirements, always runs -// bad idea? maybe -// this is overridden by auxmos but, hey, good idea to have it readable - -/datum/gas_reaction/genericfire/react(datum/gas_mixture/air, datum/holder) - var/temperature = air.return_temperature() - var/list/oxidation_temps = GLOB.gas_data.oxidation_temperatures - var/list/oxidation_rates = GLOB.gas_data.oxidation_rates - var/oxidation_power = 0 - var/list/burn_results = list() - var/list/fuels = list() - var/list/oxidizers = list() - var/list/fuel_rates = GLOB.gas_data.fire_burn_rates - var/list/fuel_temps = GLOB.gas_data.fire_temperatures - var/total_fuel = 0 - var/energy_released = 0 - for(var/G in air.get_gases()) - var/oxidation_temp = oxidation_temps[G] - if(oxidation_temp && oxidation_temp > temperature) - var/temperature_scale = max(0, 1-(temperature / oxidation_temp)) - var/amt = air.get_moles(G) * temperature_scale - oxidizers[G] = amt - oxidation_power += amt * oxidation_rates[G] - else - var/fuel_temp = fuel_temps[G] - if(fuel_temp && fuel_temp > temperature) - var/amt = (air.get_moles(G) / fuel_rates[G]) * max(0, 1-(temperature / fuel_temp)) - fuels[G] = amt // we have to calculate the actual amount we're using after we get all oxidation together - total_fuel += amt - if(oxidation_power <= 0 || total_fuel <= 0) +/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air) + var/list/cached_gases = air.gases + /// List of gases we will assert, and possibly garbage collect. + var/list/asserted_gases = list(/datum/gas/hypernoblium, /datum/gas/bz) + air.assert_gases(arglist(asserted_gases)) + var/reduction_factor = clamp(cached_gases[/datum/gas/tritium][MOLES] / (cached_gases[/datum/gas/tritium][MOLES] + cached_gases[/datum/gas/bz][MOLES]), 0.001 , 1) //reduces trit consumption in presence of bz upward to 0.1% reduction + var/nob_formed = min((cached_gases[/datum/gas/nitrogen][MOLES] + cached_gases[/datum/gas/tritium][MOLES]) * 0.01, cached_gases[/datum/gas/tritium][MOLES] * INVERSE(5 * reduction_factor), cached_gases[/datum/gas/nitrogen][MOLES] * INVERSE(10)) + if (nob_formed <= 0 || (cached_gases[/datum/gas/tritium][MOLES] - 5 * nob_formed * reduction_factor < 0) || (cached_gases[/datum/gas/nitrogen][MOLES] - 10 * nob_formed < 0)) + air.garbage_collect(arglist(asserted_gases)) return NO_REACTION - var/oxidation_ratio = oxidation_power / total_fuel - if(oxidation_ratio > 1) - for(var/oxidizer in oxidizers) - oxidizers[oxidizer] /= oxidation_ratio - else if(oxidation_ratio < 1) - for(var/fuel in fuels) - fuels[fuel] *= oxidation_ratio - fuels += oxidizers - var/list/fire_products = GLOB.gas_data.fire_products - var/list/fire_enthalpies = GLOB.gas_data.enthalpies - for(var/fuel in fuels + oxidizers) - var/amt = fuels[fuel] - if(!burn_results[fuel]) - burn_results[fuel] = 0 - burn_results[fuel] -= amt - energy_released += amt * fire_enthalpies[fuel] - for(var/product in fire_products[fuel]) - if(!burn_results[product]) - burn_results[product] = 0 - burn_results[product] += amt - var/final_energy = air.thermal_energy() + energy_released - for(var/result in burn_results) - air.adjust_moles(result, burn_results[result]) - air.set_temperature(final_energy / air.heat_capacity()) - var/list/cached_results = air.reaction_results - cached_results["fire"] = min(total_fuel, oxidation_power) * 2 - return cached_results["fire"] ? REACTING : NO_REACTION + + var/old_heat_capacity = air.heat_capacity() + cached_gases[/datum/gas/tritium][MOLES] -= 5 * nob_formed * reduction_factor + cached_gases[/datum/gas/nitrogen][MOLES] -= 10 * nob_formed + cached_gases[/datum/gas/hypernoblium][MOLES] += nob_formed // I'm not going to nitpick, but N20H10 feels like it should be an explosive more than anything. + SET_REACTION_RESULTS(nob_formed) + var/energy_released = nob_formed * (NOBLIUM_FORMATION_ENERGY / (max(cached_gases[/datum/gas/bz][MOLES], 1))) + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.temperature = max(((air.temperature * old_heat_capacity + energy_released) / new_heat_capacity), TCMB) + return REACTING //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again! //Fusion Rework Counter: Please increment this if you make a major overhaul to this system again. -//6 reworks +//7 reworks /datum/gas_reaction/fusion exclude = FALSE - priority = 2 + priority_group = PRIORITY_FORMATION name = "Plasmic Fusion" id = "fusion" /datum/gas_reaction/fusion/init_reqs() - min_requirements = list( - "TEMP" = FUSION_TEMPERATURE_THRESHOLD, - GAS_TRITIUM = FUSION_TRITIUM_MOLES_USED, - GAS_PLASMA = FUSION_MOLE_THRESHOLD, - GAS_CO2 = FUSION_MOLE_THRESHOLD) + requirements = list( + /datum/gas/tritium = FUSION_TRITIUM_MOLES_USED, + /datum/gas/plasma = FUSION_MOLE_THRESHOLD, + /datum/gas/carbon_dioxide = FUSION_MOLE_THRESHOLD, + "MIN_TEMP" = FUSION_TEMPERATURE_THRESHOLD) /datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder) var/turf/open/location - if (istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet. - var/datum/pipeline/fusion_pipenet = holder + if (istype(holder,/datum/pipenet)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet. + var/datum/pipenet/fusion_pipenet = holder location = get_turf(pick(fusion_pipenet.members)) else location = get_turf(holder) @@ -370,8 +656,8 @@ var/list/cached_scan_results = air.analyzer_results var/thermal_energy = air.thermal_energy() var/reaction_energy = 0 //Reaction energy can be negative or positive, for both exothermic and endothermic reactions. - var/initial_plasma = air.get_moles(GAS_PLASMA) - var/initial_carbon = air.get_moles(GAS_CO2) + var/initial_plasma = GET_MOLES(/datum/gas/plasma, air) + var/initial_carbon = GET_MOLES(/datum/gas/carbon_dioxide, air) var/scale_factor = max(air.return_volume() / FUSION_SCALE_DIVISOR, FUSION_MINIMAL_SCALE) var/temperature_scale = log(10, air.return_temperature()) //The size of the phase space hypertorus @@ -380,8 +666,8 @@ (temperature_scale-FUSION_BASE_TEMPSCALE) / FUSION_BUFFER_DIVISOR \ : 4 ** (temperature_scale-FUSION_BASE_TEMPSCALE) / FUSION_SLOPE_DIVISOR) var/gas_power = 0 - for (var/gas_id in air.get_gases()) - gas_power += (GLOB.gas_data.fusion_powers[gas_id]*air.get_moles(gas_id)) + for (var/datum/gas/gas_id as anything in air.gases) + gas_power += initial(gas_id.fusion_power)*air.gases[gas_id][MOLES] var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR),toroidal_size) //Instability effects how chaotic the behavior of the reaction is cached_scan_results[id] = instability//used for analyzer feedback @@ -392,9 +678,10 @@ plasma = MODULUS(plasma - (instability*sin(TODEGREES(carbon))), toroidal_size) carbon = MODULUS(carbon - plasma, toroidal_size) - air.set_moles(GAS_PLASMA, plasma*scale_factor + FUSION_MOLE_THRESHOLD )//Scales the gases back up - air.set_moles(GAS_CO2, carbon*scale_factor + FUSION_MOLE_THRESHOLD) - var/delta_plasma = min(initial_plasma - air.get_moles(GAS_PLASMA), toroidal_size * scale_factor * 1.5) + SET_MOLES(/datum/gas/plasma, air, plasma * scale_factor + FUSION_MOLE_THRESHOLD) //Scales the gases back up + SET_MOLES(/datum/gas/carbon_dioxide, air, carbon * scale_factor + FUSION_MOLE_THRESHOLD) + + var/delta_plasma = min(initial_plasma - air.gases[/datum/gas/plasma][MOLES], toroidal_size * scale_factor * 1.5) //Energy is gained or lost corresponding to the creation or destruction of mass. //Low instability prevents endothermality while higher instability acutally encourages it. @@ -414,193 +701,31 @@ thermal_energy = middle_energy * 10 ** log(FUSION_ENERGY_TRANSLATION_EXPONENT, (thermal_energy + bowdlerized_reaction_energy) / middle_energy) //The reason why you should set up a tritium production line. - air.adjust_moles(GAS_TRITIUM, -FUSION_TRITIUM_MOLES_USED) + REMOVE_MOLES(/datum/gas/tritium, air, FUSION_TRITIUM_MOLES_USED) //The decay of the tritium and the reaction's energy produces waste gases, different ones depending on whether the reaction is endo or exothermic var/standard_waste_gas_output = scale_factor * (FUSION_TRITIUM_CONVERSION_COEFFICIENT*FUSION_TRITIUM_MOLES_USED) - delta_plasma > 0 ? air.adjust_moles(GAS_H2O, standard_waste_gas_output) : air.adjust_moles(GAS_BZ, standard_waste_gas_output) - air.adjust_moles(GAS_O2, standard_waste_gas_output) //Oxygen is a bit touchy subject + if (delta_plasma > 0) + ADD_MOLES(/datum/gas/water_vapor, air, standard_waste_gas_output) + else + ADD_MOLES(/datum/gas/bz, air, standard_waste_gas_output) + //Oxygen is a bit touchy subject + ADD_MOLES(/datum/gas/oxygen, air, standard_waste_gas_output) if(reaction_energy) if(location) - var/standard_energy = 400 * air.get_moles(GAS_PLASMA) * air.return_temperature() //Prevents putting meaningless waste gases to achieve high rads. + var/standard_energy = 400 * air.gases[/datum/gas/plasma][MOLES] * air.return_temperature() //Prevents putting meaningless waste gases to achieve high rads. if(prob(PERCENT(((PARTICLE_CHANCE_CONSTANT)/(reaction_energy-PARTICLE_CHANCE_CONSTANT)) + 1))) //Asymptopically approaches 100% as the energy of the reaction goes up. location.fire_nuclear_particle(customize = TRUE, custompower = standard_energy) radiation_pulse(location, max(2000 * 3 ** (log(10,standard_energy) - FUSION_RAD_MIDPOINT), 0)) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) + air.temperature = clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY) return REACTING else if(reaction_energy == 0 && instability <= FUSION_INSTABILITY_ENDOTHERMALITY) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) //THIS SHOULD STAY OR FUSION WILL EAT YOUR FACE - return REACTING - -/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst. - priority = 3 - name = "Nitryl formation" - id = "nitrylformation" - -/datum/gas_reaction/nitrylformation/init_reqs() - min_requirements = list( - GAS_O2 = 20, - GAS_N2 = 20, - GAS_PLUOXIUM = 5, //Gates Nitryl behind pluoxium to offset N2O burning up during formation - "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60 - ) - -/datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air) - var/temperature = air.return_temperature() - - var/old_heat_capacity = air.heat_capacity() - var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60),air.get_moles(GAS_O2),air.get_moles(GAS_N2)) - var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY - if ((air.get_moles(GAS_O2) - heat_efficency < 0 )|| (air.get_moles(GAS_N2) - heat_efficency < 0)) //Shouldn't produce gas from nothing. - return NO_REACTION - air.adjust_moles(GAS_O2, -heat_efficency) - air.adjust_moles(GAS_N2, -heat_efficency) - air.adjust_moles(GAS_NITRYL, heat_efficency*2) - - if(energy_used > 0) - var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB)) - return REACTING - -/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic. - priority = 4 - name = "BZ Gas formation" - id = "bzformation" - -/datum/gas_reaction/bzformation/init_reqs() - min_requirements = list( - GAS_NITROUS = 10, - GAS_PLASMA = 10 - ) - - -/datum/gas_reaction/bzformation/react(datum/gas_mixture/air) - var/temperature = air.return_temperature() - var/pressure = air.return_pressure() - var/old_heat_capacity = air.heat_capacity() - var/reaction_efficency = min(1/((pressure/(0.5*ONE_ATMOSPHERE))*(max(air.get_moles(GAS_PLASMA)/air.get_moles(GAS_NITROUS),1))),air.get_moles(GAS_NITROUS),air.get_moles(GAS_PLASMA)/2) - var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED - if ((air.get_moles(GAS_NITROUS) - reaction_efficency < 0 )|| (air.get_moles(GAS_PLASMA) - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing. - return NO_REACTION - air.adjust_moles(GAS_BZ, reaction_efficency) - if(reaction_efficency == air.get_moles(GAS_NITROUS)) - air.adjust_moles(GAS_BZ, -min(pressure,1)) - air.adjust_moles(GAS_O2, min(pressure,1)) - air.adjust_moles(GAS_NITROUS, -reaction_efficency) - air.adjust_moles(GAS_PLASMA, -2*reaction_efficency) - - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min((reaction_efficency**2)*BZ_RESEARCH_SCALE,BZ_RESEARCH_MAX_AMOUNT)) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DISCOVERY, min((reaction_efficency**2)*BZ_RESEARCH_SCALE,BZ_RESEARCH_MAX_AMOUNT)*0.5) - - if(energy_released > 0) - var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB)) - return REACTING - -/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic. - priority = 5 - name = "Stimulum formation" - id = "stimformation" - -/datum/gas_reaction/stimformation/init_reqs() - min_requirements = list( - GAS_TRITIUM = 30, - GAS_PLASMA = 10, - GAS_BZ = 20, - GAS_NITRYL = 30, - "TEMP" = STIMULUM_HEAT_SCALE/2) - -/datum/gas_reaction/stimformation/react(datum/gas_mixture/air) - - var/old_heat_capacity = air.heat_capacity() - var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(GAS_PLASMA),air.get_moles(GAS_NITRYL)) - var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE*(heat_scale**2) - STIMULUM_FIRST_DROP*(heat_scale**3) + STIMULUM_SECOND_RISE*(heat_scale**4) - STIMULUM_ABSOLUTE_DROP*(heat_scale**5) - - if ((air.get_moles(GAS_PLASMA) - heat_scale < 0) || (air.get_moles(GAS_NITRYL) - heat_scale < 0) || (air.get_moles(GAS_TRITIUM) - heat_scale < 0)) //Shouldn't produce gas from nothing. - return NO_REACTION - air.adjust_moles(GAS_STIMULUM, heat_scale/10) - air.adjust_moles(GAS_PLASMA, -heat_scale) - air.adjust_moles(GAS_NITRYL, -heat_scale) - air.adjust_moles(GAS_TRITIUM, -heat_scale) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, STIMULUM_RESEARCH_AMOUNT*max(stim_energy_change,0)) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DISCOVERY, STIMULUM_RESEARCH_AMOUNT*max(stim_energy_change,0)*0.5) - if(stim_energy_change) - var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(max(((air.return_temperature()*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB)) - return REACTING - -/datum/gas_reaction/nobliumformation //Hyper-Noblium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic. - priority = 6 - name = "Hyper-Noblium condensation" - id = "nobformation" - -/datum/gas_reaction/nobliumformation/init_reqs() - min_requirements = list( - GAS_N2 = 10, - GAS_TRITIUM = 5, - "TEMP" = 5000000) - -/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air) - var/old_heat_capacity = air.heat_capacity() - var/nob_formed = min((air.get_moles(GAS_N2)+air.get_moles(GAS_TRITIUM))/100,air.get_moles(GAS_TRITIUM)/10,air.get_moles(GAS_N2)/20) - var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(GAS_BZ),1))) - if ((air.get_moles(GAS_TRITIUM) - 10*nob_formed < 0) || (air.get_moles(GAS_N2) - 20*nob_formed < 0)) - return NO_REACTION - air.adjust_moles(GAS_TRITIUM, -10*nob_formed) - air.adjust_moles(GAS_N2, -20*nob_formed) - air.adjust_moles(GAS_HYPERNOB, nob_formed) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, nob_formed*NOBLIUM_RESEARCH_AMOUNT) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DISCOVERY, nob_formed*NOBLIUM_RESEARCH_AMOUNT*0.5) - - if (nob_formed) - var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(max(((air.return_temperature()*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)) - -/datum/gas_reaction/stim_ball - priority = 7 - name ="Stimulum Energy Ball" - id = "stimball" - -/datum/gas_reaction/stim_ball/init_reqs() - min_requirements = list( - GAS_PLUOXIUM = STIM_BALL_GAS_AMOUNT, - GAS_STIMULUM = STIM_BALL_GAS_AMOUNT, - GAS_NITRYL = MINIMUM_MOLE_COUNT, - GAS_PLASMA = MINIMUM_MOLE_COUNT, - "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - ) - -/datum/gas_reaction/stim_ball/react(datum/gas_mixture/air, datum/holder) - var/turf/open/location - var/old_heat_capacity = air.heat_capacity() - if(istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet. - var/datum/pipeline/pipenet = holder - location = get_turf(pick(pipenet.members)) - else - location = get_turf(holder) - var/ball_shot_angle = 180*cos(air.get_moles(GAS_H2O)/air.get_moles(GAS_NITRYL))+180 - var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_STIMULUM)) - var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_PLUOXIUM)) - var/energy_released = stim_used*STIMULUM_HEAT_SCALE//Stimulum has a lot of stored energy, and breaking it up releases some of it - location.fire_nuclear_particle(ball_shot_angle) - air.adjust_moles(GAS_CO2, 4*pluox_used) - air.adjust_moles(GAS_N2, 8*stim_used) - air.adjust_moles(GAS_PLUOXIUM, -pluox_used) - air.adjust_moles(GAS_STIMULUM, -stim_used) - air.adjust_moles(GAS_PLASMA, max(-air.get_moles(GAS_PLASMA)/2,-30)) - if(energy_released) - var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(clamp((air.return_temperature()*old_heat_capacity + energy_released)/new_heat_capacity,TCMB,INFINITY)) + air.temperature = clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY) //THIS SHOULD STAY OR FUSION WILL EAT YOUR FACE return REACTING #undef SET_REACTION_RESULTS diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm new file mode 100644 index 0000000000000..fce24b7a9de67 --- /dev/null +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -0,0 +1,766 @@ +#define AIRALARM_WARNING_COOLDOWN (10 SECONDS) + +/obj/machinery/airalarm + name = "air alarm" + desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous." + icon = 'icons/obj/monitors.dmi' + icon_state = "alarmp" + use_power = IDLE_POWER_USE + idle_power_usage = 4 + active_power_usage = 8 + power_channel = AREA_USAGE_ENVIRON + req_access = list(ACCESS_ATMOSPHERICS) + max_integrity = 250 + integrity_failure = 0.33 + armor_type = /datum/armor/machinery_airalarm + resistance_flags = FIRE_PROOF + clicksound = 'sound/machines/terminal_select.ogg' + layer = ABOVE_WINDOW_LAYER + + /// Current alert level of our air alarm. + /// [AIR_ALARM_ALERT_NONE], [AIR_ALARM_ALERT_WARNING], [AIR_ALARM_ALERT_HAZARD] + var/danger_level = AIR_ALARM_ALERT_NONE + /// Current alert level of the area of our air alarm. + var/area_danger = FALSE + + /// Currently selected mode of the alarm. An instance of [/datum/air_alarm_mode]. + var/datum/air_alarm_mode/selected_mode + ///A reference to the area we are in + var/area/my_area + + /// Boolean for whether the current air alarm can be tweaked by players or not. + var/locked = TRUE + /// Boolean to prevent AI from tampering with this alarm. + var/aidisabled = FALSE + /// Boolean of whether alarm is currently shorted. Mess up some functionalities. + var/shorted = FALSE + + /// Current build stage. [AIRALARM_BUILD_COMPLETE], [AIRALARM_BUILD_NO_WIRES], [AIRALARM_BUILD_NO_CIRCUIT] + var/buildstage = AIR_ALARM_BUILD_COMPLETE + + ///Represents a signel source of atmos alarms, complains to all the listeners if one of our thresholds is violated + var/datum/alarm_handler/alarm_manager + + var/static/list/atmos_connections = list(COMSIG_TURF_EXPOSE = PROC_REF(check_danger)) + + /// An assoc list of [datum/tlv]s, indexed by "pressure", "temperature", and [datum/gas] typepaths. + var/list/datum/tlv/tlv_collection + + /// Used for air alarm helper called unlocked to make air alarm unlocked. + var/unlocked = FALSE + /// Used for air alarm helper called syndicate_access to make air alarm's required access syndicate_access. + var/syndicate_access = FALSE + /// Used for air alarm helper called away_general_access to make air alarm's required access away_general_access. + var/away_general_access = FALSE + /// Used for air alarm helper called engine_access to make air alarm's required access one of ACCESS_ATMOSPHERICS & ACCESS_ENGINEERING. + var/engine_access = FALSE + /// Used for air alarm helper called mixingchamber_access to make air alarm's required access one of ACCESS_ATMOSPHERICS & ACCESS_TOXINS. + var/mixingchamber_access = FALSE + /// Used for air alarm helper called all_access to remove air alarm's required access. + var/all_access = FALSE + + /// Used for air alarm helper called tlv_cold_room to adjust alarm thresholds for cold room. + var/tlv_cold_room = FALSE + /// Used for air alarm helper called tlv_no_ckecks to remove alarm thresholds. + var/tlv_no_checks = FALSE + + + ///Warning message spoken by air alarms + var/warning_message = null + + //Stops the air alarm from talking about their atmos problems. + var/speaker_enabled = TRUE + + ///Cooldown on sending warning messages + COOLDOWN_DECLARE(warning_cooldown) + + /// Used for connecting air alarm to a remote tile/zone via air sensor instead of the tile/zone of the air alarm + var/obj/machinery/air_sensor/connected_sensor + /// Used to link air alarm to air sensor via map helpers + var/air_sensor_chamber_id = "" + /// Whether it is possible to link/unlink this air alarm from a sensor + var/allow_link_change = TRUE + +GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) + +/datum/armor/machinery_airalarm + energy = 100 + fire = 90 + acid = 30 + +/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild) + . = ..() + wires = new /datum/wires/airalarm(src) + if(ndir) + setDir(ndir) + + if(nbuild) + buildstage = AIR_ALARM_BUILD_NO_CIRCUIT + panel_open = TRUE + + if(name == initial(name)) + name = "[get_area_name(src)] Air Alarm" + + tlv_collection = list() + tlv_collection["pressure"] = new /datum/tlv/pressure + tlv_collection["temperature"] = new /datum/tlv/temperature + + var/list/cached_gas_info = GLOB.meta_gas_info + for(var/datum/gas/gas_path as anything in cached_gas_info) + if(ispath(gas_path, /datum/gas/oxygen)) + tlv_collection[gas_path] = new /datum/tlv/oxygen + else if(ispath(gas_path, /datum/gas/carbon_dioxide)) + tlv_collection[gas_path] = new /datum/tlv/carbon_dioxide + else if(cached_gas_info[gas_path][META_GAS_DANGER]) + tlv_collection[gas_path] = new /datum/tlv/dangerous + else + tlv_collection[gas_path] = new /datum/tlv/no_checks + + my_area = connected_sensor ? get_area(connected_sensor) : get_area(src) + alarm_manager = new(src) + select_mode(src, /datum/air_alarm_mode/filtering, should_apply = FALSE) + + AddElement(/datum/element/connect_loc, atmos_connections) + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/air_alarm_general, + /obj/item/circuit_component/air_alarm, + /obj/item/circuit_component/air_alarm_scrubbers, + /obj/item/circuit_component/air_alarm_vents + )) + + GLOB.air_alarms += src + check_enviroment() + +/obj/machinery/airalarm/process() + if(!COOLDOWN_FINISHED(src, warning_cooldown) || (machine_stat & (NOPOWER|BROKEN)) || shorted || (buildstage != AIR_ALARM_BUILD_COMPLETE)) + return + + speak(warning_message) + COOLDOWN_START(src, warning_cooldown, AIRALARM_WARNING_COOLDOWN) + +/obj/machinery/airalarm/Destroy() + if(my_area) + my_area = null + if(connected_sensor) + UnregisterSignal(connected_sensor, COMSIG_PARENT_QDELETING) + UnregisterSignal(connected_sensor.loc, COMSIG_TURF_EXPOSE) + connected_sensor.connected_airalarm = null + connected_sensor = null + + QDEL_NULL(alarm_manager) + GLOB.air_alarms -= src + return ..() + +/obj/machinery/airalarm/proc/check_enviroment() + var/turf/our_turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src) + var/datum/gas_mixture/environment = our_turf.return_air() + if(isnull(environment) || machine_stat || shorted) //If the environment is null, anything in machine_stats (like NOPOWER), or if we are shorted + return // Don't check for danger. + check_danger(our_turf, environment, environment.temperature) + +/obj/machinery/airalarm/proc/get_enviroment() + var/turf/our_turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src) + return our_turf.return_air() + +/obj/machinery/airalarm/power_change() + check_enviroment() + return ..() + +/obj/machinery/airalarm/on_enter_area(datum/source, area/area_to_register) + //were already registered to an area. exit from here first before entering into an new area + if(!isnull(my_area)) + return + . = ..() + + my_area = connected_sensor ? get_area(connected_sensor) : area_to_register + update_appearance() + +/obj/machinery/airalarm/update_name(updates) + . = ..() + name = "[get_area_name(my_area)] Air Alarm" + +/obj/machinery/airalarm/on_exit_area(datum/source, area/area_to_unregister) + //we cannot unregister from an area we never registered to in the first place + if(my_area != area_to_unregister) + return + . = ..() + + my_area = connected_sensor ? get_area(connected_sensor) : null + +/obj/machinery/airalarm/examine(mob/user) + . = ..() + switch(buildstage) + if(AIR_ALARM_BUILD_NO_CIRCUIT) + . += "It is missing air alarm electronics." + if(AIR_ALARM_BUILD_NO_WIRES) + . += "It is missing wiring." + if(AIR_ALARM_BUILD_COMPLETE) + . += "Alt-click to [locked ? "unlock" : "lock"] the interface." + +/obj/machinery/airalarm/ui_status(mob/user, datum/ui_state/state) + if(issiliconoradminghost(user) && aidisabled) + to_chat(user, "AI control has been disabled.") + else if(!shorted) + return ..() + return UI_CLOSE + +REGISTER_BUFFER_HANDLER(/obj/machinery/airalarm) + +DEFINE_BUFFER_HANDLER(/obj/machinery/airalarm) + if(!istype(buffer, /obj/machinery/air_sensor)) + to_chat(user, span_warning("You cannot link the [buffer] to the [src].")) + return NONE + var/obj/machinery/air_sensor/sensor = buffer + if(!allow_link_change) + balloon_alert(user, "linking disabled") + return TRUE + if(connected_sensor || sensor.connected_airalarm) + balloon_alert(user, "sensor already connected!") + return TRUE + + connect_sensor(sensor) + balloon_alert(user, "connected sensor") + return COMPONENT_BUFFER_RECEIVED + +/obj/machinery/airalarm/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AirAlarm", name) + ui.set_autoupdate(TRUE) + ui.open() + +/obj/machinery/airalarm/ui_static_data(mob/user) + var/list/data = list() + data["thresholdTypeMap"] = list( + "warning_min" = TLV_VAR_WARNING_MIN, + "hazard_min" = TLV_VAR_HAZARD_MIN, + "warning_max" = TLV_VAR_WARNING_MAX, + "hazard_max" = TLV_VAR_HAZARD_MAX, + "all" = TLV_VAR_ALL, + ) + return data + +/obj/machinery/airalarm/ui_data(mob/user) + var/data = list() + + data["locked"] = locked + data["siliconUser"] = issiliconoradminghost(user) + data["emagged"] = (obj_flags & EMAGGED ? 1 : 0) + data["dangerLevel"] = danger_level + data["atmosAlarm"] = !!area_danger + data["fireAlarm"] = my_area.fire + data["faultStatus"] = my_area.fault_status + data["faultLocation"] = my_area.fault_location + data["sensor"] = !!connected_sensor + data["allowLinkChange"] = allow_link_change + + var/datum/gas_mixture/environment = get_enviroment() + var/total_moles = environment.total_moles() + var/temp = environment.temperature + var/pressure = environment.return_pressure() + + data["envData"] = list() + if(connected_sensor) + data["envData"] += list(list( + "name" = "Linked area", + "value" = my_area.name + )) + data["envData"] += list(list( + "name" = "Pressure", + "value" = "[round(pressure, 0.01)] kPa", + "danger" = tlv_collection["pressure"].check_value(pressure) + )) + data["envData"] += list(list( + "name" = "Temperature", + "value" = "[round(temp, 0.01)] Kelvin / [round(temp, 0.01) - T0C] Celsius", + "danger" = tlv_collection["temperature"].check_value(temp), + )) + if(total_moles) + for(var/gas_path in environment.gases) + var/moles = environment.gases[gas_path][MOLES] + var/portion = moles / total_moles + data["envData"] += list(list( + "name" = GLOB.meta_gas_info[gas_path][META_GAS_NAME], + "value" = "[round(moles, 0.01)] moles / [round(100 * portion, 0.01)] % / [round(portion * pressure, 0.01)] kPa", + "danger" = tlv_collection[gas_path].check_value(portion * pressure), + )) + + data["tlvSettings"] = list() + for(var/threshold in tlv_collection) + var/datum/tlv/tlv = tlv_collection[threshold] + var/list/singular_tlv = list() + if(threshold == "pressure") + singular_tlv["name"] = "Pressure" + singular_tlv["unit"] = "kPa" + else if (threshold == "temperature") + singular_tlv["name"] = "Temperature" + singular_tlv["unit"] = "K" + else + singular_tlv["name"] = GLOB.meta_gas_info[threshold][META_GAS_NAME] + singular_tlv["unit"] = "kPa" + singular_tlv["id"] = threshold + singular_tlv["warning_min"] = tlv.warning_min + singular_tlv["hazard_min"] = tlv.hazard_min + singular_tlv["warning_max"] = tlv.warning_max + singular_tlv["hazard_max"] = tlv.hazard_max + data["tlvSettings"] += list(singular_tlv) + + if(!locked || issiliconoradminghost(user)) + data["vents"] = list() + for(var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in my_area.air_vents) + data["vents"] += list(list( + "refID" = REF(vent), + "long_name" = sanitize(vent.name), + "power" = vent.on, + "checks" = vent.pressure_checks, + "excheck" = vent.pressure_checks & ATMOS_EXTERNAL_BOUND, + "incheck" = vent.pressure_checks & ATMOS_INTERNAL_BOUND, + "direction" = vent.pump_direction, + "external" = vent.external_pressure_bound, + "internal" = vent.internal_pressure_bound, + "extdefault" = (vent.external_pressure_bound == ONE_ATMOSPHERE), + "intdefault" = (vent.internal_pressure_bound == 0) + )) + data["scrubbers"] = list() + for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in my_area.air_scrubbers) + var/list/filter_types = list() + for (var/path in GLOB.meta_gas_info) + var/list/gas = GLOB.meta_gas_info[path] + filter_types += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in scrubber.filter_types))) + data["scrubbers"] += list(list( + "refID" = REF(scrubber), + "long_name" = sanitize(scrubber.name), + "power" = scrubber.on, + "scrubbing" = scrubber.scrubbing, + "widenet" = scrubber.widenet, + "filter_types" = filter_types, + )) + + data["selectedModePath"] = selected_mode.type + data["modes"] = list() + for(var/mode_path in GLOB.air_alarm_modes) + var/datum/air_alarm_mode/mode = GLOB.air_alarm_modes[mode_path] + if(!(obj_flags & EMAGGED) && mode.emag) + continue + data["modes"] += list(list( + "name" = mode.name, + "desc" = mode.desc, + "danger" = mode.danger, + "path" = mode.type + )) + + // forgive me holy father + data["panicSiphonPath"] = /datum/air_alarm_mode/panic_siphon + data["filteringPath"] = /datum/air_alarm_mode/filtering + + return data + +/obj/machinery/airalarm/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + + if(. || buildstage != AIR_ALARM_BUILD_COMPLETE) + return + var/mob/user = ui.user + if((locked && !issiliconoradminghost(user)) || (issiliconoradminghost(user) && aidisabled)) + return + + var/area/area = connected_sensor ? get_area(connected_sensor) : get_area(src) + + ASSERT(!isnull(area)) + + var/ref = params["ref"] + var/obj/machinery/atmospherics/components/unary/vent_pump/vent + var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber + if(!isnull(ref)) + scrubber = locate(ref) in area.air_scrubbers + vent = locate(ref) in area.air_vents + + switch (action) + if ("power") + var/obj/machinery/atmospherics/components/powering = vent || scrubber + powering.on = !!params["val"] + powering.atmos_conditions_changed() + powering.update_icon() + + if ("direction") + if (isnull(vent)) + return TRUE + + var/value = params["val"] + + if (value == ATMOS_DIRECTION_SIPHONING || value == ATMOS_DIRECTION_RELEASING) + vent.pump_direction = value + vent.update_icon() + if ("incheck") + if (isnull(vent)) + return TRUE + + var/new_checks = clamp((text2num(params["val"]) || 0) ^ ATMOS_INTERNAL_BOUND, NONE, ATMOS_BOUND_MAX) + vent.pressure_checks = new_checks + vent.update_icon() + if ("excheck") + if (isnull(vent)) + return TRUE + + var/new_checks = clamp((text2num(params["val"]) || 0) ^ ATMOS_EXTERNAL_BOUND, NONE, ATMOS_BOUND_MAX) + vent.pressure_checks = new_checks + vent.update_icon() + if ("set_internal_pressure") + if (isnull(vent)) + return TRUE + + var/old_pressure = vent.internal_pressure_bound + var/new_pressure = clamp(text2num(params["value"]), 0, ATMOS_PUMP_MAX_PRESSURE) + vent.internal_pressure_bound = new_pressure + if (old_pressure != new_pressure) + vent.investigate_log("internal pressure was set to [new_pressure] by [key_name(user)]", INVESTIGATE_ATMOS) + if ("reset_internal_pressure") + if (isnull(vent)) + return TRUE + + if (vent.internal_pressure_bound != 0) + vent.internal_pressure_bound = 0 + vent.investigate_log("internal pressure was reset by [key_name(user)]", INVESTIGATE_ATMOS) + if ("set_external_pressure") + if (isnull(vent)) + return TRUE + + var/old_pressure = vent.external_pressure_bound + var/new_pressure = clamp(text2num(params["value"]), 0, ATMOS_PUMP_MAX_PRESSURE) + + if (old_pressure == new_pressure) + return TRUE + + vent.external_pressure_bound = new_pressure + vent.investigate_log("external pressure was set to [new_pressure] by [key_name(user)]", INVESTIGATE_ATMOS) + vent.update_icon() + if ("reset_external_pressure") + if (isnull(vent)) + return TRUE + + if (vent.external_pressure_bound == ATMOS_PUMP_MAX_PRESSURE) + return TRUE + + vent.external_pressure_bound = ATMOS_PUMP_MAX_PRESSURE + vent.investigate_log("internal pressure was reset by [key_name(user)]", INVESTIGATE_ATMOS) + vent.update_icon() + if ("scrubbing") + if (isnull(scrubber)) + return TRUE + + scrubber.set_scrubbing(!!params["val"], user) + if ("widenet") + if (isnull(scrubber)) + return TRUE + + scrubber.set_widenet(!!params["val"]) + if ("toggle_filter") + if (isnull(scrubber)) + return TRUE + + scrubber.toggle_filters(params["val"]) + if ("mode") + select_mode(user, text2path(params["mode"])) + investigate_log("was turned to [selected_mode.name] mode by [key_name(user)]", INVESTIGATE_ATMOS) + + if ("set_threshold") + var/threshold = text2path(params["threshold"]) || params["threshold"] + var/datum/tlv/tlv = tlv_collection[threshold] + if(isnull(tlv)) + return + var/threshold_type = params["threshold_type"] + var/value = params["value"] + tlv.set_value(threshold_type, value) + investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(user)]", INVESTIGATE_ATMOS) + + check_enviroment() + + if("reset_threshold") + var/threshold = text2path(params["threshold"]) || params["threshold"] + var/datum/tlv/tlv = tlv_collection[threshold] + if(isnull(tlv)) + return + var/threshold_type = params["threshold_type"] + tlv.reset_value(threshold_type) + investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(user)]", INVESTIGATE_ATMOS) + + check_enviroment() + + if ("alarm") + if (alarm_manager.send_alarm(ALARM_ATMOS)) + danger_level = AIR_ALARM_ALERT_HAZARD + + if ("reset") + if (alarm_manager.clear_alarm(ALARM_ATMOS)) + danger_level = AIR_ALARM_ALERT_NONE + + if("air_conditioning") + if(!isnum(params["value"])) + return + if(params["value"]) + stop_ac() + else + start_ac() + investigate_log("has had its air conditioning turned [air_conditioning ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + + if("set_ac_target") + if(!isnum(params["target"])) + return + set_ac_target(params["target"]) + investigate_log("has had its air conditioning target set to [params["target"]] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + + if("default_ac_target") + set_ac_target(initial(ac_temp_target)) + investigate_log("has had its air conditioning target reset to default by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + + if ("disconnect_sensor") + if(allow_link_change) + disconnect_sensor() + + if ("lock") + togglelock(user) + return TRUE + + update_appearance() + + return TRUE + +/obj/machinery/airalarm/update_appearance(updates) + . = ..() + + if(panel_open || (machine_stat & (NOPOWER|BROKEN)) || shorted || buildstage != AIR_ALARM_BUILD_COMPLETE) + set_light(0) + return + + var/color + if(danger_level == AIR_ALARM_ALERT_HAZARD) + color = "#FF0022" // red + else if(danger_level == AIR_ALARM_ALERT_WARNING || area_danger) + color = "#FFAA00" // yellow + else + color = "#00FFCC" // teal + + set_light(1.5, 1, color) + +/obj/machinery/airalarm/update_icon_state() + if(panel_open) + switch(buildstage) + if(AIR_ALARM_BUILD_COMPLETE) + icon_state = "alarmx" + if(AIR_ALARM_BUILD_NO_WIRES) + icon_state = "alarm_b2" + if(AIR_ALARM_BUILD_NO_CIRCUIT) + icon_state = "alarm_b1" + return ..() + + icon_state = "alarmp" + return ..() + +/obj/machinery/airalarm/update_overlays() + . = ..() + + if(panel_open || (machine_stat & (NOPOWER|BROKEN)) || shorted || buildstage != AIR_ALARM_BUILD_COMPLETE) + return + + var/state + if(danger_level == AIR_ALARM_ALERT_HAZARD) + state = "alarm1" + else if(danger_level == AIR_ALARM_ALERT_WARNING || area_danger) + state = "alarm2" + else + state = "alarm0" + + . += mutable_appearance(icon, state) + . += emissive_appearance(icon, state, layer, alpha = src.alpha) + +/// Check the current air and update our danger level. +/// [/obj/machinery/airalarm/var/danger_level] +/obj/machinery/airalarm/proc/check_danger(turf/location, datum/gas_mixture/environment, exposed_temperature) + SIGNAL_HANDLER + if((machine_stat & (NOPOWER|BROKEN)) || shorted || buildstage != AIR_ALARM_BUILD_COMPLETE) + return + + if(!environment) + return + + var/old_danger = danger_level + danger_level = AIR_ALARM_ALERT_NONE + var/old_area_danger = area_danger + area_danger = my_area.active_alarms[ALARM_ATMOS] + + var/total_moles = environment.total_moles() + var/pressure = environment.return_pressure() + var/temp = environment.return_temperature() + + danger_level = max(danger_level, tlv_collection["pressure"].check_value(pressure)) + danger_level = max(danger_level, tlv_collection["temperature"].check_value(temp)) + if(total_moles) + var/list/cached_gas_info = GLOB.meta_gas_info + for(var/datum/gas/gas_path as anything in cached_gas_info) + var/moles = environment.gases[gas_path] ? environment.gases[gas_path][MOLES] : 0 + danger_level = max(danger_level, tlv_collection[gas_path].check_value(pressure * moles / total_moles)) + + selected_mode.replace(my_area, pressure, src) + + if(danger_level) + alarm_manager.send_alarm(ALARM_ATMOS) + var/is_high_pressure = tlv_collection["pressure"].hazard_max != TLV_VALUE_IGNORE && pressure >= tlv_collection["pressure"].hazard_max + var/is_high_temp = tlv_collection["temperature"].hazard_max != TLV_VALUE_IGNORE && temp >= tlv_collection["temperature"].hazard_max + var/is_low_pressure = tlv_collection["pressure"].hazard_min != TLV_VALUE_IGNORE && pressure <= tlv_collection["pressure"].hazard_min + var/is_low_temp = tlv_collection["temperature"].hazard_min != TLV_VALUE_IGNORE && temp <= tlv_collection["temperature"].hazard_min + + if(is_low_pressure && is_low_temp) + warning_message = "Danger! Low pressure and temperature detected." + return + if(is_low_pressure && is_high_temp) + warning_message = "Danger! Low pressure and high temperature detected." + return + if(is_high_pressure && is_high_temp) + warning_message = "Danger! High pressure and temperature detected." + return + if(is_high_pressure && is_low_temp) + warning_message = "Danger! High pressure and low temperature detected." + return + if(is_low_pressure) + warning_message = "Danger! Low pressure detected." + return + if(is_high_pressure) + warning_message = "Danger! High pressure detected." + return + if(is_low_temp) + warning_message = "Danger! Low temperature detected." + return + if(is_high_temp) + warning_message = "Danger! High temperature detected." + return + else + warning_message = null + + else if(!(my_area.fault_status & AREA_FAULT_MANUAL)) //Only clear ourselves automatically if it was not a manual trigger. + alarm_manager.clear_alarm(ALARM_ATMOS) + warning_message = null + + if(old_danger != danger_level || old_area_danger != area_danger) + update_appearance() + + +/obj/machinery/airalarm/proc/select_mode(atom/source, datum/air_alarm_mode/mode_path, should_apply = TRUE) + var/datum/air_alarm_mode/new_mode = GLOB.air_alarm_modes[mode_path] + if(!new_mode) + return + if(new_mode.emag && !(obj_flags & EMAGGED)) + return + selected_mode = new_mode + if(should_apply) + selected_mode.apply(my_area) + SEND_SIGNAL(src, COMSIG_AIRALARM_UPDATE_MODE, source) + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27) + +/obj/machinery/airalarm/proc/speak(warning_message) + if(machine_stat & (BROKEN|NOPOWER)) + return + if(!speaker_enabled) + return + if(!warning_message) + return + + say(warning_message) + +/// Used for unlocked air alarm helper, which unlocks the air alarm. +/obj/machinery/airalarm/proc/unlock() + locked = FALSE + +/// Used for syndicate_access air alarm helper, which sets air alarm's required access to syndicate_access. +/obj/machinery/airalarm/proc/give_syndicate_access() + req_access = list(ACCESS_SYNDICATE) + +///Used for away_general_access air alarm helper, which set air alarm's required access to away_general_access. +/obj/machinery/airalarm/proc/give_away_general_access() + req_access = list(ACCESS_AWAY_GENERAL) + +///Used for engine_access air alarm helper, which set air alarm's required access to away_general_access. +/obj/machinery/airalarm/proc/give_engine_access() + name = "engine air alarm" + locked = FALSE + req_access = null + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) + +///Used for mixingchamber_access air alarm helper, which set air alarm's required access to away_general_access. +/obj/machinery/airalarm/proc/give_mixingchamber_access() + name = "chamber air alarm" + locked = FALSE + req_access = null + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOX) + +///Used for all_access air alarm helper, which set air alarm's required access to null. +/obj/machinery/airalarm/proc/give_all_access() + name = "all-access air alarm" + desc = "This particular atmos control unit appears to have no access restrictions." + locked = FALSE + req_access = null + req_one_access = null + +///Used for air alarm cold room tlv helper, which sets cold room temperature and pressure alarm thresholds +/obj/machinery/airalarm/proc/set_tlv_cold_room() + tlv_collection["temperature"] = new /datum/tlv/cold_room_temperature + tlv_collection["pressure"] = new /datum/tlv/cold_room_pressure + +///Used for air alarm no tlv helper, which removes alarm thresholds +/obj/machinery/airalarm/proc/set_tlv_no_checks() + tlv_collection["temperature"] = new /datum/tlv/no_checks + tlv_collection["pressure"] = new /datum/tlv/no_checks + + for(var/gas_path in GLOB.meta_gas_info) + tlv_collection[gas_path] = new /datum/tlv/no_checks + +///Used for air alarm link helper, which connects air alarm to a sensor with corresponding chamber_id +/obj/machinery/airalarm/proc/setup_chamber_link() + var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[GLOB.map_loaded_sensors[air_sensor_chamber_id]] + if(isnull(sensor)) + log_mapping("[src] at [AREACOORD(src)] tried to connect to a sensor, but no sensor with chamber_id:[air_sensor_chamber_id] found!") + return + if(connected_sensor) + log_mapping("[src] at [AREACOORD(src)] tried to connect to more than one sensor!") + return + connect_sensor(sensor) + +///Used to connect air alarm with a sensor +/obj/machinery/airalarm/proc/connect_sensor(obj/machinery/air_sensor/sensor) + sensor.connected_airalarm = src + connected_sensor = sensor + + RegisterSignal(connected_sensor, COMSIG_PARENT_QDELETING, PROC_REF(disconnect_sensor)) + + // Transfer signal from air alarm to sensor + UnregisterSignal(loc, COMSIG_TURF_EXPOSE) + RegisterSignal(connected_sensor.loc, COMSIG_TURF_EXPOSE, PROC_REF(check_danger), override=TRUE) + + my_area = get_area(connected_sensor) + + check_enviroment() + + update_appearance() + update_name() + +///Used to reset the air alarm to default configuration after disconnecting from air sensor +/obj/machinery/airalarm/proc/disconnect_sensor() + UnregisterSignal(connected_sensor, COMSIG_PARENT_QDELETING) + + // Transfer signal from sensor to air alarm + UnregisterSignal(connected_sensor.loc, COMSIG_TURF_EXPOSE) + RegisterSignal(loc, COMSIG_TURF_EXPOSE, PROC_REF(check_danger), override=TRUE) + + connected_sensor.connected_airalarm = null + connected_sensor = null + my_area = get_area(src) + + check_enviroment() + + update_appearance() + update_name() + +#undef AIRALARM_WARNING_COOLDOWN diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_ac.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_ac.dm new file mode 100644 index 0000000000000..0c025f3672829 --- /dev/null +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_ac.dm @@ -0,0 +1,121 @@ +#define AC_MIN_TEMP T20C - 5 +#define AC_MAX_TEMP T20C + 10 +#define AC_DEFAULT_TARGET T20C +#define AC_TARGET_SKEW 2 +#define AC_SWITCH_COOLDOWN 5 SECONDS +#define AC_DEFAULT_INC 1.5 +#define AC_ADJACENT_MUL 0.6 + +/obj/machinery/airalarm + /// Whether air conditioning is enabled or not. + var/air_conditioning = TRUE + /// Whether the air alarm is currently trying to actively regulate the temperature. + var/ac_active = FALSE + /// The amount of temperature (in K) the air conditioner will "push" towards the target temperature, per tick. + var/ac_temp_inc = AC_DEFAULT_INC + /// The minimum target temperature the air conditioner can be set to. + var/ac_temp_min = AC_MIN_TEMP + /// The maximum target temperature the air conditioner can be set to. + var/ac_temp_max = AC_MAX_TEMP + /// The target temperature the air conditioner is trying to reach, if active. + var/ac_temp_target = AC_DEFAULT_TARGET + /// The multiplier to [ac_temp_target] for tiles adjacent to the alarm. + var/ac_adjacent_mul = AC_ADJACENT_MUL + VAR_PRIVATE/cached_target_min = AC_DEFAULT_TARGET - AC_TARGET_SKEW + VAR_PRIVATE/cached_target_max = AC_DEFAULT_TARGET + AC_TARGET_SKEW + /// Cooldown for the air conditioning (de)activating, to prevent spam. + COOLDOWN_DECLARE(ac_switch_cooldown) + +/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild) + . = ..() + if(air_conditioning) + SSair.start_processing_machine(src) + +/obj/machinery/airalarm/examine(mob/user) + . = ..() + . += span_notice("A small light indicates that the air conditioning is [span_bold("[air_conditioning ? (ac_active ? "active" : "idle") : "disabled"]")].") + +/obj/machinery/airalarm/ui_data(mob/user) + . = ..() + .["ac"] = list( + "enabled" = air_conditioning, + "active" = ac_active, + "target" = ac_temp_target, + "min" = ac_temp_min, + "max" = ac_temp_max + ) + +/obj/machinery/airalarm/proc/set_ac_target(new_target = AC_DEFAULT_TARGET) + if(new_target == ac_temp_target || !isnum(new_target) || !ISINRANGE(new_target, ac_temp_min, ac_temp_max)) + return + ac_temp_target = new_target + cached_target_min = ac_temp_target - AC_TARGET_SKEW + cached_target_max = ac_temp_target + AC_TARGET_SKEW + +/obj/machinery/airalarm/proc/start_ac() + air_conditioning = TRUE + ac_active = FALSE + use_power = idle_power_usage + SSair.start_processing_machine(src) + +/obj/machinery/airalarm/proc/stop_ac() + air_conditioning = FALSE + ac_active = FALSE + use_power = idle_power_usage + SSair.stop_processing_machine(src) + +/obj/machinery/airalarm/process_atmos() + if(panel_open || (machine_stat & (NOPOWER | BROKEN)) || shorted) + return + if(!air_conditioning) + stop_ac() + return PROCESS_KILL + var/turf/open/location = get_turf(src) + if(!istype(location) || QDELING(location)) + use_power = idle_power_usage + ac_active = FALSE + return + var/datum/gas_mixture/environment = location.return_air() + if(QDELETED(environment)) + use_power = idle_power_usage + ac_active = FALSE + return + var/current_temp = environment.return_temperature() + if(COOLDOWN_FINISHED(src, ac_switch_cooldown)) + var/previous_active = ac_active + ac_active = !ISINRANGE_EX(current_temp, cached_target_min, cached_target_max) + if(previous_active != ac_active) + visible_message(span_notice("[src] makes a quiet click as it [ac_active ? "starts trying to regulate" : "stops regulating"] the area's temperature."), blind_message = span_hear("You hear a silent click."), vision_distance = 3) + playsound(src, 'sound/machines/terminal_on.ogg', vol = 30, vary = TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + use_power = ac_active ? ACTIVE_POWER_USE : IDLE_POWER_USE + COOLDOWN_START(src, ac_switch_cooldown, AC_SWITCH_COOLDOWN) + if(ac_active) + if(current_temp < ac_temp_target) + environment.temperature = min(current_temp + ac_temp_inc, ac_temp_target) + else + environment.temperature = max(current_temp - ac_temp_inc, ac_temp_target) + air_update_turf(update = FALSE, remove = FALSE) + // Update the air of adjacent turfs too + if(!TURF_SHARES(location)) + return + var/adjacent_inc = CEILING(ac_temp_inc * ac_adjacent_mul, 0.1) + for(var/turf/open/adjacent_turf in location.get_atmos_adjacent_turfs(alldir = TRUE)) + if(QDELING(adjacent_turf) || isspaceturf(adjacent_turf)) + continue + var/datum/gas_mixture/adj_environment = adjacent_turf.return_air() + if(QDELETED(adj_environment)) + continue + var/adj_temp = adj_environment.return_temperature() + if(adj_temp < ac_temp_target) + adj_environment.temperature = min(adj_temp + adjacent_inc, ac_temp_target) + else + adj_environment.temperature = max(adj_temp - adjacent_inc, ac_temp_target) + adjacent_turf.air_update_turf(update = FALSE, remove = FALSE) + +#undef AC_ADJACENT_MUL +#undef AC_DEFAULT_INC +#undef AC_SWITCH_COOLDOWN +#undef AC_TARGET_SKEW +#undef AC_DEFAULT_TARGET +#undef AC_MAX_TEMP +#undef AC_MIN_TEMP diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm new file mode 100644 index 0000000000000..e44c21b633913 --- /dev/null +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm @@ -0,0 +1,683 @@ +/obj/item/circuit_component/air_alarm_general + display_name = "Air Alarm" + desc = "Outputs basic information that the air alarm has recorded" + + var/obj/machinery/airalarm/connected_alarm + + /// Enables the fire alarm + var/datum/port/input/enable_fire_alarm + /// Disables the fire alarm + var/datum/port/input/disable_fire_alarm + + /// The mode to set the air alarm to + var/datum/port/input/option/mode + /// The trigger to set the mode + var/datum/port/input/set_mode + + /// Whether the fire alarm is enabled or not + var/datum/port/output/fire_alarm_enabled + /// The current set mode + var/datum/port/output/current_mode + + var/static/list/options_map + +/obj/item/circuit_component/air_alarm_general/populate_options() + if(!options_map) + options_map = list() + for(var/mode_path in GLOB.air_alarm_modes) + var/datum/air_alarm_mode/mode = GLOB.air_alarm_modes[mode_path] + if(!mode.emag) + options_map[mode.name] = mode.type + +/obj/item/circuit_component/air_alarm_general/populate_ports() + mode = add_option_port("Mode", options_map, order = 1) + set_mode = add_input_port("Set Mode", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_mode)) + enable_fire_alarm = add_input_port("Enable Alarm", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_alarm)) + disable_fire_alarm = add_input_port("Disable Alarm", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_alarm)) + + fire_alarm_enabled = add_output_port("Alarm Enabled", PORT_TYPE_NUMBER) + current_mode = add_output_port("Current Mode", PORT_TYPE_STRING) + +/obj/item/circuit_component/air_alarm_general/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/airalarm)) + connected_alarm = shell + RegisterSignal(connected_alarm.alarm_manager, COMSIG_ALARM_TRIGGERED, PROC_REF(on_alarm_triggered)) + RegisterSignal(connected_alarm.alarm_manager, COMSIG_ALARM_CLEARED, PROC_REF(on_alarm_cleared)) + RegisterSignal(shell, COMSIG_AIRALARM_UPDATE_MODE, PROC_REF(on_mode_updated)) + current_mode.set_value(connected_alarm.selected_mode.name) + +/obj/item/circuit_component/air_alarm_general/unregister_usb_parent(atom/movable/shell) + if(connected_alarm) + UnregisterSignal(connected_alarm.alarm_manager, list( + COMSIG_ALARM_TRIGGERED, + COMSIG_ALARM_CLEARED, + )) + connected_alarm = null + + UnregisterSignal(shell, list( + COMSIG_AIRALARM_UPDATE_MODE, + )) + return ..() + +/obj/item/circuit_component/air_alarm_general/proc/on_mode_updated(obj/machinery/airalarm/alarm, datum/signal_source) + SIGNAL_HANDLER + current_mode.set_value(alarm.selected_mode.name) + +/obj/item/circuit_component/air_alarm_general/proc/on_alarm_triggered(datum/source, alarm_type, area/location) + SIGNAL_HANDLER + if(alarm_type == ALARM_ATMOS) + fire_alarm_enabled.set_output(TRUE) + +/obj/item/circuit_component/air_alarm_general/proc/on_alarm_cleared(datum/source, alarm_type, area/location) + SIGNAL_HANDLER + if(alarm_type == ALARM_ATMOS) + fire_alarm_enabled.set_output(FALSE) + + +/obj/item/circuit_component/air_alarm_general/proc/trigger_alarm(datum/port/input/port) + CIRCUIT_TRIGGER + if(!connected_alarm || connected_alarm.locked) + return + + if(port == enable_fire_alarm) + if(connected_alarm.alarm_manager.send_alarm(ALARM_ATMOS)) + connected_alarm.danger_level = AIR_ALARM_ALERT_HAZARD + else + if(connected_alarm.alarm_manager.clear_alarm(ALARM_ATMOS)) + connected_alarm.danger_level = AIR_ALARM_ALERT_NONE + +/obj/item/circuit_component/air_alarm_general/proc/set_mode(datum/port/input/port) + CIRCUIT_TRIGGER + if(!connected_alarm || connected_alarm.locked) + return + + if(!mode.value) + return + + connected_alarm.select_mode(parent.get_creator(), options_map[mode.value]) + connected_alarm.investigate_log("was turned to [connected_alarm.selected_mode.name] by [parent.get_creator()]") + +/obj/item/circuit_component/air_alarm + display_name = "Air Alarm Core Control" + desc = "Controls levels of gases and their temperature as well as all vents and scrubbers in the room." + + var/datum/port/input/option/air_alarm_options + + var/datum/port/input/min_2 + var/datum/port/input/min_1 + var/datum/port/input/max_1 + var/datum/port/input/max_2 + + var/datum/port/input/set_data + var/datum/port/input/request_data + + var/datum/port/output/pressure + var/datum/port/output/temperature + var/datum/port/output/gas_amount + var/datum/port/output/update_received + + var/obj/machinery/airalarm/connected_alarm + var/list/options_map + + ui_buttons = list( + "plus" = "add_new_component" + ) + + var/list/alarm_duplicates = list() + var/max_alarm_duplicates = 20 + +/obj/item/circuit_component/air_alarm/ui_perform_action(mob/user, action) + if(length(alarm_duplicates) >= max_alarm_duplicates) + return + + if(action == "add_new_component") + var/obj/item/circuit_component/air_alarm/component = new /obj/item/circuit_component/air_alarm/duplicate(parent) + parent.add_component(component) + RegisterSignal(component, COMSIG_PARENT_QDELETING, PROC_REF(on_duplicate_removed)) + component.connected_alarm = connected_alarm + alarm_duplicates += component + +/obj/item/circuit_component/air_alarm/proc/on_duplicate_removed(datum/source) + SIGNAL_HANDLER + alarm_duplicates -= source + +/obj/item/circuit_component/air_alarm/populate_ports() + min_2 = add_input_port("Hazard Minimum", PORT_TYPE_NUMBER, trigger = null) + min_1 = add_input_port("Warning Minimum", PORT_TYPE_NUMBER, trigger = null) + max_1 = add_input_port("Warning Maximum", PORT_TYPE_NUMBER, trigger = null) + max_2 = add_input_port("Hazard Maximum", PORT_TYPE_NUMBER, trigger = null) + set_data = add_input_port("Set Limits", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_limits)) + request_data = add_input_port("Request Data", PORT_TYPE_SIGNAL) + + pressure = add_output_port("Pressure", PORT_TYPE_NUMBER) + temperature = add_output_port("Temperature", PORT_TYPE_NUMBER) + gas_amount = add_output_port("Chosen Gas Amount", PORT_TYPE_NUMBER) + update_received = add_output_port("Update Received", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/air_alarm/populate_options() + var/static/list/component_options + + if(!component_options) + component_options = list( + "Pressure" = "pressure", + "Temperature" = "temperature" + ) + + for(var/gas_id in GLOB.meta_gas_info) + component_options[GLOB.meta_gas_info[gas_id][META_GAS_NAME]] = gas_id2path(gas_id) + + air_alarm_options = add_option_port("Air Alarm Options", component_options) + options_map = component_options + +/obj/item/circuit_component/air_alarm/duplicate + display_name = "Air Alarm Control" + + circuit_size = 0 + ui_buttons = list() + +/obj/item/circuit_component/air_alarm/duplicate/removed_from(obj/item/integrated_circuit/removed_from) + if(!QDELING(src)) + qdel(src) + return ..() + +/obj/item/circuit_component/air_alarm/duplicate/Destroy() + connected_alarm = null + return ..() + +/obj/item/circuit_component/air_alarm/removed_from(obj/item/integrated_circuit/removed_from) + QDEL_LIST(alarm_duplicates) + return ..() + +/obj/item/circuit_component/air_alarm/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/airalarm)) + connected_alarm = shell + +/obj/item/circuit_component/air_alarm/unregister_usb_parent(atom/movable/shell) + connected_alarm = null + for(var/obj/item/circuit_component/air_alarm/alarm as anything in alarm_duplicates) + alarm.connected_alarm = null + return ..() + +/obj/item/circuit_component/air_alarm/proc/set_limits() + CIRCUIT_TRIGGER + if(!connected_alarm || connected_alarm.locked) + return + + var/current_option = air_alarm_options.value + + if(!current_option) + return + + var/datum/tlv/settings = connected_alarm.tlv_collection[options_map[current_option]] + if(min_2.value != null) + settings.hazard_min = min_2.value + if(min_1.value != null) + settings.warning_min = min_1.value + if(max_1.value != null) + settings.warning_max = max_1.value + if(max_2.value != null) + settings.hazard_max = max_2.value + +/obj/item/circuit_component/air_alarm/input_received(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/current_option = air_alarm_options.value + + var/datum/gas_mixture/environment = connected_alarm.get_enviroment() + pressure.set_output(round(environment.return_pressure())) + temperature.set_output(round(environment.temperature)) + if(ispath(options_map[current_option])) + gas_amount.set_output(round(environment.gases[options_map[current_option]][MOLES])) + + update_received.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/air_alarm_scrubbers + display_name = "Air Alarm Scrubber Core Control" + desc = "Controls the scrubbers in the room." + + var/datum/port/input/option/scrubbers + + /// Enables the scrubber + var/datum/port/input/enable + /// Disables the scrubber + var/datum/port/input/disable + + /// Enables siphoning + var/datum/port/input/enable_siphon + /// Disables siphoning + var/datum/port/input/disable_siphon + /// Enables extended range + var/datum/port/input/enable_extended_range + /// Disables extended range + var/datum/port/input/disable_extended_range + /// Gas to filter using the scrubber + var/datum/port/input/gas_filter + /// Sets the filter + var/datum/port/input/set_gas_filter + /// Requests an update of the data + var/datum/port/input/request_update + + + /// Whether the scrubber is enabled or not + var/datum/port/output/enabled + /// Whether the scrubber is siphoning or not + var/datum/port/output/is_siphoning + /// Information based on what the scrubber is filtering. Outputs null if the scrubber is siphoning + var/datum/port/output/filtering + /// Sent when an update is received + var/datum/port/output/update_received + + var/obj/machinery/airalarm/connected_alarm + + ui_buttons = list( + "plus" = "add_new_component" + ) + + var/static/list/filtering_map = list() + + var/max_scrubber_duplicates = 20 + var/list/scrubber_duplicates = list() + +/obj/item/circuit_component/air_alarm_scrubbers/ui_perform_action(mob/user, action) + if(length(scrubber_duplicates) >= max_scrubber_duplicates) + return + + if(action == "add_new_component") + var/obj/item/circuit_component/air_alarm_scrubbers/component = new /obj/item/circuit_component/air_alarm_scrubbers/duplicate(parent) + parent.add_component(component) + RegisterSignal(component, COMSIG_PARENT_QDELETING, PROC_REF(on_duplicate_removed)) + component.connected_alarm = connected_alarm + component.scrubbers.possible_options = extract_id_tags(connected_alarm.my_area.air_scrubbers) + scrubber_duplicates += component + +/obj/item/circuit_component/air_alarm_scrubbers/proc/on_duplicate_removed(datum/source) + SIGNAL_HANDLER + scrubber_duplicates -= source + +/obj/item/circuit_component/air_alarm_scrubbers/populate_options() + scrubbers = add_option_port("Scrubber", null) + +/obj/item/circuit_component/air_alarm_scrubbers/populate_ports() + gas_filter = add_input_port("Gas To Filter", PORT_TYPE_STRING, trigger = null) + set_gas_filter = add_input_port("Set Filter", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_gas_to_filter)) + enable_extended_range = add_input_port("Enable Extra Range", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_range)) + disable_extended_range = add_input_port("Disable Extra Range", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_range)) + enable_siphon = add_input_port("Enable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + disable_siphon = add_input_port("Disable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + enable = add_input_port("Enable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_scrubber)) + disable = add_input_port("Disable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_scrubber)) + request_update = add_input_port("Request Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(update_data)) + + enabled = add_output_port("Enabled", PORT_TYPE_NUMBER) + is_siphoning = add_output_port("Siphoning", PORT_TYPE_NUMBER) + filtering = add_output_port("Filtered Gases", PORT_TYPE_STRING) + update_received = add_output_port("Update Received", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/air_alarm_scrubbers/duplicate + display_name = "Air Alarm Scrubber Control" + circuit_size = 0 + ui_buttons = list() + +/obj/item/circuit_component/air_alarm_scrubbers/duplicate/Destroy() + connected_alarm = null + return ..() + +/obj/item/circuit_component/air_alarm_scrubbers/duplicate/removed_from(obj/item/integrated_circuit/removed_from) + if(!QDELING(src)) + qdel(src) + return ..() + +/obj/item/circuit_component/air_alarm_scrubbers/removed_from(obj/item/integrated_circuit/removed_from) + QDEL_LIST(scrubber_duplicates) + return ..() + +/obj/item/circuit_component/air_alarm_scrubbers/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/airalarm)) + connected_alarm = shell + scrubbers.possible_options = extract_id_tags(connected_alarm.my_area.air_scrubbers) + +/obj/item/circuit_component/air_alarm_scrubbers/unregister_usb_parent(atom/movable/shell) + connected_alarm = null + scrubbers.possible_options = null + for(var/obj/item/circuit_component/air_alarm_scrubbers/scrubber as anything in scrubber_duplicates) + scrubber.connected_alarm = null + return ..() + +/obj/item/circuit_component/air_alarm_scrubbers/get_ui_notices() + . = ..() + var/static/list/meta_data = list() + if(length(meta_data) == 0) + for(var/typepath as anything in GLOB.meta_gas_info) + meta_data += GLOB.meta_gas_info[typepath][META_GAS_ID] + . += create_table_notices(meta_data) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/set_gas_to_filter(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(set_gas_filter_async), port) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/set_gas_filter_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/list/valid_filters = list() + for(var/info in gas_filter.value) + var/gas_type = gas_id2path(info) + if(!gas_type) + continue + valid_filters += gas_type + + var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber = find_by_id_tag(connected_alarm.my_area.air_scrubbers, scrubbers.value) + if(isnull(scrubber)) + return + + scrubber.filter_types = valid_filters + +/obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_scrubber(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_scrubber_async), port) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_scrubber_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + // var/scrubber_id = scrubbers.value + var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber = find_by_id_tag(connected_alarm.my_area.air_scrubbers, scrubbers.value) + if (isnull(scrubber)) + return + + scrubber.on = (port == enable) + scrubber.update_appearance(UPDATE_ICON) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_range(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_range_async), port) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_range_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber = find_by_id_tag(connected_alarm.my_area.air_scrubbers, scrubbers.value) + if(isnull(scrubber)) + return + + scrubber.widenet = (port == enable_extended_range) + scrubber.update_appearance(UPDATE_ICON) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_siphon(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_siphon_async), port) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_siphon_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber = find_by_id_tag(connected_alarm.my_area.air_scrubbers, scrubbers.value) + if(isnull(scrubber)) + return + + scrubber.scrubbing = (port != enable_siphon) + scrubber.update_appearance(UPDATE_ICON) + +/obj/item/circuit_component/air_alarm_scrubbers/proc/update_data() + CIRCUIT_TRIGGER + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber = find_by_id_tag(connected_alarm.my_area.air_scrubbers, scrubbers.value) + if(isnull(scrubber)) + return + + enabled.set_value(scrubber.on) + is_siphoning.set_value(scrubber.scrubbing == ATMOS_DIRECTION_SCRUBBING) + + var/list/filtered = list() + + for(var/datum/gas/gas_type as anything in scrubber.filter_types) + filtered += initial(gas_type.id) + + filtering.set_value(filtered) + + update_received.set_value(COMPONENT_SIGNAL) + +/obj/item/circuit_component/air_alarm_vents + display_name = "Air Alarm Vent Core Control" + desc = "Controls the vents in the room." + + var/datum/port/input/option/vents + + /// Enables the vent + var/datum/port/input/enable + /// Disables the vent + var/datum/port/input/disable + + /// Enables siphoning + var/datum/port/input/enable_siphon + /// Disables siphoning + var/datum/port/input/disable_siphon + /// Enables external + var/datum/port/input/enable_external + /// Disables external + var/datum/port/input/disable_external + /// External target pressure + var/datum/port/input/external_pressure + /// Enables internal + var/datum/port/input/enable_internal + /// Disables internal + var/datum/port/input/disable_internal + /// Internal target pressure + var/datum/port/input/internal_pressure + /// Requests an update of the data + var/datum/port/input/request_update + + + /// Whether the scrubber is enabled or not + var/datum/port/output/enabled + /// Whether the scrubber is siphoning or not + var/datum/port/output/is_siphoning + /// Whether internal pressure is on or not + var/datum/port/output/internal_on + /// Whether external pressure is on or not + var/datum/port/output/external_on + /// Reported external pressure + var/datum/port/output/current_external_pressure + /// Reported internal pressure + var/datum/port/output/current_internal_pressure + /// Sent when an update is received + var/datum/port/output/update_received + + var/obj/machinery/airalarm/connected_alarm + + ui_buttons = list( + "plus" = "add_new_component" + ) + + var/static/list/filtering_map = list() + + var/max_vent_duplicates = 20 + var/list/vent_duplicates = list() + +/obj/item/circuit_component/air_alarm_vents/ui_perform_action(mob/user, action) + if(length(vent_duplicates) >= max_vent_duplicates) + return + + if(action == "add_new_component") + var/obj/item/circuit_component/air_alarm_vents/component = new /obj/item/circuit_component/air_alarm_vents/duplicate(parent) + parent.add_component(component) + RegisterSignal(component, COMSIG_PARENT_QDELETING, PROC_REF(on_duplicate_removed)) + vent_duplicates += component + component.connected_alarm = connected_alarm + component.vents.possible_options = extract_id_tags(connected_alarm.my_area.air_vents) + +/obj/item/circuit_component/air_alarm_vents/proc/on_duplicate_removed(datum/source) + SIGNAL_HANDLER + vent_duplicates -= source + +/obj/item/circuit_component/air_alarm_vents/populate_options() + vents = add_option_port("Vent", null) + +/obj/item/circuit_component/air_alarm_vents/populate_ports() + external_pressure = add_input_port("External Pressure", PORT_TYPE_NUMBER, trigger = PROC_REF(set_external_pressure)) + internal_pressure = add_input_port("Internal Pressure", PORT_TYPE_NUMBER, trigger = PROC_REF(set_internal_pressure)) + + enable_external = add_input_port("Enable External", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_external)) + disable_external = add_input_port("Disable External", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_external)) + enable_internal = add_input_port("Enable Internal", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_internal)) + disable_internal = add_input_port("Disable Internal", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_internal)) + + enable_siphon = add_input_port("Enable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + disable_siphon = add_input_port("Disable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + enable = add_input_port("Enable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_vent)) + disable = add_input_port("Disable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_vent)) + request_update = add_input_port("Request Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(update_data)) + + enabled = add_output_port("Enabled", PORT_TYPE_NUMBER) + is_siphoning = add_output_port("Siphoning", PORT_TYPE_NUMBER) + external_on = add_output_port("External On", PORT_TYPE_NUMBER) + internal_on = add_output_port("Internal On", PORT_TYPE_NUMBER) + current_external_pressure = add_output_port("External Pressure", PORT_TYPE_NUMBER) + current_internal_pressure = add_output_port("Internal Pressure", PORT_TYPE_NUMBER) + update_received = add_output_port("Update Received", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/air_alarm_vents/duplicate + display_name = "Air Alarm Vent Control" + + circuit_size = 0 + ui_buttons = list() + +/obj/item/circuit_component/air_alarm_vents/duplicate/removed_from(obj/item/integrated_circuit/removed_from) + if(!QDELING(src)) + qdel(src) + return ..() + +/obj/item/circuit_component/air_alarm_vents/duplicate/Destroy() + connected_alarm = null + return ..() + +/obj/item/circuit_component/air_alarm_vents/removed_from(obj/item/integrated_circuit/removed_from) + QDEL_LIST(vent_duplicates) + return ..() + +/obj/item/circuit_component/air_alarm_vents/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/airalarm)) + connected_alarm = shell + vents.possible_options = extract_id_tags(connected_alarm.my_area.air_vents) + +/obj/item/circuit_component/air_alarm_vents/unregister_usb_parent(atom/movable/shell) + connected_alarm = null + vents.possible_options = null + for(var/obj/item/circuit_component/air_alarm_vents/vent as anything in vent_duplicates) + vent.connected_alarm = null + return ..() + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_vent(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_vent_async), port) + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_vent_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + vent.on = (port == enable) + vent.update_appearance(UPDATE_ICON) + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_external(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_external_async), port) + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_external_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + if(port == enable_external) + vent.pressure_checks |= ATMOS_EXTERNAL_BOUND + else + vent.pressure_checks &= ~ATMOS_EXTERNAL_BOUND + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_internal(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_internal_async), port) + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_internal_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + if(port == enable_internal) + vent.pressure_checks |= ATMOS_INTERNAL_BOUND + else + vent.pressure_checks &= ~ATMOS_INTERNAL_BOUND + +/obj/item/circuit_component/air_alarm_vents/proc/set_internal_pressure(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(set_internal_pressure_async), port) + +/obj/item/circuit_component/air_alarm_vents/proc/set_internal_pressure_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + vent.internal_pressure_bound = clamp(internal_pressure.value, 0, ATMOS_PUMP_MAX_PRESSURE) + +/obj/item/circuit_component/air_alarm_vents/proc/set_external_pressure(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(set_external_pressure_async), port) + +/obj/item/circuit_component/air_alarm_vents/proc/set_external_pressure_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + vent.internal_pressure_bound = clamp(external_pressure.value, 0, ATMOS_PUMP_MAX_PRESSURE) + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_siphon(datum/port/input/port) + CIRCUIT_TRIGGER + INVOKE_ASYNC(src, PROC_REF(toggle_siphon_async), port) + +/obj/item/circuit_component/air_alarm_vents/proc/toggle_siphon_async(datum/port/input/port) + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + vent.pump_direction = (port == enable_siphon) ? ATMOS_DIRECTION_SIPHONING : ATMOS_DIRECTION_RELEASING + +/obj/item/circuit_component/air_alarm_vents/proc/update_data() + CIRCUIT_TRIGGER + if(!connected_alarm || connected_alarm.locked) + return + + var/obj/machinery/atmospherics/components/unary/vent_pump/vent = find_by_id_tag(connected_alarm.my_area.air_vents, vents.value) + if(isnull(vent)) + return + + enabled.set_value(vent.on) + is_siphoning.set_value(vent.pump_direction == ATMOS_DIRECTION_SIPHONING) + internal_on.set_value(!!(vent.pressure_checks & ATMOS_INTERNAL_BOUND)) + current_internal_pressure.set_value(vent.internal_pressure_bound) + external_on.set_value(!!(vent.pressure_checks & ATMOS_EXTERNAL_BOUND)) + current_external_pressure.set_value(vent.external_pressure_bound) + update_received.set_value(COMPONENT_SIGNAL) diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm new file mode 100644 index 0000000000000..c522aaaaf5635 --- /dev/null +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm @@ -0,0 +1,188 @@ + +/obj/machinery/airalarm/crowbar_act(mob/living/user, obj/item/tool) + if(buildstage != AIR_ALARM_BUILD_NO_WIRES) + return + user.visible_message("[user.name] removes the electronics from [name].", \ + "You start prying out the circuit...") + tool.play_tool_sound(src) + if (tool.use_tool(src, user, 20)) + if (buildstage == AIR_ALARM_BUILD_NO_WIRES) + to_chat(user, "You remove the air alarm electronics.") + new /obj/item/electronics/airalarm(drop_location()) + playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) + buildstage = AIR_ALARM_BUILD_NO_CIRCUIT + update_icon() + return TRUE + +/obj/machinery/airalarm/screwdriver_act(mob/living/user, obj/item/tool) + if(buildstage != AIR_ALARM_BUILD_COMPLETE) + return + tool.play_tool_sound(src) + panel_open = !panel_open + to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].") + update_icon() + return TRUE + +/obj/machinery/airalarm/wirecutter_act(mob/living/user, obj/item/tool) + if(!(buildstage == AIR_ALARM_BUILD_COMPLETE && panel_open && wires.is_all_cut())) + return + tool.play_tool_sound(src) + to_chat(user, "You cut the final wires.") + var/obj/item/stack/cable_coil/cables = new(drop_location(), 5) + user.put_in_hands(cables) + buildstage = AIR_ALARM_BUILD_NO_WIRES + update_icon() + return TRUE + +/obj/machinery/airalarm/wrench_act(mob/living/user, obj/item/tool) + if(buildstage != AIR_ALARM_BUILD_NO_CIRCUIT) + return + to_chat(user, "You detach \the [src] from the wall.") + tool.play_tool_sound(src) + var/obj/item/wallframe/airalarm/alarm_frame = new(drop_location()) + user.put_in_hands(alarm_frame) + qdel(src) + return TRUE + + +/obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) + if((buildstage == AIR_ALARM_BUILD_NO_CIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) + return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 2 SECONDS, "cost" = 1) + return FALSE + +/obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) + switch(passed_mode) + if(RCD_UPGRADE_SIMPLE_CIRCUITS) + user.visible_message("[user] fabricates a circuit and places it into [src].", \ + "You adapt an air alarm circuit and slot it into the assembly.") + buildstage = AIR_ALARM_BUILD_NO_WIRES + update_icon() + return TRUE + return FALSE + +/obj/machinery/airalarm/AltClick(mob/user) + . = ..() + if(!can_interact(user)) + return + togglelock(user) + return TRUE + +/obj/machinery/airalarm/proc/togglelock(mob/living/user) + if(machine_stat & (NOPOWER|BROKEN)) + to_chat(user, "It does nothing!") + else + if(issiliconoradminghost(user)) + locked = !locked + return + if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) + locked = !locked + to_chat(user, "You [ locked ? "lock" : "unlock"] the air alarm interface.") + if(!locked) + ui_interact(user) + else + to_chat(user, "Access denied.") + +/obj/machinery/airalarm/on_emag(mob/user) + . = ..() + if(obj_flags & EMAGGED) + return FALSE + obj_flags |= EMAGGED + visible_message("Sparks fly out of [src]!") + balloon_alert(user, "authentication sensors scrambled") + playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + return TRUE + +/obj/machinery/airalarm/on_deconstruction(disassembled = TRUE) + new /obj/item/stack/sheet/iron(loc, 2) + if((buildstage == AIR_ALARM_BUILD_NO_WIRES) || (buildstage == AIR_ALARM_BUILD_COMPLETE)) + var/obj/item/electronics/airalarm/alarm = new(loc) + if(!disassembled) + alarm.take_damage(alarm.max_integrity * 0.5, sound_effect = FALSE) + if((buildstage == AIR_ALARM_BUILD_COMPLETE)) + new /obj/item/stack/cable_coil(loc, 3) + +/obj/machinery/airalarm/attackby(obj/item/W, mob/user, params) + switch(buildstage) + if(AIR_ALARM_BUILD_COMPLETE) + if(W.GetID())// trying to unlock the interface with an ID card + togglelock(user) + return + else if(panel_open && is_wire_tool(W)) + wires.interact(user) + return + if(AIR_ALARM_BUILD_NO_WIRES) + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/cable = W + if(cable.get_amount() < 5) + to_chat(user, "You need five lengths of cable to wire the air alarm!") + return + user.visible_message("[user.name] wires the air alarm.", \ + "You start wiring the air alarm...") + if (do_after(user, 2 SECONDS, target = src)) + if (cable.get_amount() >= 5 && buildstage == AIR_ALARM_BUILD_NO_WIRES) + cable.use(5) + to_chat(user, "You wire the air alarm.") + wires.repair() + aidisabled = FALSE + locked = FALSE + shorted = FALSE + danger_level = AIR_ALARM_ALERT_NONE + buildstage = AIR_ALARM_BUILD_COMPLETE + select_mode(user, /datum/air_alarm_mode/filtering) + update_icon() + return + if(AIR_ALARM_BUILD_NO_CIRCUIT) + if(istype(W, /obj/item/electronics/airalarm)) + if(user.temporarilyRemoveItemFromInventory(W)) + to_chat(user, "You insert the circuit.") + buildstage = AIR_ALARM_BUILD_NO_WIRES + update_icon() + qdel(W) + return + + if(istype(W, /obj/item/electroadaptive_pseudocircuit)) + var/obj/item/electroadaptive_pseudocircuit/P = W + if(!P.adapt_circuit(user, 25)) + return + user.visible_message("[user] fabricates a circuit and places it into [src].", \ + "You adapt an air alarm circuit and slot it into the assembly.") + buildstage = AIR_ALARM_BUILD_NO_WIRES + update_icon() + return + + return ..() + +/obj/machinery/airalarm/proc/reset(wire) + switch(wire) + if(WIRE_POWER) + if(!wires.is_cut(WIRE_POWER)) + shorted = FALSE + update_icon() + if(WIRE_AI) + if(!wires.is_cut(WIRE_AI)) + aidisabled = FALSE + +/obj/machinery/airalarm/proc/shock(mob/user, prb) + if((machine_stat & (NOPOWER))) // unpowered, no shock + return FALSE + if(!prob(prb)) + return FALSE //you lucked out, no shock for you + var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread + s.set_up(5, 1, src) + s.start() //sparks always. + if (electrocute_mob(user, get_area(src), src, 1, TRUE)) + return TRUE + else + return FALSE + +/obj/item/electronics/airalarm + name = "air alarm electronics" + icon_state = "airalarm_electronics" + +/obj/item/wallframe/airalarm + name = "air alarm frame" + desc = "Used for building Air Alarms." + icon = 'icons/obj/monitors.dmi' + icon_state = "alarm_bitem" + result_path = /obj/machinery/airalarm + pixel_shift = 27 diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_modes.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_modes.dm new file mode 100644 index 0000000000000..b1c61844533bd --- /dev/null +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_modes.dm @@ -0,0 +1,215 @@ +/// Keys are [/datum/air_alarm_mode] paths +/// Values are their respective instances. +GLOBAL_LIST_INIT(air_alarm_modes, init_air_alarm_modes()) + +/proc/init_air_alarm_modes() + var/list/ret = list() + for(var/mode_path in subtypesof(/datum/air_alarm_mode)) + ret[mode_path] = new mode_path + return ret + +/// Various modes that an [/obj/machinery/airalarm] can assume. +/datum/air_alarm_mode + /// Name of the mode. + var/name + /// More detail on the mode. + var/desc + /// TRUE if this mode can be dangerous if selected. + var/danger + /// TRUE if the air alarm needs to be emagged for this to be selected. + var/emag = FALSE + +/** The proc that runs when this air alarm mode is selected. + * + * Arguments: + * * applied - which area will we apply this mode to. + */ +/datum/air_alarm_mode/proc/apply(area/applied) + return + +/datum/air_alarm_mode/proc/replace(area/applied, pressure, obj/machinery/airalarm/air_alarm) + return + +/// The default. +/datum/air_alarm_mode/filtering + name = "Filtering" + desc = "Scrubs out contaminants" + danger = FALSE + +/datum/air_alarm_mode/filtering/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = TRUE + vent.pressure_checks = ATMOS_EXTERNAL_BOUND + vent.external_pressure_bound = ONE_ATMOSPHERE + vent.pump_direction = ATMOS_DIRECTION_RELEASING + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + scrubber.filter_types = list(/datum/gas/carbon_dioxide) + scrubber.set_scrubbing(ATMOS_DIRECTION_SCRUBBING) + scrubber.set_widenet(FALSE) + +/datum/air_alarm_mode/contaminated + name = "Contaminated" + desc = "Scrubs out ALL contaminants quickly" + danger = FALSE + +/datum/air_alarm_mode/contaminated/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = TRUE + vent.pressure_checks = ATMOS_EXTERNAL_BOUND + vent.external_pressure_bound = ONE_ATMOSPHERE + vent.pump_direction = ATMOS_DIRECTION_RELEASING + vent.update_appearance(UPDATE_ICON) + + var/list/filtered = subtypesof(/datum/gas) + filtered -= list(/datum/gas/oxygen, /datum/gas/nitrogen) + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + scrubber.filter_types = filtered.Copy() + scrubber.set_scrubbing(ATMOS_DIRECTION_SCRUBBING) + scrubber.set_widenet(TRUE) + +/datum/air_alarm_mode/draught + name = "Draught" + desc = "Siphons out air while replacing" + danger = FALSE + +/datum/air_alarm_mode/draught/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = TRUE + vent.pressure_checks = ATMOS_EXTERNAL_BOUND + vent.external_pressure_bound = ONE_ATMOSPHERE * 2 + vent.pump_direction = ATMOS_DIRECTION_RELEASING + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + scrubber.set_widenet(FALSE) + scrubber.set_scrubbing(ATMOS_DIRECTION_SIPHONING) + +/datum/air_alarm_mode/refill + name = "Refill" + desc = "Triple vent output" + danger = TRUE + +/datum/air_alarm_mode/refill/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = TRUE + vent.pressure_checks = ATMOS_EXTERNAL_BOUND + vent.external_pressure_bound = ONE_ATMOSPHERE * 3 + vent.pump_direction = ATMOS_DIRECTION_RELEASING + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + + scrubber.filter_types = list(/datum/gas/carbon_dioxide) + scrubber.set_widenet(FALSE) + scrubber.set_scrubbing(ATMOS_DIRECTION_SCRUBBING) + +/datum/air_alarm_mode/cycle + name = "Cycle" + desc = "Siphons air before replacing" + danger = TRUE + +/// Same as [/datum/air_alarm_mode/siphon/apply] +/datum/air_alarm_mode/cycle/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = FALSE + vent.update_icon() + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + scrubber.set_widenet(TRUE) + scrubber.set_scrubbing(ATMOS_DIRECTION_SIPHONING) + +/// Special case for cycles. Cycles need to refill the air again after it's scrubbed out so this proc is called. +/// Same as [/datum/air_alarm_mode/filtering/apply] +/datum/air_alarm_mode/cycle/replace(area/applied, pressure, obj/machinery/airalarm/air_alarm) + if(pressure >= ONE_ATMOSPHERE * 0.05) + return + + air_alarm.select_mode(air_alarm, /datum/air_alarm_mode/filtering) + +/datum/air_alarm_mode/siphon + name = "Siphon" + desc = "Siphons air out of the room" + danger = TRUE + +/datum/air_alarm_mode/siphon/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = FALSE + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + scrubber.set_widenet(FALSE) + scrubber.set_scrubbing(ATMOS_DIRECTION_SIPHONING) + +/datum/air_alarm_mode/panic_siphon + name = "Panic Siphon" + desc = "Siphons air out of the room quickly" + danger = TRUE + +/datum/air_alarm_mode/panic_siphon/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = FALSE + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = TRUE + scrubber.set_widenet(TRUE) + scrubber.set_scrubbing(ATMOS_DIRECTION_SIPHONING) + +/datum/air_alarm_mode/off + name = "Off" + desc = "Shuts off vents and scrubbers" + danger = FALSE + +/datum/air_alarm_mode/off/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = FALSE + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = FALSE + scrubber.update_appearance(UPDATE_ICON) + +/datum/air_alarm_mode/flood + name = "Flood" + desc = "Shuts off scrubbers and opens vents" + danger = TRUE + emag = TRUE + +/datum/air_alarm_mode/flood/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = TRUE + vent.pressure_checks = ATMOS_INTERNAL_BOUND + vent.internal_pressure_bound = 0 + vent.pump_direction = ATMOS_DIRECTION_RELEASING + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = FALSE + scrubber.update_appearance(UPDATE_ICON) + +/datum/air_alarm_mode/vent_siphon + name = "Vent siphon" + desc = "Disables scrubbers and turns vents to siphon" + danger = TRUE + emag = TRUE // siphoning things with vents can horribly fuck up distro, even if its surprisingly fast + +/datum/air_alarm_mode/vent_siphon/apply(area/applied) + for (var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in applied.air_vents) + vent.on = TRUE + vent.pressure_checks = NONE + vent.internal_pressure_bound = 0 + vent.external_pressure_bound = 0 + vent.pump_direction = ATMOS_DIRECTION_SIPHONING + vent.update_appearance(UPDATE_ICON) + + for (var/obj/machinery/atmospherics/components/unary/vent_scrubber/scrubber as anything in applied.air_scrubbers) + scrubber.on = FALSE + scrubber.update_appearance(UPDATE_ICON) diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm new file mode 100644 index 0000000000000..197e0f520a61f --- /dev/null +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm @@ -0,0 +1,111 @@ +// A datum for dealing with threshold limit values +/datum/tlv + var/warning_min = 0 + var/warning_max = 0 + var/hazard_min = 0 + var/hazard_max = 0 + +/** Initialize a TLV and set its values if given arguments, mostly for map varedits. + * We provide this functionality but please consider not doing this and making proper subtypes. + * Only by doing the latter will [datum/tlv/proc/reset_value] work. + */ +/datum/tlv/New(min2 as num, min1 as num, max1 as num, max2 as num) + if(min2) + hazard_min = min2 + if(min1) + warning_min = min1 + if(max1) + warning_max = max1 + if(max2) + hazard_max = max2 + +/datum/tlv/proc/check_value(val) + if(hazard_max != TLV_VALUE_IGNORE && val >= hazard_max) + return AIR_ALARM_ALERT_HAZARD + if(hazard_min != TLV_VALUE_IGNORE && val <= hazard_min) + return AIR_ALARM_ALERT_HAZARD + if(warning_max != TLV_VALUE_IGNORE && val >= warning_max) + return AIR_ALARM_ALERT_WARNING + if(warning_min != TLV_VALUE_IGNORE && val <= warning_min) + return AIR_ALARM_ALERT_WARNING + + return AIR_ALARM_ALERT_NONE + +/** Set this particular TLV + * + * Arguments: + * * threshold_type: What kind of variable do we want to set. Accepts bitfield subsets of [TLV_VAR_ALL]. + * * value: How much to set it to. Accepts a number or [TLV_VALUE_IGNORE] + */ +/datum/tlv/proc/set_value(threshold_type, value) + if(threshold_type & TLV_VAR_WARNING_MIN) + warning_min = value + if(threshold_type & TLV_VAR_HAZARD_MIN) + hazard_min = value + if(threshold_type & TLV_VAR_WARNING_MAX) + warning_max = value + if(threshold_type & TLV_VAR_HAZARD_MAX) + hazard_max = value + +/** Reset this particular TLV to its original value. + * + * Arguments: + * * threshold_type: What kind of variable do we want to set. Accepts bitfield subsets of [TLV_VAR_ALL]. + */ +/datum/tlv/proc/reset_value(threshold_type) + if(threshold_type & TLV_VAR_WARNING_MIN) + warning_min = initial(warning_min) + if(threshold_type & TLV_VAR_HAZARD_MIN) + hazard_min = initial(hazard_min) + if(threshold_type & TLV_VAR_WARNING_MAX) + warning_max = initial(warning_max) + if(threshold_type & TLV_VAR_HAZARD_MAX) + hazard_max = initial(hazard_max) + +/datum/tlv/no_checks + warning_min = TLV_VALUE_IGNORE + hazard_min = TLV_VALUE_IGNORE + warning_max = TLV_VALUE_IGNORE + hazard_max = TLV_VALUE_IGNORE + +/datum/tlv/dangerous + warning_min = TLV_VALUE_IGNORE + hazard_min = TLV_VALUE_IGNORE + warning_max = 0.2 + hazard_max = 0.5 + +/datum/tlv/oxygen + warning_min = 19 + hazard_min = 16 + warning_max = TLV_VALUE_IGNORE + hazard_max = TLV_VALUE_IGNORE + +/datum/tlv/carbon_dioxide + warning_min = TLV_VALUE_IGNORE + hazard_min = TLV_VALUE_IGNORE + warning_max = 5 + hazard_max = 10 + +/datum/tlv/pressure + warning_min = WARNING_LOW_PRESSURE + hazard_min = HAZARD_LOW_PRESSURE + warning_max = WARNING_HIGH_PRESSURE + hazard_max = HAZARD_HIGH_PRESSURE + +/datum/tlv/temperature + warning_min = BODYTEMP_COLD_WARNING_1+10 + hazard_min = BODYTEMP_COLD_WARNING_1 + warning_max = BODYTEMP_HEAT_WARNING_1-27 + hazard_max = BODYTEMP_HEAT_WARNING_1 + +/datum/tlv/cold_room_pressure + warning_min = ONE_ATMOSPHERE * 0.9 + hazard_min = ONE_ATMOSPHERE * 0.8 + warning_max = ONE_ATMOSPHERE * 1.1 + hazard_max = ONE_ATMOSPHERE * 1.2 + +/datum/tlv/cold_room_temperature + warning_min = COLD_ROOM_TEMP - 20 + hazard_min = COLD_ROOM_TEMP - 40 + warning_max = COLD_ROOM_TEMP + 20 + hazard_max = COLD_ROOM_TEMP + 40 diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm deleted file mode 100644 index bc5aa655922ab..0000000000000 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ /dev/null @@ -1,966 +0,0 @@ -/datum/tlv - var/min2 - var/min1 - var/max1 - var/max2 - -/datum/tlv/New(min2 as num, min1 as num, max1 as num, max2 as num) - if(min2) src.min2 = min2 - if(min1) src.min1 = min1 - if(max1) src.max1 = max1 - if(max2) src.max2 = max2 - -/datum/tlv/proc/get_danger_level(val as num) - if(max2 != -1 && val >= max2) - return 2 - if(min2 != -1 && val <= min2) - return 2 - if(max1 != -1 && val >= max1) - return 1 - if(min1 != -1 && val <= min1) - return 1 - return 0 - -/datum/tlv/no_checks - min2 = -1 - min1 = -1 - max1 = -1 - max2 = -1 - -/datum/tlv/dangerous - min2 = -1 - min1 = -1 - max1 = 0.2 - max2 = 0.5 - -/obj/item/electronics/airalarm - name = "air alarm electronics" - custom_price = 5 - icon_state = "airalarm_electronics" - -/obj/item/wallframe/airalarm - name = "air alarm frame" - desc = "Used for building Air Alarms." - icon = 'icons/obj/monitors.dmi' - icon_state = "alarm_bitem" - result_path = /obj/machinery/airalarm - pixel_shift = 24 - -#define AALARM_MODE_SCRUBBING 1 -#define AALARM_MODE_VENTING 2 //makes draught -#define AALARM_MODE_PANIC 3 //like siphon, but stronger (enables widenet) -#define AALARM_MODE_REPLACEMENT 4 //sucks off all air, then refill and swithes to scrubbing -#define AALARM_MODE_OFF 5 -#define AALARM_MODE_FLOOD 6 //Emagged mode; turns off scrubbers and pressure checks on vents -#define AALARM_MODE_SIPHON 7 //Scrubbers suck air -#define AALARM_MODE_CONTAMINATED 8 //Turns on all filtering and widenet scrubbing. -#define AALARM_MODE_REFILL 9 //just like normal, but with triple the air output - -#define AALARM_REPORT_TIMEOUT 100 - -/obj/machinery/airalarm - name = "air alarm" - desc = "A machine that monitors atmosphere levels and alerts if the area is dangerous." - icon = 'icons/obj/monitors.dmi' - icon_state = "alarmp" - use_power = IDLE_POWER_USE - idle_power_usage = 4 - active_power_usage = 8 - power_channel = AREA_USAGE_ENVIRON - req_access = list(ACCESS_ATMOSPHERICS) - max_integrity = 250 - integrity_failure = 0.33 - armor_type = /datum/armor/machinery_airalarm - resistance_flags = FIRE_PROOF - clicksound = 'sound/machines/terminal_select.ogg' - layer = ABOVE_WINDOW_LAYER - - - var/danger_level = 0 - var/mode = AALARM_MODE_SCRUBBING - - var/locked = TRUE - var/aidisabled = 0 - var/shorted = 0 - var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone - - var/frequency = FREQ_ATMOS_CONTROL - var/alarm_frequency = FREQ_ATMOS_ALARMS - var/datum/radio_frequency/radio_connection - ///Represents a signel source of atmos alarms, complains to all the listeners if one of our thresholds is violated - var/datum/alarm_handler/alarm_manager - - var/list/TLV = list( // Breathable air. - "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa. Values are min2, min1, max1, max2 - "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), - GAS_O2 = new/datum/tlv(16, 19, 40, 50), // Partial pressure, kpa - GAS_N2 = new/datum/tlv(-1, -1, 1000, 1000), - GAS_CO2 = new/datum/tlv(-1, -1, 5, 10), - GAS_PLASMA = new/datum/tlv/dangerous, - GAS_NITROUS = new/datum/tlv/dangerous, - GAS_BZ = new/datum/tlv/dangerous, - GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - GAS_H2O = new/datum/tlv/dangerous, - GAS_TRITIUM = new/datum/tlv/dangerous, - GAS_STIMULUM = new/datum/tlv/dangerous, - GAS_NITRYL = new/datum/tlv/dangerous, - GAS_PLUOXIUM = new/datum/tlv(-1, -1, 5, 6), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires - ) - - -/datum/armor/machinery_airalarm - energy = 100 - rad = 100 - fire = 90 - acid = 30 - -/obj/machinery/airalarm/server // No checks here. - TLV = list( - "pressure" = new/datum/tlv/no_checks, - "temperature" = new/datum/tlv/no_checks, - GAS_O2 = new/datum/tlv/no_checks, - GAS_N2 = new/datum/tlv/no_checks, - GAS_CO2 = new/datum/tlv/no_checks, - GAS_PLASMA = new/datum/tlv/no_checks, - GAS_NITROUS = new/datum/tlv/no_checks, - GAS_BZ = new/datum/tlv/no_checks, - GAS_HYPERNOB = new/datum/tlv/no_checks, - GAS_H2O = new/datum/tlv/no_checks, - GAS_TRITIUM = new/datum/tlv/no_checks, - GAS_STIMULUM = new/datum/tlv/no_checks, - GAS_NITRYL = new/datum/tlv/no_checks, - GAS_PLUOXIUM = new/datum/tlv/no_checks - ) - -/obj/machinery/airalarm/kitchen_cold_room // Kitchen cold rooms start off at -20°C or 253.15 K. - TLV = list( - "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa - "temperature" = new/datum/tlv(T0C-273.15, T0C-80, T0C-10, T0C+10), - GAS_O2 = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - GAS_N2 = new/datum/tlv(-1, -1, 1000, 1000), - GAS_CO2 = new/datum/tlv(-1, -1, 5, 10), - GAS_PLASMA = new/datum/tlv/dangerous, - GAS_NITROUS = new/datum/tlv/dangerous, - GAS_BZ = new/datum/tlv/dangerous, - GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - GAS_H2O = new/datum/tlv/dangerous, - GAS_TRITIUM = new/datum/tlv/dangerous, - GAS_STIMULUM = new/datum/tlv/dangerous, - GAS_NITRYL = new/datum/tlv/dangerous, - GAS_PLUOXIUM = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires - ) - -/obj/machinery/airalarm/unlocked - locked = FALSE - -/obj/machinery/airalarm/engine - name = "engine air alarm" - locked = FALSE - req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) - -/obj/machinery/airalarm/mixingchamber - name = "chamber air alarm" - locked = FALSE - req_access = null - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOX, ACCESS_TOX_STORAGE) - -/obj/machinery/airalarm/all_access - name = "all-access air alarm" - desc = "This particular atmospherics control unit appears to have no access restrictions." - locked = FALSE - req_access = null - req_one_access = null - -/obj/machinery/airalarm/syndicate //general syndicate access - req_access = list(ACCESS_SYNDICATE) - -/obj/machinery/airalarm/away //general away mission access - req_access = list(ACCESS_AWAY_GENERAL) - -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) - -//all air alarms in area are connected via magic -/area - var/list/air_vent_names = list() - var/list/air_scrub_names = list() - var/list/air_vent_info = list() - var/list/air_scrub_info = list() - -CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/airalarm) - -/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild) - . = ..() - wires = new /datum/wires/airalarm(src) - if(ndir) - setDir(ndir) - - if(nbuild) - buildstage = 0 - panel_open = TRUE - - if(name == initial(name)) - name = "[get_area_name(src)] Air Alarm" - - alarm_manager = new(src) - update_appearance() - - set_frequency(frequency) - AddComponent(/datum/component/usb_port, list( - /obj/item/circuit_component/air_alarm, - )) - GLOB.zclear_atoms += src - -/obj/machinery/airalarm/Destroy() - SSradio.remove_object(src, frequency) - QDEL_NULL(wires) - QDEL_NULL(alarm_manager) - GLOB.zclear_atoms -= src - return ..() - -/obj/machinery/airalarm/examine(mob/user) - . = ..() - switch(buildstage) - if(0) - . += span_notice("It is missing air alarm electronics.") - if(1) - . += span_notice("It is missing wiring.") - if(2) - . += span_notice("Alt-click to [locked ? "unlock" : "lock"] the interface.") - -/obj/machinery/airalarm/ui_status(mob/user) - if(user.has_unlimited_silicon_privilege && aidisabled) - to_chat(user, "AI control has been disabled.") - else if(!shorted) - return ..() - return UI_CLOSE - - -/obj/machinery/airalarm/ui_state(mob/user) - return GLOB.default_state - -/obj/machinery/airalarm/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "AirAlarm") - ui.open() - ui.set_autoupdate(TRUE) // Turf gas mixture - -//Oh my, thats a lot of data being sent that should probably be refactored -/obj/machinery/airalarm/ui_data(mob/user) - var/data = list( - "locked" = locked, - "siliconUser" = user.has_unlimited_silicon_privilege, - "emagged" = (obj_flags & EMAGGED ? 1 : 0), - "danger_level" = danger_level, - ) - - var/area/A = get_area(src) - data["atmos_alarm"] = !!A.active_alarms[ALARM_ATMOS] - data["fire_alarm"] = A.fire - - var/turf/T = get_turf(src) - var/datum/gas_mixture/environment = T.return_air() - var/datum/tlv/cur_tlv - - data["environment_data"] = list() - var/pressure = environment.return_pressure() - cur_tlv = TLV["pressure"] - data["environment_data"] += list(list( - "name" = "Pressure", - "value" = pressure, - "unit" = "kPa", - "danger_level" = cur_tlv.get_danger_level(pressure) - )) - var/temperature = environment.return_temperature() - cur_tlv = TLV["temperature"] - data["environment_data"] += list(list( - "name" = "Temperature", - "value" = temperature, - "unit" = "K ([round(temperature - T0C, 0.1)]C)", - "danger_level" = cur_tlv.get_danger_level(temperature) - )) - var/total_moles = environment.total_moles() - var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.return_temperature() / environment.return_volume() - for(var/gas_id in environment.get_gases()) - if(!(gas_id in TLV)) // We're not interested in this gas, it seems. - continue - cur_tlv = TLV[gas_id] - data["environment_data"] += list(list( - "name" = GLOB.gas_data.names[gas_id], - "value" = environment.get_moles(gas_id) / total_moles * 100, - "unit" = "%", - "danger_level" = cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure) - )) - - if(!locked || user.has_unlimited_silicon_privilege) - data["vents"] = list() - for(var/id_tag in A.air_vent_names) - var/long_name = A.air_vent_names[id_tag] - var/list/info = A.air_vent_info[id_tag] - if(!info || info["frequency"] != frequency || info["has_aac"]) - continue - data["vents"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "power" = info["power"], - "checks" = info["checks"], - "excheck" = info["checks"]&1, - "incheck" = info["checks"]&2, - "direction" = info["direction"], - "external" = info["external"], - "internal" = info["internal"], - "extdefault"= (info["external"] == ONE_ATMOSPHERE), - "intdefault"= (info["internal"] == 0) - )) - data["scrubbers"] = list() - for(var/id_tag in A.air_scrub_names) - var/long_name = A.air_scrub_names[id_tag] - var/list/info = A.air_scrub_info[id_tag] - if(!info || info["frequency"] != frequency) - continue - data["scrubbers"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "power" = info["power"], - "scrubbing" = info["scrubbing"], - "widenet" = info["widenet"], - "filter_types" = info["filter_types"] - )) - data["mode"] = mode - data["modes"] = list() - data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) - data["modes"] += list(list("name" = "Contaminated - Scrubs out ALL contaminants quickly","mode" = AALARM_MODE_CONTAMINATED, "selected" = mode == AALARM_MODE_CONTAMINATED, "danger" = 0)) - data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) - data["modes"] += list(list("name" = "Refill - Triple vent output", "mode" = AALARM_MODE_REFILL, "selected" = mode == AALARM_MODE_REFILL, "danger" = 1)) - data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) - data["modes"] += list(list("name" = "Siphon - Siphons air out of the room", "mode" = AALARM_MODE_SIPHON, "selected" = mode == AALARM_MODE_SIPHON, "danger" = 1)) - data["modes"] += list(list("name" = "Panic Siphon - Siphons air out of the room quickly","mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) - data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) - if(obj_flags & EMAGGED) - data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) - - var/datum/tlv/selected - var/list/thresholds = list() - - selected = TLV["pressure"] - thresholds += list(list("name" = "Pressure", "settings" = list())) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min2", "selected" = selected.min2)) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min1", "selected" = selected.min1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max1", "selected" = selected.max1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max2", "selected" = selected.max2)) - - selected = TLV["temperature"] - thresholds += list(list("name" = "Temperature", "settings" = list())) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min2", "selected" = selected.min2)) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min1", "selected" = selected.min1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max1", "selected" = selected.max1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max2", "selected" = selected.max2)) - - for(var/gas_id in GLOB.gas_data.names) - if(!(gas_id in TLV)) // We're not interested in this gas, it seems. - continue - selected = TLV[gas_id] - thresholds += list(list("name" = GLOB.gas_data.names[gas_id], "settings" = list())) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min2", "selected" = selected.min2)) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min1", "selected" = selected.min1)) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max1", "selected" = selected.max1)) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max2", "selected" = selected.max2)) - - data["thresholds"] = thresholds - return data - -/obj/machinery/airalarm/ui_act(action, params) - if(..() || buildstage != 2) - return - if((locked && !usr.has_unlimited_silicon_privilege) || (usr.has_unlimited_silicon_privilege && aidisabled)) - return - var/device_id = params["id_tag"] - switch(action) - if("lock") - if(usr.has_unlimited_silicon_privilege && !wires.is_cut(WIRE_IDSCAN)) - locked = !locked - . = TRUE - if("power", "toggle_filter", "widenet", "scrubbing", "direction") - send_signal(device_id, list("[action]" = params["val"]), usr) - . = TRUE - if("excheck") - send_signal(device_id, list("checks" = text2num(params["val"])^1), usr) - . = TRUE - if("incheck") - send_signal(device_id, list("checks" = text2num(params["val"])^2), usr) - . = TRUE - if("set_external_pressure", "set_internal_pressure") - var/target = params["value"] - if(!isnull(target)) - send_signal(device_id, list("[action]" = target), usr) - . = TRUE - if("reset_external_pressure") - send_signal(device_id, list("reset_external_pressure"), usr) - . = TRUE - if("reset_internal_pressure") - send_signal(device_id, list("reset_internal_pressure"), usr) - . = TRUE - if("threshold") - var/env = params["env"] - if(text2path(env)) - env = text2path(env) - - var/name = params["var"] - var/datum/tlv/tlv = TLV[env] - if(isnull(tlv)) - return - var/value = input("New [name] for [env]:", name, tlv.vars[name]) as num|null - if(!isnull(value) && !..()) - if(value < 0) - tlv.vars[name] = -1 - else - tlv.vars[name] = round(value, 0.01) - investigate_log(" treshold value for [env]:[name] was set to [value] by [key_name(usr)]",INVESTIGATE_ATMOS) - . = TRUE - if("mode") - mode = text2num(params["mode"]) - investigate_log("was turned to [get_mode_name(mode)] mode by [key_name(usr)]",INVESTIGATE_ATMOS) - apply_mode(usr) - . = TRUE - if("alarm") - if(alarm_manager.send_alarm(ALARM_ATMOS)) - post_alert(2) - . = TRUE - if("reset") - if(alarm_manager.clear_alarm(ALARM_ATMOS)) - post_alert(0) - . = TRUE - if(.) - update_appearance() - - -/obj/machinery/airalarm/proc/reset(wire) - switch(wire) - if(WIRE_POWER) - if(!wires.is_cut(WIRE_POWER)) - shorted = FALSE - wires.ui_update() - update_icon() - if(WIRE_AI) - if(!wires.is_cut(WIRE_AI)) - aidisabled = FALSE - wires.ui_update() - - -/obj/machinery/airalarm/proc/shock(mob/user, prb) - if((machine_stat & (NOPOWER))) // unpowered, no shock - return 0 - if(!prob(prb)) - return 0 //you lucked out, no shock for you - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, src) - s.start() //sparks always. - if (electrocute_mob(user, get_area(src), src, 1, TRUE)) - return 1 - else - return 0 - -/obj/machinery/airalarm/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_TO_AIRALARM) - -/obj/machinery/airalarm/proc/send_signal(target, list/command, atom/user)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise - if(!radio_connection) - return 0 - - var/datum/signal/signal = new(command) - signal.data["tag"] = target - signal.data["sigtype"] = "command" - signal.data["user"] = user - radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) - - return 1 - -/obj/machinery/airalarm/proc/get_mode_name(mode_value) - switch(mode_value) - if(AALARM_MODE_SCRUBBING) - return "Filtering" - if(AALARM_MODE_CONTAMINATED) - return "Contaminated" - if(AALARM_MODE_VENTING) - return "Draught" - if(AALARM_MODE_REFILL) - return "Refill" - if(AALARM_MODE_PANIC) - return "Panic Siphon" - if(AALARM_MODE_REPLACEMENT) - return "Cycle" - if(AALARM_MODE_SIPHON) - return "Siphon" - if(AALARM_MODE_OFF) - return "Off" - if(AALARM_MODE_FLOOD) - return "Flood" - -/obj/machinery/airalarm/proc/apply_mode(atom/signal_source) - var/area/A = get_area(src) - switch(mode) - if(AALARM_MODE_SCRUBBING) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 1, - "set_filters" = list(GAS_CO2, GAS_BZ), - "scrubbing" = 1, - "widenet" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 1, - "checks" = 1, - "set_external_pressure" = ONE_ATMOSPHERE - ), signal_source) - if(AALARM_MODE_CONTAMINATED) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 1, - "set_filters" = list( - GAS_CO2, - GAS_PLASMA, - GAS_H2O, - GAS_HYPERNOB, - GAS_NITROUS, - GAS_NITRYL, - GAS_TRITIUM, - GAS_BZ, - GAS_STIMULUM, - GAS_PLUOXIUM - ), - "scrubbing" = 1, - "widenet" = 1 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 1, - "checks" = 1, - "set_external_pressure" = ONE_ATMOSPHERE - ), signal_source) - if(AALARM_MODE_VENTING) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 1, - "widenet" = 0, - "scrubbing" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 1, - "checks" = 1, - "set_external_pressure" = ONE_ATMOSPHERE*2 - ), signal_source) - if(AALARM_MODE_REFILL) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 1, - "set_filters" = list(GAS_CO2, GAS_BZ), - "scrubbing" = 1, - "widenet" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 1, - "checks" = 1, - "set_external_pressure" = ONE_ATMOSPHERE * 3 - ), signal_source) - if(AALARM_MODE_PANIC, - AALARM_MODE_REPLACEMENT) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 1, - "widenet" = 1, - "scrubbing" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 0 - ), signal_source) - if(AALARM_MODE_SIPHON) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 1, - "widenet" = 0, - "scrubbing" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 0 - ), signal_source) - - if(AALARM_MODE_OFF) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 0 - ), signal_source) - if(AALARM_MODE_FLOOD) - for(var/device_id in A.air_scrub_names) - send_signal(device_id, list( - "power" = 0 - ), signal_source) - for(var/device_id in A.air_vent_names) - send_signal(device_id, list( - "power" = 1, - "checks" = 2, - "set_internal_pressure" = 0 - ), signal_source) - -/obj/machinery/airalarm/update_appearance(updates) - . = ..() - - if(panel_open || (machine_stat & (NOPOWER|BROKEN)) || shorted) - set_light(0) - return - - var/area/our_area = get_area(src) - var/color - switch(max(danger_level, !!our_area.active_alarms[ALARM_ATMOS])) - if(0) - color = "#03A728" // green - if(1) - color = "#EC8B2F" // yellow - if(2) - color = "#DA0205" // red - - set_light(1.4, 1, color) - -/obj/machinery/airalarm/update_icon_state() - if(panel_open) - switch(buildstage) - if(2) - icon_state = "alarmx" - if(1) - icon_state = "alarm_b2" - if(0) - icon_state = "alarm_b1" - return ..() - - icon_state = "alarmp" - return ..() - -/obj/machinery/airalarm/update_overlays() - . = ..() - - if((machine_stat & (NOPOWER|BROKEN)) || shorted) - return - - var/area/our_area = get_area(src) - var/state - switch(max(danger_level, !!our_area.active_alarms[ALARM_ATMOS])) - if(0) - state = "alarm0" - if(1) - state = "alarm2" //yes, alarm2 is yellow alarm - if(2) - state = "alarm1" - - . += mutable_appearance(icon, state) - . += emissive_appearance(icon, state, alpha = src.alpha) - -/obj/machinery/airalarm/process() - if((machine_stat & (NOPOWER|BROKEN)) || shorted) - return - - var/turf/location = get_turf(src) - if(!location) - return - - var/datum/tlv/cur_tlv - - var/datum/gas_mixture/environment = location.return_air() - var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.return_temperature() / environment.return_volume() - - cur_tlv = TLV["pressure"] - var/environment_pressure = environment.return_pressure() - var/pressure_dangerlevel = cur_tlv.get_danger_level(environment_pressure) - - cur_tlv = TLV["temperature"] - var/temperature_dangerlevel = cur_tlv.get_danger_level(environment.return_temperature()) - - var/gas_dangerlevel = 0 - for(var/gas_id in environment.get_gases()) - if(!(gas_id in TLV)) // We're not interested in this gas, it seems. - continue - cur_tlv = TLV[gas_id] - gas_dangerlevel = max(gas_dangerlevel, cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure)) - - var/old_danger_level = danger_level - danger_level = max(pressure_dangerlevel, temperature_dangerlevel, gas_dangerlevel) - - if(old_danger_level != danger_level) - apply_danger_level() - if(mode == AALARM_MODE_REPLACEMENT && environment_pressure < ONE_ATMOSPHERE * 0.05) - mode = AALARM_MODE_SCRUBBING - apply_mode(src) - - -/obj/machinery/airalarm/proc/post_alert(alert_level) - var/datum/radio_frequency/frequency = SSradio.return_frequency(alarm_frequency) - - if(!frequency) - return - - var/datum/signal/alert_signal = new(list( - "zone" = get_area_name(src, TRUE), - "type" = "Atmospheric" - )) - var/area/A = get_area(src) - if(alert_level==2) - alert_signal.data["alert"] = "severe" - A.set_pressure_alarm_effect() - else if (alert_level==1) - alert_signal.data["alert"] = "minor" - A.set_pressure_alarm_effect() - else if (alert_level==0) - alert_signal.data["alert"] = "clear" - A.unset_pressure_alarm_effect() - - frequency.post_signal(src, alert_signal, range = -1) - -/obj/machinery/airalarm/proc/apply_danger_level() - var/area/A = get_area(src) - - var/new_area_danger_level = 0 - for(var/obj/machinery/airalarm/AA in A) - if (!(AA.machine_stat & (NOPOWER|BROKEN)) && !AA.shorted) - new_area_danger_level = clamp(max(new_area_danger_level, AA.danger_level), 0, 1) - - var/did_anything_happen - if(new_area_danger_level) - did_anything_happen = alarm_manager.send_alarm(ALARM_ATMOS) - else - did_anything_happen = alarm_manager.clear_alarm(ALARM_ATMOS) - if(did_anything_happen) //if something actually changed - post_alert(new_area_danger_level) - - update_appearance() - -/obj/machinery/airalarm/attackby(obj/item/W, mob/user, params) - switch(buildstage) - if(2) - if(W.tool_behaviour == TOOL_WIRECUTTER && panel_open && wires.is_all_cut()) - W.play_tool_sound(src) - to_chat(user, span_notice("You cut the final wires.")) - new /obj/item/stack/cable_coil(loc, 5) - buildstage = 1 - update_icon() - return - else if(W.tool_behaviour == TOOL_SCREWDRIVER) // Opening that Air Alarm up. - W.play_tool_sound(src) - panel_open = !panel_open - to_chat(user, span_notice("The wires have been [panel_open ? "exposed" : "unexposed"].")) - update_icon() - return - else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/modular_computer/tablet/pda))// trying to unlock the interface with an ID card - togglelock(user) - return - else if(panel_open && is_wire_tool(W)) - wires.interact(user) - return - if(1) - if(W.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user.name] removes the electronics from [src.name].",\ - span_notice("You start prying out the circuit.")) - W.play_tool_sound(src) - if (W.use_tool(src, user, 20)) - if (buildstage == 1) - to_chat(user, span_notice("You remove the air alarm electronics.")) - new /obj/item/electronics/airalarm( src.loc ) - playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) - buildstage = 0 - update_icon() - return - - if(istype(W, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/cable = W - if(cable.get_amount() < 5) - to_chat(user, span_warning("You need five lengths of cable to wire the air alarm!")) - return - user.visible_message("[user.name] wires the air alarm.", \ - span_notice("You start wiring the air alarm.")) - if (do_after(user, 20, target = src)) - if (cable.get_amount() >= 5 && buildstage == 1) - cable.use(5) - to_chat(user, span_notice("You wire the air alarm.")) - wires.repair() - aidisabled = 0 - locked = FALSE - mode = 1 - shorted = 0 - post_alert(0) - buildstage = 2 - update_icon() - return - if(0) - if(istype(W, /obj/item/electronics/airalarm)) - if(user.temporarilyRemoveItemFromInventory(W)) - to_chat(user, span_notice("You insert the circuit.")) - buildstage = 1 - update_icon() - qdel(W) - return - - if(istype(W, /obj/item/electroadaptive_pseudocircuit)) - var/obj/item/electroadaptive_pseudocircuit/P = W - if(!P.adapt_circuit(user, 25)) - return - user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ - span_notice("You adapt an air alarm circuit and slot it into the assembly.")) - buildstage = 1 - update_icon() - return - - if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, span_notice("You detach \the [src] from the wall.")) - W.play_tool_sound(src) - new /obj/item/wallframe/airalarm( user.loc ) - qdel(src) - return - - return ..() - -/obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) - if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) - return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) - return FALSE - -/obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) - switch(passed_mode) - if(RCD_UPGRADE_SIMPLE_CIRCUITS) - user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ - span_notice("You adapt an air alarm circuit and slot it into the assembly.")) - buildstage = 1 - update_icon() - return TRUE - return FALSE - -/obj/machinery/airalarm/AltClick(mob/user) - if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc)) - return - else - togglelock(user) - -/obj/machinery/airalarm/proc/togglelock(mob/living/user) - if(machine_stat & (NOPOWER|BROKEN)) - to_chat(user, span_warning("It does nothing!")) - else - if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) - locked = !locked - to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the air alarm interface.")) - updateUsrDialog() - else - to_chat(user, span_danger("Access denied.")) - return - -/obj/machinery/airalarm/on_emag(mob/user) - ..() - visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You emag [src], disabling its safeties.")) - playsound(src, "sparks", 50, 1) - -/obj/machinery/airalarm/atom_break(damage_flag) - ..() - update_icon() - -/obj/machinery/airalarm/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/iron(loc, 2) - var/obj/item/I = new /obj/item/electronics/airalarm(loc) - if(!disassembled) - I.take_damage(I.max_integrity * 0.5, sound_effect=FALSE) - new /obj/item/stack/cable_coil(loc, 3) - qdel(src) - -/obj/item/circuit_component/air_alarm - display_name = "Air Alarm" - desc = "Controls levels of gases and their temperature as well as all vents and scrubbers in the room." - - var/datum/port/input/option/air_alarm_options - - var/datum/port/input/min_2 - var/datum/port/input/min_1 - var/datum/port/input/max_1 - var/datum/port/input/max_2 - - var/datum/port/input/request_data - - var/datum/port/output/pressure - var/datum/port/output/temperature - var/datum/port/output/gas_amount - - var/obj/machinery/airalarm/connected_alarm - var/list/options_map - -/obj/item/circuit_component/air_alarm/populate_ports() - min_2 = add_input_port("Min 2", PORT_TYPE_NUMBER) - min_1 = add_input_port("Min 1", PORT_TYPE_NUMBER) - max_1 = add_input_port("Max 1", PORT_TYPE_NUMBER) - max_2 = add_input_port("Max 2", PORT_TYPE_NUMBER) - request_data = add_input_port("Request Atmosphere Data", PORT_TYPE_SIGNAL) - - pressure = add_output_port("Pressure", PORT_TYPE_NUMBER) - temperature = add_output_port("Temperature", PORT_TYPE_NUMBER) - gas_amount = add_output_port("Chosen Gas Amount", PORT_TYPE_NUMBER) - -/obj/item/circuit_component/air_alarm/populate_options() - var/static/list/component_options - - if(!component_options) - component_options = list( - "Pressure" = "pressure", - "Temperature" = "temperature" - ) - - for(var/gas_id in GLOB.gas_data.ids) - component_options[GLOB.gas_data.names[gas_id]] = gas_id - - air_alarm_options = add_option_port("Air Alarm Options", component_options) - options_map = component_options - -/obj/item/circuit_component/air_alarm/register_usb_parent(atom/movable/parent) - . = ..() - if(istype(parent, /obj/machinery/airalarm)) - connected_alarm = parent - -/obj/item/circuit_component/air_alarm/unregister_usb_parent(atom/movable/parent) - connected_alarm = null - return ..() - -/obj/item/circuit_component/air_alarm/input_received(datum/port/input/port) - if(!connected_alarm || connected_alarm.locked) - return - - var/current_option = air_alarm_options.value - - if(COMPONENT_TRIGGERED_BY(request_data, port)) - var/turf/alarm_turf = get_turf(connected_alarm) - var/datum/gas_mixture/environment = alarm_turf.return_air() - pressure.set_output(round(environment.return_pressure())) - temperature.set_output(round(environment.return_temperature())) - if(ispath(options_map[current_option])) - gas_amount.set_output(round(environment.get_moles(current_option))) - return - - var/datum/tlv/settings = connected_alarm.TLV[options_map[current_option]] - settings.min2 = min_2 - settings.min1 = min_1 - settings.max1 = max_1 - settings.max2 = max_2 - -#undef AALARM_MODE_SCRUBBING -#undef AALARM_MODE_VENTING -#undef AALARM_MODE_PANIC -#undef AALARM_MODE_REPLACEMENT -#undef AALARM_MODE_OFF -#undef AALARM_MODE_FLOOD -#undef AALARM_MODE_SIPHON -#undef AALARM_MODE_CONTAMINATED -#undef AALARM_MODE_REFILL -#undef AALARM_REPORT_TIMEOUT diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 362f7f6102595..8ded22ac537df 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -1,42 +1,46 @@ // Quick overview: // -// Pipes combine to form pipelines -// Pipelines and other atmospheric objects combine to form pipe_networks +// Pipes combine to form pipenets +// Pipenets and other atmospheric objects combine to form pipe_networks // Note: A single pipe_network represents a completely open space // -// Pipes -> Pipelines -// Pipelines + Other Objects -> Pipe network +// Pipes -> Pipenets +// Pipenets + Other Objects -> Pipe network #define PIPE_VISIBLE_LEVEL 2 #define PIPE_HIDDEN_LEVEL 1 /obj/machinery/atmospherics anchored = TRUE - move_resist = INFINITY //Moving a connected machine without actually doing the normal (dis)connection things will probably cause a LOT of issues. + move_resist = INFINITY //Moving a connected machine without actually doing the normal (dis)connection things will probably cause a LOT of issues. (this imply moving machines with something that can push turfs like a megafauna) idle_power_usage = 0 active_power_usage = 0 power_channel = AREA_USAGE_ENVIRON layer = GAS_PIPE_HIDDEN_LAYER //under wires + armor_type = /datum/armor/machinery_atmospherics resistance_flags = FIRE_PROOF max_integrity = 200 obj_flags = CAN_BE_HIT | ON_BLUEPRINTS flags_1 = STAT_UNIQUE_1 - var/can_unwrench = 0 - var/initialize_directions = 0 - var/pipe_color + ///Check if the object can be unwrenched + var/can_unwrench = FALSE + ///Bitflag of the initialized directions (NORTH | SOUTH | EAST | WEST) + var/initialize_directions = NONE + ///The color of the pipe + var/pipe_color = COLOR_VERY_LIGHT_GRAY + ///What layer the pipe is in (from 1 to 5, default 3) var/piping_layer = PIPING_LAYER_DEFAULT + ///The flags of the pipe/component (PIPING_ALL_LAYER | PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE) var/pipe_flags = NONE ///This only works on pipes, because they have 1000 subtypes which need to be visible and invisible under tiles, so we track this here var/hide = TRUE - var/static/list/iconsetids = list() - var/static/list/pipeimages = list() - + ///The image of the pipe/device used for ventcrawling var/image/pipe_vision_img = null ///The type of the device (UNARY, BINARY, TRINARY, QUATERNARY) - var/device_type = 0 + var/device_type = NONE ///The lists of nodes that a pipe/device has, depends on the device_type var (from 1 to 4) var/list/obj/machinery/atmospherics/nodes @@ -45,11 +49,20 @@ ///icon_state as a pipe item var/pipe_state ///Check if the device should be on or off (mostly used in processing for machines) - var/on = FALSE - /// whether it can be painted - var/paintable = FALSE + var/on = FALSE///Whether it can be painted + var/paintable = TRUE - armor_type = /datum/armor/machinery_atmospherics + ///Is the thing being rebuilt by SSair or not. Prevents list bloat + var/rebuilding = FALSE + + ///The bitflag that's being checked on ventcrawling. Default is to allow ventcrawling and seeing pipes. + var/vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE + + ///keeps the name of the object from being overridden if it's vareditted. + var/override_naming + + ///If we should init and immediately start processing + var/init_processing = FALSE /datum/armor/machinery_atmospherics melee = 25 @@ -60,6 +73,10 @@ fire = 100 acid = 70 +/obj/machinery/atmospherics/LateInitialize() + . = ..() + update_name() + /obj/machinery/atmospherics/examine(mob/user) . = ..() . += span_notice("[src] is on layer [piping_layer].") @@ -68,56 +85,115 @@ if(L.ventcrawler) . += span_notice("Alt-click to crawl through it.") -/obj/machinery/atmospherics/New(loc, process = TRUE, setdir) +/obj/machinery/atmospherics/New(loc, process = TRUE, setdir, init_dir = ALL_CARDINALS) if(!isnull(setdir)) setDir(setdir) if(pipe_flags & PIPING_CARDINAL_AUTONORMALIZE) normalize_cardinal_directions() nodes = new(device_type) + init_processing = process ..() - if(process) + set_init_directions(init_dir) + +/obj/machinery/atmospherics/Initialize(mapload) + if(mapload && name != initial(name)) + override_naming = TRUE + if(init_processing) SSair.start_processing_machine(src) - SetInitDirections() + return ..() /obj/machinery/atmospherics/Destroy() for(var/i in 1 to device_type) - nullifyNode(i) + nullify_node(i) SSair.stop_processing_machine(src) - SSair.pipenets_needing_rebuilt -= src + SSair.rebuild_queue -= src - if(pipe_vision_img) - qdel(pipe_vision_img) + QDEL_NULL(pipe_vision_img) return ..() - //return QDEL_HINT_FINDREFERENCE -/obj/machinery/atmospherics/proc/destroy_network() +/** + * Run when you update the conditions in which an /atom might want to start reacting to its turf's air + */ +/atom/proc/atmos_conditions_changed() return -/obj/machinery/atmospherics/proc/build_network() - // Called to build a network from this node - return +/atom/movable/atmos_conditions_changed() + var/turf/open/open_loc = loc + if(!isopenturf(open_loc)) + return + var/datum/gas_mixture/turf_gas = open_loc.air + if(isnull(turf_gas)) + return + check_atmos_process(open_loc, turf_gas, turf_gas.temperature) + +/turf/open/atmos_conditions_changed() + if(isnull(air)) + return + check_atmos_process(src, air, air.temperature) -/obj/machinery/atmospherics/proc/nullifyNode(i) - if(nodes[i]) - var/obj/machinery/atmospherics/N = nodes[i] - N.disconnect(src) - nodes[i] = null +/** + * Called by the machinery disconnect(), custom for each type + */ +/obj/machinery/atmospherics/proc/destroy_network() + return -/obj/machinery/atmospherics/proc/getNodeConnects() - var/list/node_connects = list() - node_connects.len = device_type +/obj/machinery/atmospherics/proc/set_on(active) + on = active + SEND_SIGNAL(src, COMSIG_ATMOS_MACHINE_SET_ON, on) + +/// This should only be called by SSair as part of the rebuild queue. +/// Handles rebuilding pipenets after init or they've been changed. +/obj/machinery/atmospherics/proc/rebuild_pipes() + var/list/targets = get_rebuild_targets() + rebuilding = FALSE + for(var/datum/pipenet/build_off as anything in targets) + build_off.build_pipenet(src) //This'll add to the expansion queue + +/** + * Returns a list of new pipenets that need to be built up + */ +/obj/machinery/atmospherics/proc/get_rebuild_targets() + return +/** + * Called on destroy(mostly deconstruction) and when moving nodes around, disconnect the nodes from the network + * Arguments: + * * i - is the current iteration of the node, based on the device_type (from 1 to 4) + */ +/obj/machinery/atmospherics/proc/nullify_node(i) + if(!nodes[i]) + return + var/obj/machinery/atmospherics/node_machine = nodes[i] + node_machine.disconnect(src) + nodes[i] = null + +/** + * Getter for node_connects + * + * Return a list of the nodes that can connect to other machines, get called by atmos_init() + */ +/obj/machinery/atmospherics/proc/get_node_connects() + var/list/node_connects[device_type] //empty list of size device_type + + var/init_directions = get_init_directions() for(var/i in 1 to device_type) - for(var/D in GLOB.cardinals) - if(D & GetInitDirections()) - if(D in node_connects) - continue - node_connects[i] = D - break + for(var/direction in GLOB.cardinals) + if(!(direction & init_directions)) + continue + if(direction in node_connects) + continue + node_connects[i] = direction + break + return node_connects +/** + * Setter for device direction + * + * Set the direction to either SOUTH or WEST if the pipe_flag is set to PIPING_CARDINAL_AUTONORMALIZE, called in New(), used mostly by layer manifolds + */ /obj/machinery/atmospherics/proc/normalize_cardinal_directions() switch(dir) if(SOUTH) @@ -125,78 +201,173 @@ if(WEST) setDir(EAST) -//this is called just after the air controller sets up turfs -/obj/machinery/atmospherics/proc/atmosinit(list/node_connects) + +/** + * Initialize for atmos devices + * + * initialize the nodes for each pipe/device, this is called just after the air controller sets up turfs + * Arguments: + * * list/node_connects - a list of the nodes on the device that can make a connection to other machines + */ +/obj/machinery/atmospherics/proc/atmos_init(list/node_connects) if(!node_connects) //for pipes where order of nodes doesn't matter - node_connects = getNodeConnects() + node_connects = get_node_connects() for(var/i in 1 to device_type) for(var/obj/machinery/atmospherics/target in get_step(src,node_connects[i])) - if(can_be_node(target, i)) + if(can_be_node(target)) nodes[i] = target break update_icon() -/obj/machinery/atmospherics/proc/setPipingLayer(new_layer) +/** + * setter for pipe layers + * + * Set the layer of the pipe that the device has to a new_layer + * Arguments: + * * new_layer - the layer at which we want the piping_layer to be (1 to 5) + */ +/obj/machinery/atmospherics/proc/set_piping_layer(new_layer) piping_layer = (pipe_flags & PIPING_DEFAULT_LAYER_ONLY) ? PIPING_LAYER_DEFAULT : new_layer update_icon() -/obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target, iteration) +/obj/machinery/atmospherics/update_icon() + update_layer() + return ..() + +/** + * Check if a node can actually exists by connecting to another machine + * called on atmosinit() + * Arguments: + * * obj/machinery/atmospherics/target - the machine we are connecting to + * * iteration - the current node we are checking (from 1 to 4) + */ +/obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target) return connection_check(target, piping_layer) -//Find a connecting /obj/machinery/atmospherics in specified direction -/obj/machinery/atmospherics/proc/findConnecting(direction, prompted_layer) - for(var/obj/machinery/atmospherics/target in get_step_multiz(src, direction)) - if(target.initialize_directions & get_dir(target,src) && !istype(target, /obj/machinery/atmospherics/pipe/multiz)) - if(connection_check(target, prompted_layer)) - return target +/** + * Find a connecting /obj/machinery/atmospherics in specified direction, called by relaymove() + * used by ventcrawling mobs to check if they can move inside a pipe in a specific direction + * Arguments: + * * direction - the direction we are checking against + * * prompted_layer - the piping_layer we are inside + */ +/obj/machinery/atmospherics/proc/find_connecting(direction, prompted_layer) + for(var/obj/machinery/atmospherics/target in get_step_multiz(src, direction)) + if(!(target.initialize_directions & get_dir(target,src))) + continue + if(connection_check(target, prompted_layer)) + return target + +/** + * Check the connection between two nodes + * + * Check if our machine and the target machine are connectable by both calling isConnectable and by checking that the directions and piping_layer are compatible + * called by can_be_node() (for building a network) and find_connecting() (for ventcrawling) + * Arguments: + * * obj/machinery/atmospherics/target - the machinery we want to connect to + * * given_layer - the piping_layer we are checking + */ /obj/machinery/atmospherics/proc/connection_check(obj/machinery/atmospherics/target, given_layer) - if(isConnectable(target, given_layer) && target.isConnectable(src, given_layer) && (target.initialize_directions & get_dir(target,src) || istype(target, /obj/machinery/atmospherics/pipe/multiz))) - return TRUE - return FALSE + //if target is not multiz then we have to check if the target & src connect in the same direction + if(!istype(target, /obj/machinery/atmospherics/pipe/multiz) && !((initialize_directions & get_dir(src, target)) && (target.initialize_directions & get_dir(target, src)))) + return FALSE -/obj/machinery/atmospherics/proc/isConnectable(obj/machinery/atmospherics/target, given_layer) + //both target & src can't be connected either way + if(!is_connectable(target, given_layer) || !target.is_connectable(src, given_layer)) + return FALSE + return TRUE + +/** + * check if the piping layer and color are the same on both sides (grey can connect to all colors) + * returns TRUE or FALSE if the connection is possible or not + * Arguments: + * * obj/machinery/atmospherics/target - the machinery we want to connect to + * * given_layer - the piping_layer we are connecting to + */ +/obj/machinery/atmospherics/proc/is_connectable(obj/machinery/atmospherics/target, given_layer) if(isnull(given_layer)) given_layer = piping_layer - if((target.piping_layer == given_layer) || (target.pipe_flags & PIPING_ALL_LAYER)) - return TRUE - return FALSE -/obj/machinery/atmospherics/proc/pipeline_expansion() + // you can't place the machine on the same location as the target cause it blocks + if(target.loc == loc) + return FALSE + + //if the target is not in the same piping layer & it does not have the all layer connection flag[which allows it to be connected regardless of layer] then we are out + if(target.pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS) + if(ISODD(given_layer)) + return FALSE + else if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER)) + return FALSE + + //if the target does not have the same color and it does not have all color connection flag[which allows it to be connected regardless of color] & one of the pipes is not gray[allowing for connection regardless] then we are out + if(target.pipe_color != pipe_color && !((target.pipe_flags | pipe_flags) & PIPING_ALL_COLORS) && target.pipe_color != COLOR_VERY_LIGHT_GRAY && pipe_color != COLOR_VERY_LIGHT_GRAY) + return FALSE + + return TRUE + +/** + * Called on construction and when expanding the datum_pipenet, returns the nodes of the device + */ +/obj/machinery/atmospherics/proc/pipenet_expansion() return nodes -/obj/machinery/atmospherics/proc/SetInitDirections() +/** + * Set the initial directions of the device (NORTH || SOUTH || EAST || WEST), called on New() + */ +/obj/machinery/atmospherics/proc/set_init_directions(init_dir) return -/obj/machinery/atmospherics/proc/GetInitDirections() +/** + * Getter of initial directions + */ +/obj/machinery/atmospherics/proc/get_init_directions() return initialize_directions -/obj/machinery/atmospherics/proc/returnPipenet() +/** + * Called by addMember() in datum_pipenet.dm, returns the parent network the device is connected to + */ +/obj/machinery/atmospherics/proc/return_pipenet() return -/obj/machinery/atmospherics/proc/returnPipenetAir() +/* + * Called by add_machinery_member() in datum_pipenet.dm, returns a list of gas_mixtures and assigns them into other_airs (by add_machinery_member) to allow pressure redistribution for the machineries. + */ +/obj/machinery/atmospherics/proc/return_pipenet_airs() return -/obj/machinery/atmospherics/proc/setPipenet() +/** + * Called by build_pipenet() and addMember() in datum_pipenet.dm, set the network the device is connected to, to the datum pipenet it has reference + */ +/obj/machinery/atmospherics/proc/set_pipenet() return -/obj/machinery/atmospherics/proc/replacePipenet() +/** + * Similar to setPipenet() but instead of setting a network to a pipenet, it replaces the old pipenet with a new one, called by Merge() in datum_pipenet.dm + */ +/obj/machinery/atmospherics/proc/replace_pipenet() return +/** + * Disconnects the nodes + * + * Called by nullify_node(), it disconnects two nodes by removing the reference id from the node itself that called this proc + * Arguments: + * * obj/machinery/atmospherics/reference - the machinery we are removing from the node connection + */ /obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference) if(istype(reference, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = reference P.destroy_network() - if(nodes.len >= nodes.Find(reference)) // for some reason things can still be acted on even though they've been deleted this is a really fucky way of detecting that - nodes[nodes.Find(reference)] = null - update_icon() + nodes[nodes.Find(reference)] = null + update_icon() /obj/machinery/atmospherics/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pipe)) //lets you autodrop var/obj/item/pipe/pipe = W if(user.dropItemToGround(pipe)) - pipe.setPipingLayer(piping_layer) //align it with us + pipe.set_piping_layer(piping_layer) //align it with us return TRUE else return ..() @@ -211,14 +382,31 @@ var/unsafe_wrenching = FALSE var/internal_pressure = int_air.return_pressure()-env_air.return_pressure() - - to_chat(user, span_notice("You begin to unfasten \the [src]...")) + var/empty_pipe = FALSE + if(istype(src, /obj/machinery/atmospherics/components)) + var/list/datum/gas_mixture/all_gas_mixes = return_analyzable_air() + var/empty_mixes = 0 + for(var/gas_mix_number in 1 to device_type) + var/datum/gas_mixture/gas_mix = all_gas_mixes[gas_mix_number] + if(!(gas_mix.total_moles() > 0)) + empty_mixes++ + if(!nodes[gas_mix_number] || (istype(nodes[gas_mix_number], /obj/machinery/atmospherics/components/unary/portables_connector) && !portable_device_connected(gas_mix_number))) + var/pressure_delta = all_gas_mixes[gas_mix_number].return_pressure() - env_air.return_pressure() + internal_pressure = internal_pressure > pressure_delta ? internal_pressure : pressure_delta + if(empty_mixes == device_type) + empty_pipe = TRUE + if(!(int_air.total_moles() > 0)) + empty_pipe = TRUE + + if(!empty_pipe) + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (internal_pressure > 2*ONE_ATMOSPHERE) to_chat(user, span_warning("As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?")) unsafe_wrenching = TRUE //Oh dear oh dear - if(I.use_tool(src, user, 20, volume=50)) + var/time_taken = empty_pipe ? 0 : 20 + if(I.use_tool(src, user, time_taken, volume=50)) user.visible_message( \ "[user] unfastens \the [src].", \ span_notice("You unfasten \the [src]."), \ @@ -233,10 +421,25 @@ return deconstruct(TRUE) return TRUE +/** + * Getter for can_unwrench + * + * Called by wrench_act() to check if the device can be unwrenched, each device override this with custom code (like if on/operating can't unwrench) + * Arguments: + * * mob/user - the mob doing the act + */ /obj/machinery/atmospherics/proc/can_unwrench(mob/user) return can_unwrench -// Throws the user when they unwrench a pipe with a major difference between the internal and environmental pressure. +/** + * Pipe pressure release calculations + * + * Throws the user when they unwrench a pipe with a major difference between the internal and environmental pressure. + * Called by wrench_act() before deconstruct() + * Arguments: + * * mob_user - the mob doing the act + * * pressures - it can be passed on from wrench_act(), it's the pressure difference between the enviroment pressure and the pipe internal pressure + */ /obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/living/carbon/user, pressures = null) if(!user) return @@ -262,42 +465,55 @@ /obj/machinery/atmospherics/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) if(can_unwrench) - var/obj/item/pipe/stored = new construction_type(loc, null, dir, src) - stored.setPipingLayer(piping_layer) + var/obj/item/pipe/stored = new construction_type(loc, null, dir, src, pipe_color) + stored.set_piping_layer(piping_layer) if(!disassembled) stored.take_damage(stored.max_integrity * 0.5, sound_effect=FALSE) transfer_fingerprints_to(stored) . = stored ..() -/obj/machinery/atmospherics/proc/getpipeimage(iconset, iconstate, direction, col=rgb(255,255,255), piping_layer=3, trinary = FALSE) - - //Add identifiers for the iconset - if(iconsetids[iconset] == null) - iconsetids[iconset] = num2text(iconsetids.len + 1) - - //Generate a unique identifier for this image combination - var/identifier = iconsetids[iconset] + "_[iconstate]_[direction]_[col]_[piping_layer]" - - if((!(. = pipeimages[identifier]))) - var/image/pipe_overlay - pipe_overlay = . = pipeimages[identifier] = image(iconset, iconstate, dir = direction) - pipe_overlay.color = col - PIPING_LAYER_SHIFT(pipe_overlay, piping_layer) - if(trinary && (piping_layer == 1 || piping_layer == 5)) - PIPING_FORWARD_SHIFT(pipe_overlay, piping_layer, 2) - -/obj/machinery/atmospherics/on_construction(obj_color, set_layer) +/** + * Getter for piping layer shifted, pipe colored overlays + * + * Creates the image for the pipe underlay that all components use, called by get_pipe_underlay() in components_base.dm + * Arguments: + * * iconfile - path of the iconstate we are using (ex: 'icons/obj/atmospherics/components/thermomachine.dmi') + * * iconstate - the image we are using inside the file + * * direction - the direction of our device + * * color - the color (in hex value, like #559900) that the pipe should have + * * piping_layer - the piping_layer the device is in, used inside PIPING_LAYER_SHIFT + * * trinary - if TRUE we also use PIPING_FORWARD_SHIFT on layer 1 and 5 for trinary devices (filters and mixers) + */ +/obj/machinery/atmospherics/proc/get_pipe_image(iconfile, iconstate, direction, color = COLOR_VERY_LIGHT_GRAY, piping_layer = 3, trinary = FALSE) + var/image/pipe_overlay = image(iconfile, iconstate, dir = direction) + pipe_overlay.color = color + PIPING_LAYER_SHIFT(pipe_overlay, piping_layer) + if(trinary == TRUE && (piping_layer == 1 || piping_layer == 5)) + PIPING_FORWARD_SHIFT(pipe_overlay, piping_layer, 2) + return pipe_overlay + +/obj/machinery/atmospherics/on_construction(mob/user, obj_color, set_layer = PIPING_LAYER_DEFAULT) if(can_unwrench) add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY) - pipe_color = obj_color - setPipingLayer(set_layer) - atmosinit() - var/list/nodes = pipeline_expansion() + set_pipe_color(obj_color) + set_piping_layer(set_layer) + atmos_init() + var/list/nodes = pipenet_expansion() for(var/obj/machinery/atmospherics/A in nodes) - A.atmosinit() - A.addMember(src) - build_network() + A.atmos_init() + A.add_member(src) + SSair.add_to_rebuild_queue(src) + +/obj/machinery/atmospherics/update_name() + if(!override_naming) + name = "[GLOB.pipe_color_name[pipe_color]] [initial(name)]" + return ..() + +/obj/machinery/atmospherics/vv_edit_var(vname, vval) + if(vname == NAMEOF(src, name)) + override_naming = TRUE + return ..() /obj/machinery/atmospherics/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) if(istype(arrived, /mob/living)) @@ -317,14 +533,14 @@ return if(user in buckled_mobs)// fixes buckle ventcrawl edgecase fuck bug return - var/obj/machinery/atmospherics/target_move = findConnecting(direction, user.ventcrawl_layer) + var/obj/machinery/atmospherics/target_move = find_connecting(direction, user.ventcrawl_layer) if(target_move) if(target_move.can_crawl_through()) if(is_type_in_typecache(target_move, GLOB.ventcrawl_machinery)) user.forceMove(target_move.loc) //handle entering and so on. user.visible_message(span_notice("You hear something squeezing through the ducts..."), span_notice("You climb out the ventilation system.")) else - var/list/pipenetdiff = returnPipenets() ^ target_move.returnPipenets() + var/list/pipenetdiff = return_pipenets() ^ target_move.return_pipenets() if(pipenetdiff.len) user.update_pipe_vision(target_move) user.forceMove(target_move) @@ -346,24 +562,60 @@ L.handle_ventcrawl(src) return -/// Whether ventcrawling creatures can move in or out of this machine. +/** + * Getter for vent crawling + * + * returns TRUE or FALSE, many devices overrides this (like cryo, or vents) + * called by relaymove() + */ /obj/machinery/atmospherics/proc/can_crawl_through() return TRUE -/obj/machinery/atmospherics/proc/returnPipenets() +/** + * Getter of a list of pipenets + * + * called in relaymove() to create the image for vent crawling + */ +/obj/machinery/atmospherics/proc/return_pipenets() return list() /obj/machinery/atmospherics/update_remote_sight(mob/user) user.sight |= (SEE_TURFS|BLIND) -//Used for certain children of obj/machinery/atmospherics to not show pipe vision when mob is inside it. +/** + * Used for certain children of obj/machinery/atmospherics to not show pipe vision when mob is inside it. + */ /obj/machinery/atmospherics/proc/can_see_pipes() return TRUE +/** + * Update the layer in which the pipe/device is in, that way pipes have consistent layer depending on piping_layer + */ /obj/machinery/atmospherics/proc/update_layer() - layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + return +/** + * Called by the RPD.dm pre_attack() + * Arguments: + * * paint_color - color that the pipe will be painted in (colors in hex like #4f4f4f) + */ /obj/machinery/atmospherics/proc/paint(paint_color) + if(paintable) + add_atom_colour(paint_color, FIXED_COLOUR_PRIORITY) + set_pipe_color(paint_color) + update_node_icon() + return paintable + +/// Setter for pipe color, so we can ensure it's all uniform and save cpu time +/obj/machinery/atmospherics/proc/set_pipe_color(pipe_colour) + src.pipe_color = uppertext(pipe_colour) + update_name() + +/// Return TRUE if there is device connected to portables_connector +/obj/machinery/atmospherics/proc/portable_device_connected(node) + var/obj/machinery/atmospherics/components/unary/portables_connector/portable_devices_connector = nodes[node] + if(portable_devices_connector.connected_device) + return TRUE return FALSE #undef PIPE_VISIBLE_LEVEL diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm index accec64dbd8c0..82da03a4124de 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm @@ -5,17 +5,26 @@ use_power = IDLE_POWER_USE device_type = BINARY layer = GAS_PUMP_LAYER + pipe_flags = PIPING_BRIDGE -/obj/machinery/atmospherics/components/binary/SetInitDirections() +/obj/machinery/atmospherics/components/binary/set_init_directions() switch(dir) if(NORTH, SOUTH) initialize_directions = NORTH|SOUTH if(EAST, WEST) initialize_directions = EAST|WEST -/obj/machinery/atmospherics/components/binary/getNodeConnects() +/obj/machinery/atmospherics/components/binary/get_node_connects() return list(turn(dir, 180), dir) -///Used by binary devices to set what the offset will be for each layer +/** + * Used by binary devices to set what the offset will be for each layer, called in update_icon_nopipes() + * Arguments: + * * -pipe_layer: is the pipe layer the component should be set to + */ /obj/machinery/atmospherics/components/binary/proc/set_overlay_offset(pipe_layer) - return pipe_layer & 1 ? 1 : 2 + switch(pipe_layer) + if(1, 3, 5) + return 1 + if(2, 4) + return 2 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 6e1c53c33d7cf..12ff98e7e08d7 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -49,7 +49,7 @@ if(air2.return_temperature()>0) var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2 - var/transfer_moles = pressure_delta*air1.return_volume()/(air2.return_temperature() * R_IDEAL_GAS_EQUATION) + var/transfer_moles = (pressure_delta*air1.return_volume())/(air2.return_temperature() * R_IDEAL_GAS_EQUATION) last_pressure_delta = pressure_delta @@ -94,35 +94,37 @@ if(node1) node1.disconnect(src) nodes[1] = null - nullifyPipenet(parents[1]) + if(parents[1]) + nullify_pipenet(parents[1]) if(node2) node2.disconnect(src) nodes[2] = null - nullifyPipenet(parents[2]) + if(parents[2]) + nullify_pipenet(parents[2]) if(anchored) - SetInitDirections() - atmosinit() + set_init_directions() + atmos_init() node1 = nodes[1] if(node1) - node1.atmosinit() - node1.addMember(src) + node1.atmos_init() + node1.add_member(src) node2 = nodes[2] if(node2) - node2.atmosinit() - node2.addMember(src) + node2.atmos_init() + node2.add_member(src) SSair.add_to_rebuild_queue(src) return TRUE -/obj/machinery/atmospherics/components/binary/circulator/SetInitDirections() +/obj/machinery/atmospherics/components/binary/circulator/set_init_directions() switch(dir) if(NORTH, SOUTH) initialize_directions = EAST|WEST if(EAST, WEST) initialize_directions = NORTH|SOUTH -/obj/machinery/atmospherics/components/binary/circulator/getNodeConnects() +/obj/machinery/atmospherics/components/binary/circulator/get_node_connects() if(flipped) return list(turn(dir, 270), turn(dir, 90)) return list(turn(dir, 90), turn(dir, 270)) @@ -163,7 +165,7 @@ generator.update_icon() generator = null -/obj/machinery/atmospherics/components/binary/circulator/setPipingLayer(new_layer) +/obj/machinery/atmospherics/components/binary/circulator/set_piping_layer(new_layer) ..() pixel_x = 0 pixel_y = 0 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 132fa91352155..113f49d045feb 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -1,7 +1,5 @@ //Acts like a normal vent, but has an input AND output. -#define EXT_BOUND 1 -#define INPUT_MIN 2 #define OUTPUT_MAX 4 /obj/machinery/atmospherics/components/binary/dp_vent_pump @@ -20,34 +18,22 @@ interacts_with_air = TRUE - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - - var/pump_direction = 1 //0 = siphoning, 1 = releasing + ///Indicates that the direction of the pump, if ATMOS_DIRECTION_SIPHONING is siphoning, if ATMOS_DIRECTION_RELEASING is releasing + var/pump_direction = ATMOS_DIRECTION_RELEASING + ///Set the maximum allowed external pressure var/external_pressure_bound = ONE_ATMOSPHERE + ///Set the maximum pressure at the input port var/input_pressure_min = 0 + ///Set the maximum pressure at the output port var/output_pressure_max = 0 - - var/pressure_checks = EXT_BOUND - - var/obj/machinery/advanced_airlock_controller/aac = null - - //EXT_BOUND: Do not pass external_pressure_bound - //INPUT_MIN: Do not pass input_pressure_min - //OUTPUT_MAX: Do not pass output_pressure_max - -/obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy() - SSradio.remove_object(src, frequency) - if(aac) - aac.vents -= src - return ..() + ///Set the flag for the pressure bound + var/pressure_checks = ATMOS_EXTERNAL_BOUND /obj/machinery/atmospherics/components/binary/dp_vent_pump/update_icon_nopipes() cut_overlays() if(showpipe) - var/image/cap = getpipeimage(icon, "dpvent_cap", dir, piping_layer = piping_layer) + var/image/cap = get_pipe_image(icon, "dpvent_cap", dir, pipe_color, piping_layer = piping_layer) add_overlay(cap) if(welded) @@ -60,125 +46,68 @@ icon_state = pump_direction ? "vent_out" : "vent_in" /obj/machinery/atmospherics/components/binary/dp_vent_pump/process_atmos() - ..() - if(welded || !is_operational || !isopenturf(loc)) - return FALSE if(!on) + return FALSE + if(welded || !is_operational) + return FALSE + + var/turf/location = get_turf(loc) + if(isclosedturf(location)) return + var/datum/gas_mixture/air1 = airs[1] var/datum/gas_mixture/air2 = airs[2] var/datum/gas_mixture/environment = loc.return_air() var/environment_pressure = environment.return_pressure() - if(pump_direction) //input -> external + if(pump_direction == ATMOS_DIRECTION_RELEASING) //input -> external var/pressure_delta = 10000 - if(pressure_checks&EXT_BOUND) + if(pressure_checks&ATMOS_EXTERNAL_BOUND) pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure)) - if(pressure_checks&INPUT_MIN) + if(pressure_checks&ATMOS_INTERNAL_BOUND) pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min)) - if(pressure_delta > 0) - if(air1.return_temperature() > 0) - var/transfer_moles = pressure_delta*environment.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - - loc.assume_air_moles(air1, transfer_moles) - - air_update_turf() - - var/datum/pipeline/parent1 = parents[1] - if(!parent1) - return - parent1.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + if(pressure_delta <= 0) + return + if(air1.temperature <= 0) + return + var/transfer_moles = (pressure_delta*environment.volume)/(air1.temperature * R_IDEAL_GAS_EQUATION) - else //external -> output - if(environment.return_pressure() > 0) - var/our_multiplier = air2.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION) - var/moles_delta = 10000 * our_multiplier - if(pressure_checks&EXT_BOUND) - moles_delta = min(moles_delta, (environment_pressure - output_pressure_max) * environment.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION)) - if(pressure_checks&INPUT_MIN) - moles_delta = min(moles_delta, (input_pressure_min - air2.return_pressure()) * our_multiplier) + var/datum/gas_mixture/removed = air1.remove(transfer_moles) + //Removed can be null if there is no atmosphere in air1 + if(!removed) + return - if(moles_delta > 0) - loc.transfer_air(air2, moles_delta) - air_update_turf() + loc.assume_air(removed) - var/datum/pipeline/parent2 = parents[2] - parent2.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + var/datum/pipenet/parent1 = parents[1] + parent1.update = TRUE - //Radio remote control - -/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency, filter = RADIO_ATMOSIA) - -/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/broadcast_status() - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id, - "device" = "ADVP", - "power" = on, - "direction" = pump_direction?("release"):("siphon"), - "checks" = pressure_checks, - "input" = input_pressure_min, - "output" = output_pressure_max, - "external" = external_pressure_bound, - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - -/obj/machinery/atmospherics/components/binary/dp_vent_pump/atmosinit() - ..() - if(frequency) - set_frequency(frequency) - broadcast_status() - -/obj/machinery/atmospherics/components/binary/dp_vent_pump/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return - - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("set_direction" in signal.data) - pump_direction = text2num(signal.data["set_direction"]) - - if("checks" in signal.data) - pressure_checks = text2num(signal.data["checks"]) - - if("purge" in signal.data) - pressure_checks &= ~1 - pump_direction = 0 + else //(ATMOS_DIRECTION_SIPHONING) external -> output + var/pressure_delta = 10000 - if("stabilize" in signal.data) - pressure_checks |= 1 - pump_direction = 1 + if(pressure_checks&ATMOS_EXTERNAL_BOUND) + pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound)) + if(pressure_checks&ATMOS_INTERNAL_BOUND) + pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure())) - if("set_input_pressure" in signal.data) - input_pressure_min = clamp(text2num(signal.data["set_input_pressure"]),0,ONE_ATMOSPHERE*50) + if(pressure_delta <= 0) + return + if(environment.temperature <= 0) + return + var/transfer_moles = (pressure_delta*air2.volume)/(environment.temperature * R_IDEAL_GAS_EQUATION) - if("set_output_pressure" in signal.data) - output_pressure_max = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50) + var/datum/gas_mixture/removed = loc.remove_air(transfer_moles) + //removed can be null if there is no air in the location + if(!removed) + return - if("set_external_pressure" in signal.data) - external_pressure_bound = clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50) + air2.merge(removed) - if("status" in signal.data) - spawn(2) - broadcast_status() - return //do not update_icon - spawn(2) - broadcast_status() - update_icon() + var/datum/pipenet/parent2 = parents[2] + parent2.update = TRUE /obj/machinery/atmospherics/components/binary/dp_vent_pump/welder_act(mob/living/user, obj/item/I) if(!I.tool_start_check(user, amount=0)) @@ -221,8 +150,8 @@ ..() var/datum/gas_mixture/air1 = airs[1] var/datum/gas_mixture/air2 = airs[2] - air1.set_volume(1000) - air2.set_volume(1000) + air1.volume = 1000 + air2.volume = 1000 // Mapping @@ -247,16 +176,13 @@ icon_state = "dpvent_map_on-4" /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix - id = INCINERATOR_TOXMIX_DP_VENTPUMP - frequency = FREQ_AIRLOCK_CONTROL + id_tag = INCINERATOR_TOXMIX_DP_VENTPUMP /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos - id = INCINERATOR_ATMOS_DP_VENTPUMP - frequency = FREQ_AIRLOCK_CONTROL + id_tag = INCINERATOR_ATMOS_DP_VENTPUMP /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava - id = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP - frequency = FREQ_AIRLOCK_CONTROL + id_tag = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2 piping_layer = 2 @@ -278,6 +204,4 @@ piping_layer = 4 icon_state = "dpvent_map_on-4" -#undef EXT_BOUND -#undef INPUT_MIN #undef OUTPUT_MAX diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 2cbff209b79e9..56ab42accf29b 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -20,10 +20,6 @@ Passive gate is similar to the regular pump except: var/target_pressure = ONE_ATMOSPHERE - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - construction_type = /obj/item/pipe/directional pipe_state = "passivegate" @@ -45,47 +41,23 @@ Passive gate is similar to the regular pump except: ui_update() return -/obj/machinery/atmospherics/components/binary/passive_gate/Destroy() - SSradio.remove_object(src,frequency) - return ..() - /obj/machinery/atmospherics/components/binary/passive_gate/update_icon_nopipes() cut_overlays() icon_state = "passgate_off-[set_overlay_offset(piping_layer)]" if(on) - add_overlay(getpipeimage(icon, "passgate_on-[set_overlay_offset(piping_layer)]")) + add_overlay(get_pipe_image(icon, "passgate_on-[set_overlay_offset(piping_layer)]")) /obj/machinery/atmospherics/components/binary/passive_gate/process_atmos() ..() if(!on) return - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] - if(air1.release_gas_to(air2, target_pressure)) - update_parents() - -//Radio remote control - -/obj/machinery/atmospherics/components/binary/passive_gate/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency, filter = RADIO_ATMOSIA) - -/obj/machinery/atmospherics/components/binary/passive_gate/proc/broadcast_status() - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id, - "device" = "AGP", - "power" = on, - "target_output" = target_pressure, - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + var/datum/gas_mixture/input_air = airs[1] + var/datum/gas_mixture/output_air = airs[2] + var/datum/gas_mixture/output_pipenet_air = parents[2].air + if(input_air.release_gas_to(output_air, target_pressure, output_pipenet_air = output_pipenet_air)) + update_parents() /obj/machinery/atmospherics/components/binary/passive_gate/ui_state(mob/user) return GLOB.default_state @@ -125,37 +97,6 @@ Passive gate is similar to the regular pump except: if(.) update_icon() -/obj/machinery/atmospherics/components/binary/passive_gate/atmosinit() - ..() - if(frequency) - set_frequency(frequency) - -/obj/machinery/atmospherics/components/binary/passive_gate/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return - - var/old_on = on //for logging - - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("set_output_pressure" in signal.data) - target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*100) - - if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) - - if("status" in signal.data) - broadcast_status() - return - - broadcast_status() - update_icon() - ui_update() - /obj/machinery/atmospherics/components/binary/passive_gate/can_unwrench(mob/user) . = ..() if(. && on) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm index 20881d173d0d3..895f5aced3c46 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm @@ -8,12 +8,6 @@ //Amount of pressure needed before the valve for it to open var/target_pressure = ONE_ATMOSPHERE - //Frequency for radio signaling - var/frequency = 0 - //ID for radio signaling - var/id = null - //Connection to the radio processing - var/datum/radio_frequency/radio_connection //Check if the gas is moving from one pipenet to the other var/is_gas_flowing = FALSE @@ -35,12 +29,6 @@ update_icon() return ..() -/obj/machinery/atmospherics/components/binary/pressure_valve/Destroy() - SSradio.remove_object(src,frequency) - if(radio_connection) - radio_connection = null - return ..() - /obj/machinery/atmospherics/components/binary/pressure_valve/update_icon_nopipes() if(on && is_operational) if(is_gas_flowing) @@ -55,36 +43,18 @@ if(!on || !is_operational) return - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/input_air = airs[1] + var/datum/gas_mixture/output_air = airs[2] + var/datum/gas_mixture/output_pipenet_air = parents[2].air - if(air1.return_pressure() > target_pressure) - if(air1.release_gas_to(air2, air1.return_pressure())) + if(input_air.return_pressure() > target_pressure) + if(input_air.release_gas_to(output_air, input_air.return_pressure(), output_pipenet_air = output_pipenet_air)) update_parents() is_gas_flowing = TRUE else is_gas_flowing = FALSE update_icon_nopipes() -/obj/machinery/atmospherics/components/binary/pressure_valve/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency, filter = RADIO_ATMOSIA) - -/obj/machinery/atmospherics/components/binary/pressure_valve/proc/broadcast_status() - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id, - "device" = "AGP", - "power" = on, - "target_output" = target_pressure, - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - /obj/machinery/atmospherics/components/binary/pressure_valve/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -119,36 +89,6 @@ investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) update_icon() -/obj/machinery/atmospherics/components/binary/pressure_valve/atmosinit() - . = ..() - if(frequency) - set_frequency(frequency) - -/obj/machinery/atmospherics/components/binary/pressure_valve/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return - - var/old_on = on //for logging - - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("set_output_pressure" in signal.data) - target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*100) - - if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) - - if("status" in signal.data) - broadcast_status() - return - - broadcast_status() - update_icon() - /obj/machinery/atmospherics/components/binary/pressure_valve/can_unwrench(mob/user) . = ..() if(. && on && is_operational) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 7df866ce5685e..b041b773938ce 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -14,18 +14,12 @@ icon_state = "pump_map-3" name = "gas pump" desc = "A pump that moves gas by pressure." - can_unwrench = TRUE shift_underlay_only = FALSE - - var/target_pressure = ONE_ATMOSPHERE - - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - construction_type = /obj/item/pipe/directional pipe_state = "pump" + ///Pressure that the pump will reach when on + var/target_pressure = ONE_ATMOSPHERE /obj/machinery/atmospherics/components/binary/pump/Initialize(mapload) . = ..() @@ -48,60 +42,20 @@ ui_update() return - -/obj/machinery/atmospherics/components/binary/pump/Destroy() - SSradio.remove_object(src,frequency) - if(radio_connection) - radio_connection = null - return ..() - /obj/machinery/atmospherics/components/binary/pump/update_icon_nopipes() icon_state = "pump_[on && is_operational ? "on" : "off"]-[set_overlay_offset(piping_layer)]" /obj/machinery/atmospherics/components/binary/pump/process_atmos() -// ..() if(!on || !is_operational) return - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] - var/output_starting_pressure = air2.return_pressure() - if((target_pressure - output_starting_pressure) < 0.01) - //No need to pump gas if target is already reached! - return - //Calculate necessary moles to transfer using PV=nRT - if((air1.total_moles() > 0) && (air1.return_temperature()>0)) - var/pressure_delta = target_pressure - output_starting_pressure - var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - air1.transfer_to(air2,transfer_moles) + var/datum/gas_mixture/input_air = airs[1] + var/datum/gas_mixture/output_air = airs[2] + var/datum/gas_mixture/output_pipenet_air = parents[2].air + if(input_air.pump_gas_to(output_air, target_pressure, output_pipenet_air = output_pipenet_air)) update_parents() -/obj/machinery/atmospherics/components/binary/pump/proc/set_on(active) - on = active - SEND_SIGNAL(src, COMSIG_PUMP_SET_ON, on) - -//Radio remote control -/obj/machinery/atmospherics/components/binary/pump/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency, filter = RADIO_ATMOSIA) - -/obj/machinery/atmospherics/components/binary/pump/proc/broadcast_status() - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id, - "device" = "AGP", - "power" = on, - "target_output" = target_pressure, - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - /obj/machinery/atmospherics/components/binary/pump/ui_state(mob/user) return GLOB.default_state @@ -140,37 +94,6 @@ if(.) update_icon() -/obj/machinery/atmospherics/components/binary/pump/atmosinit() - ..() - if(frequency) - set_frequency(frequency) - -/obj/machinery/atmospherics/components/binary/pump/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return - - var/old_on = on //for logging - - if("power" in signal.data) - set_on(text2num(signal.data["power"])) - - if("power_toggle" in signal.data) - set_on(!on) - - if("set_output_pressure" in signal.data) - target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50) - - if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) - - if("status" in signal.data) - broadcast_status() - return - - broadcast_status() - update_icon() - ui_update() - /obj/machinery/atmospherics/components/binary/pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational) @@ -253,10 +176,10 @@ . = ..() if(istype(shell, /obj/machinery/atmospherics/components/binary/pump)) connected_pump = shell - RegisterSignal(connected_pump, COMSIG_PUMP_SET_ON, PROC_REF(handle_pump_activation)) + RegisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON, PROC_REF(handle_pump_activation)) /obj/item/circuit_component/atmos_pump/unregister_usb_parent(atom/movable/shell) - UnregisterSignal(connected_pump, COMSIG_PUMP_SET_ON) + UnregisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON) connected_pump = null return ..() @@ -280,11 +203,13 @@ if(!connected_pump) return connected_pump.set_on(TRUE) + connected_pump.update_icon() /obj/item/circuit_component/atmos_pump/proc/set_pump_off() if(!connected_pump) return connected_pump.set_on(FALSE) + connected_pump.update_icon() /obj/item/circuit_component/atmos_pump/proc/request_pump_data() if(!connected_pump) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm index 0649e8a2ad320..150227f29083e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm @@ -58,19 +58,20 @@ if(!on || !is_operational) return - var/datum/gas_mixture/air1 = airs[1] - var/datum/gas_mixture/air2 = airs[2] + var/datum/gas_mixture/input_air = airs[1] + var/datum/gas_mixture/output_air = airs[2] + var/datum/gas_mixture/output_pipenet_air = parents[2].air if(!inverted) - if(air1.return_temperature() < target_temperature) - if(air1.release_gas_to(air2, air1.return_pressure())) + if(input_air.temperature < target_temperature) + if(input_air.release_gas_to(output_air, input_air.return_pressure(), output_pipenet_air = output_pipenet_air)) update_parents() is_gas_flowing = TRUE else is_gas_flowing = FALSE else - if(air1.return_temperature() > target_temperature) - if(air1.release_gas_to(air2, air1.return_pressure())) + if(input_air.temperature > target_temperature) + if(input_air.release_gas_to(output_air, input_air.return_pressure(), output_pipenet_air = output_pipenet_air)) update_parents() is_gas_flowing = TRUE else diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm index 18da76771dc01..5b254d3165322 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/components/binary/temperature_pump icon_state = "tpump_map-3" name = "temperature pump" - desc = "A pump that moves heat from one pipeline to another. The input will get cooler, and the output will get hotter." + desc = "A pump that moves heat from one pipenet to another. The input will get cooler, and the output will get hotter." can_unwrench = TRUE shift_underlay_only = FALSE @@ -49,16 +49,17 @@ if(coolant_temperature_delta > 0) var/input_capacity = remove_input.heat_capacity() - var/output_capacity = air_output.heat_capacity() + var/output_capacity = remove_output.heat_capacity() + + var/cooling_heat_amount = (heat_transfer_rate * 0.01) * CALCULATE_CONDUCTION_ENERGY(coolant_temperature_delta, output_capacity, input_capacity) + remove_output.temperature = (max(remove_output.return_temperature() + (cooling_heat_amount / output_capacity), TCMB)) + remove_input.temperature = max(remove_input.temperature - (cooling_heat_amount / input_capacity), TCMB) + update_parents() - var/cooling_heat_amount = (heat_transfer_rate * 0.01) * coolant_temperature_delta * (input_capacity * output_capacity / (input_capacity + output_capacity)) - remove_input.set_temperature(max(remove_input.return_temperature() - (cooling_heat_amount / input_capacity), TCMB)) - remove_output.set_temperature(max(remove_output.return_temperature() + (cooling_heat_amount / output_capacity), TCMB)) air_input.merge(remove_input) air_output.merge(remove_output) - update_parents() /obj/machinery/atmospherics/components/binary/temperature_pump/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index d751f7f9dad35..7670589511251 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -1,39 +1,25 @@ /* It's like a regular ol' straight pipe, but you can turn it on and off. */ +#define MANUAL_VALVE "m" +#define DIGITAL_VALVE "d" /obj/machinery/atmospherics/components/binary/valve icon_state = "mvalve_map-3" - name = "manual valve" desc = "A pipe with a valve that can be used to disable flow of gas through it." - can_unwrench = TRUE shift_underlay_only = FALSE - interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN //Intentionally no allow_silicon flag - pipe_flags = PIPING_CARDINAL_AUTONORMALIZE - - var/frequency = 0 - var/id = null - - var/valve_type = "m" //lets us have a nice, clean, OOP update_icon_nopipes() - + pipe_flags = PIPING_CARDINAL_AUTONORMALIZE | PIPING_BRIDGE construction_type = /obj/item/pipe/binary pipe_state = "mvalve" - + custom_reconcilation = TRUE + ///Type of valve (manual or digital), used to set the icon of the component in update_icon_nopipes() + var/valve_type = MANUAL_VALVE + ///Bool to stop interactions while the opening/closing animation is going var/switching = FALSE -/obj/machinery/atmospherics/components/binary/valve/Destroy() - //Should only happen on extreme circumstances - if(on) - //Let's give presumably now-severed pipenets a chance to scramble for what's happening at next SSair fire() - if(parents[1]) - parents[1].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED - if(parents[2]) - parents[2].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED - . = ..() - /obj/machinery/atmospherics/components/binary/valve/update_icon_nopipes(animation = FALSE) normalize_cardinal_directions() if(animation) @@ -44,7 +30,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return !(machine_stat & BROKEN) && on // valves should block whatever is trying to go through them, regardless of power /** - * Called by finish_interact(), switch between open and closed, reconcile the air between two pipelines + * Called by finish_interact(), switch between open and closed, reconcile the air between two pipenets */ /obj/machinery/atmospherics/components/binary/valve/proc/set_open(to_open) if(on == to_open) @@ -55,12 +41,25 @@ It's like a regular ol' straight pipe, but you can turn it on and off. if(on) update_icon_nopipes() update_parents() - var/datum/pipeline/parent1 = parents[1] + var/datum/pipenet/parent1 = parents[1] parent1.reconcile_air() investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) + balloon_alert_to_viewers("valve opened") + vent_movement |= VENTCRAWL_ALLOWED else update_icon_nopipes() investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) + balloon_alert_to_viewers("valve closed") + vent_movement &= ~VENTCRAWL_ALLOWED + +// This is what handles the actual functionality of combining 2 pipenets when the valve is open +// Basically when a pipenet updates it will consider both sides to be the same for the purpose of the gas update +/obj/machinery/atmospherics/components/binary/valve/return_pipenets_for_reconcilation(datum/pipenet/requester) + . = ..() + if(!on) + return + . |= parents[1] + . |= parents[2] /obj/machinery/atmospherics/components/binary/valve/interact(mob/user) add_fingerprint(usr) @@ -68,19 +67,21 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return update_icon_nopipes(TRUE) switching = TRUE - addtimer(CALLBACK(src, PROC_REF(finish_interact)), 10) + addtimer(CALLBACK(src, PROC_REF(finish_interact)), 1 SECONDS) +/** + * Called by iteract() after a 1 second timer, calls toggle(), allows another interaction with the component. + */ /obj/machinery/atmospherics/components/binary/valve/proc/finish_interact() set_open(!on) switching = FALSE - /obj/machinery/atmospherics/components/binary/valve/digital // can be controlled by AI icon_state = "dvalve_map-3" name = "digital valve" desc = "A digitally controlled valve." - valve_type = "d" + valve_type = DIGITAL_VALVE pipe_state = "dvalve" interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OPEN_SILICON @@ -127,6 +128,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return ..() /obj/item/circuit_component/digital_valve/proc/handle_valve_toggled(datum/source, on) + SIGNAL_HANDLER is_open.set_output(on) if(on) opened.set_output(COMPONENT_SIGNAL) @@ -148,7 +150,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. normalize_cardinal_directions() icon_state = "dvalve_nopower-[set_overlay_offset(piping_layer)]" return - ..() + return ..() /obj/machinery/atmospherics/components/binary/valve/layer2 piping_layer = 2 @@ -187,3 +189,6 @@ It's like a regular ol' straight pipe, but you can turn it on and off. /obj/machinery/atmospherics/components/binary/valve/digital/on/layer4 piping_layer = 4 icon_state = "dvalve_map-4" + +#undef MANUAL_VALVE +#undef DIGITAL_VALVE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 8815188fbe690..35acffbc744b3 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -1,7 +1,7 @@ -// Every cycle, the pump uses the air in air_in to try and make air_out the perfect pressure. +// Every cycle, the pump uses the air in air_in to try and move a specific volume of gas into air_out. // -// node1, air1, network1 correspond to input -// node2, air2, network2 correspond to output +// node1, air1, network1 corresponds to input +// node2, air2, network2 corresponds to output // // Thus, the two variables affect pump operation are set in New(): // air1.volume @@ -20,20 +20,22 @@ var/transfer_rate = MAX_TRANSFER_RATE var/overclocked = FALSE - - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection + ///flashing light overlay which appears on multitooled vol pumps + var/mutable_appearance/overclock_overlay construction_type = /obj/item/pipe/directional pipe_state = "volumepump" - +/obj/machinery/atmospherics/components/binary/volume_pump/Initialize(mapload) + . = ..() + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/atmos_volume_pump, + )) /obj/machinery/atmospherics/components/binary/volume_pump/CtrlClick(mob/user) if(can_interact(user)) - on = !on + set_on(!on) update_icon() ui_update() return ..() @@ -46,15 +48,18 @@ ui_update() return -/obj/machinery/atmospherics/components/binary/volume_pump/Destroy() - SSradio.remove_object(src,frequency) - return ..() - /obj/machinery/atmospherics/components/binary/volume_pump/update_icon_nopipes() icon_state = "volpump_[on && is_operational ? "on" : "off"]-[set_overlay_offset(piping_layer)]" + var/altlayeroverlay = FALSE + if(set_overlay_offset(piping_layer) == 2) + altlayeroverlay = TRUE + overclock_overlay = mutable_appearance('icons/obj/atmospherics/components/binary_devices.dmi', "vpumpoverclock[altlayeroverlay ? "2" : ""]") + if(overclocked && on && is_operational) + add_overlay(overclock_overlay) + else + cut_overlay(overclock_overlay) /obj/machinery/atmospherics/components/binary/volume_pump/process_atmos() -// ..() if(!on || !is_operational) return @@ -66,49 +71,32 @@ var/input_starting_pressure = air1.return_pressure() var/output_starting_pressure = air2.return_pressure() - if((input_starting_pressure < 0.01) || ((output_starting_pressure > 9000))&&!overclocked) + if((input_starting_pressure < VOLUME_PUMP_MINIMUM_OUTPUT_PRESSURE) || ((output_starting_pressure > VOLUME_PUMP_MAX_OUTPUT_PRESSURE))&&!overclocked) return - if(overclocked && (output_starting_pressure-input_starting_pressure > 1000))//Overclocked pumps can only force gas a certain amount. + var/transfer_ratio = transfer_rate / air1.volume + + var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio) + + if(!removed.total_moles()) return if(overclocked)//Some of the gas from the mixture leaks to the environment when overclocked var/turf/open/T = loc if(istype(T)) - var/datum/gas_mixture/leaked = air1.remove_ratio(VOLUME_PUMP_LEAK_AMOUNT) + var/datum/gas_mixture/leaked = removed.remove_ratio(VOLUME_PUMP_LEAK_AMOUNT) T.assume_air(leaked) - T.air_update_turf() - var/transfer_ratio = transfer_rate / air1.return_volume() - air1.transfer_ratio_to(air2,transfer_ratio) + air2.merge(removed) update_parents() /obj/machinery/atmospherics/components/binary/volume_pump/examine(mob/user) . = ..() + . += "Its pressure limits could be [overclocked ? "en" : "dis"]abled with a multitool." if(overclocked) . += "Its warning light is on[on ? " and it's spewing gas!" : "."]" -/obj/machinery/atmospherics/components/binary/volume_pump/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency) - -/obj/machinery/atmospherics/components/binary/volume_pump/proc/broadcast_status() - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id, - "device" = "APV", - "power" = on, - "transfer_rate" = transfer_rate, - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal) - - /obj/machinery/atmospherics/components/binary/volume_pump/ui_state(mob/user) return GLOB.default_state @@ -125,17 +113,12 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) return data -/obj/machinery/atmospherics/components/binary/volume_pump/atmosinit() - ..() - - set_frequency(frequency) - /obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, params) if(..()) return switch(action) if("power") - on = !on + set_on(!on) investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE if("rate") @@ -152,33 +135,6 @@ if(.) update_icon() -/obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return - - var/old_on = on //for logging - - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("set_transfer_rate" in signal.data) - var/datum/gas_mixture/air1 = airs[1] - transfer_rate = clamp(text2num(signal.data["set_transfer_rate"]),0,air1.return_volume()) - - if(on != old_on) - investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) - - if("status" in signal.data) - broadcast_status() - return //do not update_icon - - broadcast_status() - update_icon() - ui_update() - /obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational) @@ -189,9 +145,11 @@ if(!overclocked) overclocked = TRUE to_chat(user, "The pump makes a grinding noise and air starts to hiss out as you disable its pressure limits.") + update_icon() else overclocked = FALSE to_chat(user, "The pump quiets down as you turn its limiters back on.") + update_icon() return TRUE /obj/machinery/atmospherics/components/binary/volume_pump/can_crawl_through() @@ -218,3 +176,105 @@ /obj/machinery/atmospherics/components/binary/volume_pump/on/layer4 piping_layer = 4 icon_state = "volpump_on_map-4" + +////////////////////////// CIRCUITS /////////////////////////////////////////////////////= + +/obj/item/circuit_component/atmos_volume_pump + display_name = "Atmospheric Volume Pump" + desc = "The interface for communicating with a volume pump." + + ///Set the transfer rate of the pump + var/datum/port/input/transfer_rate + ///Activate the pump + var/datum/port/input/on + ///Deactivate the pump + var/datum/port/input/off + ///Signals the circuit to retrieve the pump's current pressure and temperature + var/datum/port/input/request_data + + ///Pressure of the input port + var/datum/port/output/input_pressure + ///Pressure of the output port + var/datum/port/output/output_pressure + ///Temperature of the input port + var/datum/port/output/input_temperature + ///Temperature of the output port + var/datum/port/output/output_temperature + + ///Whether the pump is currently active + var/datum/port/output/is_active + ///Send a signal when the pump is turned on + var/datum/port/output/turned_on + ///Send a signal when the pump is turned off + var/datum/port/output/turned_off + + ///The component parent object + var/obj/machinery/atmospherics/components/binary/volume_pump/connected_pump + +/obj/item/circuit_component/atmos_volume_pump/populate_ports() + transfer_rate = add_input_port("New Transfer Rate", PORT_TYPE_NUMBER, trigger = PROC_REF(set_transfer_rate)) + on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_on)) + off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_off)) + request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(request_pump_data)) + + input_pressure = add_output_port("Input Pressure", PORT_TYPE_NUMBER) + output_pressure = add_output_port("Output Pressure", PORT_TYPE_NUMBER) + input_temperature = add_output_port("Input Temperature", PORT_TYPE_NUMBER) + output_temperature = add_output_port("Output Temperature", PORT_TYPE_NUMBER) + + is_active = add_output_port("Active", PORT_TYPE_NUMBER) + turned_on = add_output_port("Turned On", PORT_TYPE_SIGNAL) + turned_off = add_output_port("Turned Off", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/atmos_volume_pump/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/atmospherics/components/binary/volume_pump)) + connected_pump = shell + RegisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON, PROC_REF(handle_pump_activation)) + +/obj/item/circuit_component/atmos_volume_pump/unregister_usb_parent(atom/movable/shell) + UnregisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON) + connected_pump = null + return ..() + +/obj/item/circuit_component/atmos_volume_pump/pre_input_received(datum/port/input/port) + transfer_rate.set_value(clamp(transfer_rate.value, 0, MAX_TRANSFER_RATE)) + +/obj/item/circuit_component/atmos_volume_pump/proc/handle_pump_activation(datum/source, active) + SIGNAL_HANDLER + is_active.set_output(active) + if(active) + turned_on.set_output(COMPONENT_SIGNAL) + else + turned_off.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/atmos_volume_pump/proc/set_transfer_rate() + CIRCUIT_TRIGGER + if(!connected_pump) + return + connected_pump.transfer_rate = transfer_rate.value + +/obj/item/circuit_component/atmos_volume_pump/proc/set_pump_on() + CIRCUIT_TRIGGER + if(!connected_pump) + return + connected_pump.set_on(TRUE) + connected_pump.update_appearance() + +/obj/item/circuit_component/atmos_volume_pump/proc/set_pump_off() + CIRCUIT_TRIGGER + if(!connected_pump) + return + connected_pump.set_on(FALSE) + connected_pump.update_appearance() + +/obj/item/circuit_component/atmos_volume_pump/proc/request_pump_data() + CIRCUIT_TRIGGER + if(!connected_pump) + return + var/datum/gas_mixture/air_input = connected_pump.airs[1] + var/datum/gas_mixture/air_output = connected_pump.airs[2] + input_pressure.set_output(air_input.return_pressure()) + output_pressure.set_output(air_output.return_pressure()) + input_temperature.set_output(air_input.return_temperature()) + output_temperature.set_output(air_output.return_temperature()) diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index 041dc047b31e3..a155ac267e55d 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -3,13 +3,21 @@ /obj/machinery/atmospherics/components hide = FALSE - - var/welded = FALSE //Used on pumps and scrubbers + layer = GAS_PUMP_LAYER + ///Is the component welded? + var/welded = FALSE + ///Should the component should show the pipe underneath it? var/showpipe = TRUE - var/shift_underlay_only = TRUE //Layering only shifts underlay? - - var/list/datum/pipeline/parents + ///When the component is on a non default layer should we shift everything? Or just the underlay pipe + var/shift_underlay_only = TRUE + ///Stores the component pipenet + var/list/datum/pipenet/parents + ///If this is queued for a rebuild this var signifies whether parents should be updated after it's done + var/update_parents_after_rebuild = FALSE + ///Stores the component gas mixture var/list/datum/gas_mixture/airs + ///Handles whether the custom reconcilation handling should be used + var/custom_reconcilation = FALSE /obj/machinery/atmospherics/components/New() parents = new(device_type) @@ -18,8 +26,9 @@ ..() for(var/i in 1 to device_type) - var/datum/gas_mixture/A = new(200) - airs[i] = A + var/datum/gas_mixture/component_mixture = new + component_mixture.volume = 200 + airs[i] = component_mixture /obj/machinery/atmospherics/components/Initialize(mapload) . = ..() @@ -29,150 +38,174 @@ // Iconnery +/** + * Called by update_icon(), used individually by each component to determine the icon state without the pipe in consideration + */ /obj/machinery/atmospherics/components/proc/update_icon_nopipes() return +/** + * Called in Initialize(), set the showpipe var to true or false depending on the situation, calls update_icon() + */ /obj/machinery/atmospherics/components/proc/hide_pipe(datum/source, underfloor_accessibility) SIGNAL_HANDLER showpipe = !!underfloor_accessibility - update_icon() + update_appearance() /obj/machinery/atmospherics/components/update_icon() update_icon_nopipes() underlays.Cut() + color = null plane = showpipe ? GAME_PLANE : FLOOR_PLANE if(!showpipe) - return + return ..() + if(pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS) + return ..() var/connected = 0 //Direction bitset + var/underlay_pipe_layer = shift_underlay_only ? piping_layer : 3 + for(var/i in 1 to device_type) //adds intact pieces - if(nodes[i]) - var/obj/machinery/atmospherics/node = nodes[i] - var/image/img = get_pipe_underlay("pipe_intact", get_dir(src, node), node.pipe_color) - underlays += img - connected |= img.dir + if(!nodes[i]) + continue + var/obj/machinery/atmospherics/node = nodes[i] + var/node_dir = get_dir(src, node) + var/mutable_appearance/pipe_appearance = mutable_appearance('icons/obj/atmospherics/pipes/pipe_underlays.dmi', "intact_[node_dir]_[underlay_pipe_layer]") + pipe_appearance.color = node.pipe_color + underlays += pipe_appearance + connected |= node_dir for(var/direction in GLOB.cardinals) if((initialize_directions & direction) && !(connected & direction)) - underlays += get_pipe_underlay("pipe_exposed", direction) + var/mutable_appearance/pipe_appearance = mutable_appearance('icons/obj/atmospherics/pipes/pipe_underlays.dmi', "exposed_[direction]_[underlay_pipe_layer]") + pipe_appearance.color = pipe_color + underlays += pipe_appearance if(!shift_underlay_only) PIPING_LAYER_SHIFT(src, piping_layer) - -/obj/machinery/atmospherics/components/proc/get_pipe_underlay(state, dir, color = null) - if(color) - . = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', state, dir, color, piping_layer = shift_underlay_only ? piping_layer : 3) - else - . = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', state, dir, piping_layer = shift_underlay_only ? piping_layer : 3) + return ..() // Pipenet stuff; housekeeping -/obj/machinery/atmospherics/components/nullifyNode(i) - // Every node has a parent pipeline and an air associated with it, but we need to accomdate for edge cases like init dir cache building... +/obj/machinery/atmospherics/components/nullify_node(i) if(parents[i]) - nullifyPipenet(parents[i]) - if(airs[i]) - QDEL_NULL(airs[i]) - ..() + nullify_pipenet(parents[i]) + airs[i] = null + return ..() -/obj/machinery/atmospherics/components/on_construction() - ..() +/obj/machinery/atmospherics/components/on_construction(mob/user) + . = ..() update_parents() -/obj/machinery/atmospherics/components/build_network() - for(var/i in 1 to device_type) - if(QDELETED(parents[i])) - parents[i] = new /datum/pipeline() - var/datum/pipeline/P = parents[i] - P.build_pipeline(src) +/obj/machinery/atmospherics/components/on_deconstruction() + relocate_airs() + return ..() -/obj/machinery/atmospherics/components/proc/nullifyPipenet(datum/pipeline/reference) +/obj/machinery/atmospherics/components/rebuild_pipes() + . = ..() + if(update_parents_after_rebuild) + update_parents() + +/obj/machinery/atmospherics/components/get_rebuild_targets() + var/list/to_return = list() + for(var/i in 1 to device_type) + if(parents[i]) + continue + parents[i] = new /datum/pipenet() + to_return += parents[i] + return to_return + +/** + * Called by nullify_node(), used to remove the pipenet the component is attached to + * Arguments: + * * -reference: the pipenet the component is attached to + */ +/obj/machinery/atmospherics/components/proc/nullify_pipenet(datum/pipenet/reference) if(!reference) - CRASH("nullifyPipenet(null) called by [type] on [COORD(src)]") - var/i = parents.Find(reference) - reference.other_airs -= airs[i] - reference.other_atmosmch -= src + CRASH("nullify_pipenet(null) called by [type] on [COORD(src)]") + + for (var/i in 1 to length(parents)) + if (parents[i] == reference) + reference.other_airs -= airs[i] // Disconnects from the pipenet side + parents[i] = null // Disconnects from the machinery side. + + reference.other_atmos_machines -= src + if(custom_reconcilation) + reference.require_custom_reconcilation -= src + /** - * We explicitly qdel pipeline when this particular pipeline + * We explicitly qdel pipenet when this particular pipenet * is projected to have no member and cause GC problems. - * We have to do this because components don't qdel pipelines - * while pipes must and will happily wreck and rebuild everything again - * every time they are qdeleted. + * We have to do this because components don't qdel pipenets + * while pipes must and will happily wreck and rebuild everything + * again every time they are qdeleted. */ - if(!(reference.other_atmosmch.len || reference.members.len || QDESTROYING(reference))) + + if(!length(reference.other_atmos_machines) && !length(reference.members)) + if(QDESTROYING(reference)) + CRASH("nullify_pipenet() called on qdeleting [reference]") qdel(reference) - parents[i] = null -// We should return every air sharing a parent -/obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/reference) - for(var/i in 1 to device_type) - if(parents[i] == reference) - if(.) - if(!islist(.)) - . = list(.) - . += airs[i] - else - . = airs[i] - -/obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) +/obj/machinery/atmospherics/components/return_pipenet_airs(datum/pipenet/reference) + var/list/returned_air = list() + + for (var/i in 1 to parents.len) + if (parents[i] == reference) + returned_air += airs[i] + return returned_air + +/obj/machinery/atmospherics/components/pipenet_expansion(datum/pipenet/reference) if(reference) return list(nodes[parents.Find(reference)]) return ..() -/obj/machinery/atmospherics/components/setPipenet(datum/pipeline/reference, obj/machinery/atmospherics/A) - parents[nodes.Find(A)] = reference +/obj/machinery/atmospherics/components/set_pipenet(datum/pipenet/reference, obj/machinery/atmospherics/target_component) + parents[nodes.Find(target_component)] = reference -/obj/machinery/atmospherics/components/returnPipenet(obj/machinery/atmospherics/A = nodes[1]) //returns parents[1] if called without argument - return parents[nodes.Find(A)] +/obj/machinery/atmospherics/components/return_pipenet(obj/machinery/atmospherics/target_component = nodes[1]) //returns parents[1] if called without argument + return parents[nodes.Find(target_component)] -/obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New) +/obj/machinery/atmospherics/components/replace_pipenet(datum/pipenet/Old, datum/pipenet/New) parents[parents.Find(Old)] = New -/obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures) - ..() - - var/turf/T = get_turf(src) - if(T) - //Remove the gas from airs and assume it - var/datum/gas_mixture/environment = T.return_air() - var/lost = null - var/times_lost = 0 - for(var/i in 1 to device_type) - var/datum/gas_mixture/air = airs[i] - lost += pressures*environment.return_volume()/(air.return_temperature() * R_IDEAL_GAS_EQUATION) - times_lost++ - var/shared_loss = lost/times_lost - - for(var/i in 1 to device_type) - var/datum/gas_mixture/air = airs[i] - T.assume_air_moles(air, shared_loss) - -/obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set) - var/new_value = input(usr,text,title,default_set) as num - if(usr.canUseTopic(src)) - return new_value - return default_set - // Helpers +/** + * Called in most atmos processes and gas handling situations, update the parents pipenets of the devices connected to the source component + * This way gases won't get stuck + */ /obj/machinery/atmospherics/components/proc/update_parents() + if(!SSair.initialized) + return + if(rebuilding) + update_parents_after_rebuild = TRUE + return for(var/i in 1 to device_type) - var/datum/pipeline/parent = parents[i] + var/datum/pipenet/parent = parents[i] if(!parent) - //WARNING("Component is missing a pipenet! Rebuilding...") - //At pre-SSair_rebuild_pipenets times, not having a parent wasn't supposed to happen + WARNING("Component is missing a pipenet! Rebuilding...") SSair.add_to_rebuild_queue(src) - continue - parent.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + else + parent.update = TRUE -/obj/machinery/atmospherics/components/returnPipenets() +/obj/machinery/atmospherics/components/return_pipenets() . = list() for(var/i in 1 to device_type) - . += returnPipenet(nodes[i]) + . += return_pipenet(nodes[i]) + +/// When this machine is in a pipenet that is reconciling airs, this proc can add pipenets to the calculation. +/// Can be either a list of pipenets or a single pipenet. +/obj/machinery/atmospherics/components/proc/return_pipenets_for_reconcilation(datum/pipenet/requester) + return list() + +/// When this machine is in a pipenet that is reconciling airs, this proc can add airs to the calculation. +/// Can be either a list of airs or a single air mix. +/obj/machinery/atmospherics/components/proc/return_airs_for_reconcilation(datum/pipenet/requester) + return list() // UI Stuff @@ -186,3 +219,158 @@ /obj/machinery/atmospherics/components/return_analyzable_air() return airs + +/** + * Handles machinery deconstruction and unsafe pressure release + */ +/obj/machinery/atmospherics/components/proc/crowbar_deconstruction_act(mob/living/user, obj/item/tool, internal_pressure = 0) + if(!panel_open) + balloon_alert(user, "open panel!") + return TRUE + + var/unsafe_wrenching = FALSE + var/filled_pipe = FALSE + var/datum/gas_mixture/environment_air = loc.return_air() + + for(var/i in 1 to device_type) + var/datum/gas_mixture/inside_air = airs[i] + if(inside_air.total_moles() > 0 || internal_pressure) + filled_pipe = TRUE + if(!nodes[i] || (istype(nodes[i], /obj/machinery/atmospherics/components/unary/portables_connector) && !portable_device_connected(i))) + internal_pressure = internal_pressure > airs[i].return_pressure() ? internal_pressure : airs[i].return_pressure() + + if(!filled_pipe) + default_deconstruction_crowbar(tool) + return TRUE + + internal_pressure -= environment_air.return_pressure() + + if(internal_pressure > 2 * ONE_ATMOSPHERE) + to_chat(user, span_warning("As you begin deconstructing the [src] a gush of air blows in your face... maybe you should reconsider?")) + unsafe_wrenching = TRUE + + if(!do_after(user, 2 SECONDS, src)) + return + if(unsafe_wrenching) + unsafe_pressure_release(user, internal_pressure) + tool.play_tool_sound(src, 50) + deconstruct(TRUE) + return TRUE + +/obj/machinery/atmospherics/components/default_change_direction_wrench(mob/user, obj/item/I) + . = ..() + if(!.) + return FALSE + set_init_directions() + for(var/i in 1 to device_type) + var/obj/machinery/atmospherics/node = nodes[i] + if(node) + if(src in node.nodes) + node.disconnect(src) + nodes[i] = null + if(parents[i]) + nullify_pipenet(parents[i]) + for(var/i in 1 to device_type) + var/obj/machinery/atmospherics/node = nodes[i] + atmos_init() + node = nodes[i] + if(node) + node.atmos_init() + node.add_member(src) + update_parents() + SSair.add_to_rebuild_queue(src) + return TRUE + +/obj/machinery/atmospherics/components/paint(paint_color) + if(paintable) + add_atom_colour(paint_color, FIXED_COLOUR_PRIORITY) + pipe_color = paint_color + update_node_icon() + return paintable + +/obj/machinery/atmospherics/components/default_change_direction_wrench(mob/user, obj/item/I) + . = ..() + if(!.) + return FALSE + set_init_directions() + reconnect_nodes() + return TRUE + +/obj/machinery/atmospherics/components/proc/reconnect_nodes() + for(var/i in 1 to device_type) + var/obj/machinery/atmospherics/node = nodes[i] + if(node) + if(src in node.nodes) + node.disconnect(src) + nodes[i] = null + if(parents[i]) + nullify_pipenet(parents[i]) + for(var/i in 1 to device_type) + var/obj/machinery/atmospherics/node = nodes[i] + atmos_init() + node = nodes[i] + if(node) + node.atmos_init() + node.add_member(src) + update_parents() + SSair.add_to_rebuild_queue(src) + +/** + * Disconnects all nodes from ourselves, remove us from the node's nodes. + * Nullify our parent pipenet + */ +/obj/machinery/atmospherics/components/proc/disconnect_nodes() + for(var/i in 1 to device_type) + var/obj/machinery/atmospherics/node = nodes[i] + if(node) + if(src in node.nodes) //Only if it's actually connected. On-pipe version would is one-sided. + node.disconnect(src) + nodes[i] = null + if(parents[i]) + nullify_pipenet(parents[i]) + +/** + * Connects all nodes to ourselves, add us to the node's nodes. + * Calls atmos_init() on the node and on us. + */ +/obj/machinery/atmospherics/components/proc/connect_nodes() + atmos_init() + for(var/i in 1 to device_type) + var/obj/machinery/atmospherics/node = nodes[i] + if(node) + node.atmos_init() + node.add_member(src) + SSair.add_to_rebuild_queue(src) + +/** + * Easy way to toggle nodes connection and disconnection. + * + * Arguments: + * * disconnect - if TRUE, disconnects all nodes. If FALSE, connects all nodes. + */ +/obj/machinery/atmospherics/components/proc/change_nodes_connection(disconnect) + if(disconnect) + disconnect_nodes() + return + connect_nodes() + +/obj/machinery/atmospherics/components/update_layer() + layer = (showpipe ? initial(layer) : ABOVE_OPEN_TURF_LAYER) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001) + +/** + * Handles air relocation to the pipenet/environment + */ +/obj/machinery/atmospherics/components/proc/relocate_airs(datum/gas_mixture/to_release) + var/turf/local_turf = get_turf(src) + for(var/i in 1 to device_type) + var/datum/gas_mixture/air = airs[i] + if(!nodes[i] || (istype(nodes[i], /obj/machinery/atmospherics/components/unary/portables_connector) && !portable_device_connected(i))) + if(!to_release) + to_release = air + continue + to_release.merge(air) + continue + var/datum/gas_mixture/parents_air = parents[i].air + parents_air.merge(air) + if(to_release) + local_turf.assume_air(to_release) diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm new file mode 100644 index 0000000000000..1a7da17d3a907 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/tank.dm @@ -0,0 +1,199 @@ +/obj/machinery/atmospherics/components/tank + icon = 'icons/obj/atmospherics/pipes/pressure_tank.dmi' + icon_state = "generic" + + name = "pressure tank" + desc = "A large vessel containing pressurized gas." + + max_integrity = 800 + density = TRUE + layer = ABOVE_WINDOW_LAYER + + pipe_flags = PIPING_ONE_PER_TURF + device_type = QUATERNARY + initialize_directions = NONE + custom_reconcilation = TRUE + + /// The open node directions of the tank, assuming that the tank is facing NORTH. + var/open_ports = NONE + /// The volume of the gas mixture + var/volume = 2500 //in liters + /// The max pressure of the gas mixture before damaging the tank + var/max_pressure = 46000 + /// The typepath of the gas this tank should be filled with. + var/gas_type = null + + ///Reference to the gas mix inside the tank + var/datum/gas_mixture/air_contents + + +/obj/machinery/atmospherics/components/tank/Initialize(mapload) + . = ..() + air_contents = new + air_contents.temperature = T20C + air_contents.volume = volume + if(gas_type) + fill_to_pressure(gas_type) + + name = "[name] ([GLOB.meta_gas_info[gas_type][META_GAS_NAME]])" + set_piping_layer(piping_layer) + + // Mapped in tanks should automatically connect to adjacent pipenets in the direction set in dir + if(mapload) + set_portdir_relative(dir, TRUE) + set_init_directions() + + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/atmospherics/components/tank/wrench_act(mob/living/user, obj/item/item) + . = TRUE + var/new_dir = get_dir(src, user) + + if(new_dir in GLOB.diagonals) + return + + item.play_tool_sound(src, 10) + if(!item.use_tool(src, user, 3 SECONDS)) + return + + toggle_side_port(new_dir) + + item.play_tool_sound(src, 50) + +/// Recalculates pressure based on the current max integrity compared to original +/obj/machinery/atmospherics/components/tank/proc/refresh_pressure_limit() + var/max_pressure_multiplier = max_integrity / initial(max_integrity) + max_pressure = max_pressure_multiplier * initial(max_pressure) + +/// Fills the tank to the maximum safe pressure. +/// Safety margin is a multiplier for the cap for the purpose of this proc so it doesn't have to be filled completely. +/obj/machinery/atmospherics/components/tank/proc/fill_to_pressure(gastype, safety_margin = 0.5) + var/pressure_limit = max_pressure * safety_margin + + var/moles_to_add = (pressure_limit * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature) + air_contents.assert_gas(gastype) + air_contents.gases[gastype][MOLES] += moles_to_add + air_contents.archive() + +/obj/machinery/atmospherics/components/tank/process_atmos() + if(air_contents.react(src)) + update_parents() + + if(air_contents.return_pressure() > max_pressure) + take_damage(0.1, BRUTE, sound_effect = FALSE) + if(prob(40)) + playsound(src, 'sound/effects/spray3.ogg', 30, vary = TRUE) + +/////////////////////////////////////////////////////////////////// +// Port stuff + +/** + * Enables/Disables a port direction in var/open_ports. \ + * Use this, then call set_init_directions() instead of setting initialize_directions directly \ + * This system exists because tanks not having all initialize_directions set correctly breaks shuttle rotations + */ +/obj/machinery/atmospherics/components/tank/proc/set_portdir_relative(relative_port_dir, enable) + ASSERT(!isnull(enable)) + + // Rotate the given dir so that it's relative to north + var/port_dir + if(dir == NORTH) // We're already facing north, no rotation needed + port_dir = relative_port_dir + else + var/offnorth_angle = dir2angle(dir) + port_dir = turn(relative_port_dir, offnorth_angle) + + if(enable) + open_ports |= port_dir + else + open_ports &= ~port_dir + +/** + * Toggles a port direction in var/open_ports \ + * Use this, then call set_init_directions() instead of setting initialize_directions directly \ + * This system exists because tanks not having all initialize_directions set correctly breaks shuttle rotations + */ +/obj/machinery/atmospherics/components/tank/proc/toggle_portdir_relative(relative_port_dir) + var/toggle = ((initialize_directions & relative_port_dir) ? FALSE : TRUE) + set_portdir_relative(relative_port_dir, toggle) + +/obj/machinery/atmospherics/components/tank/set_init_directions() + if(!open_ports) + initialize_directions = NONE + return + //We're rotating open_ports relative to dir, and + //setting initialize_directions to that rotated dir + var/relative_port_dirs = NONE + var/dir_angle = dir2angle(dir) + for(var/cardinal in GLOB.cardinals) + var/current_dir = cardinal & open_ports + if(!current_dir) + continue + + var/rotated_dir = turn(current_dir, -dir_angle) + relative_port_dirs |= rotated_dir + + initialize_directions = relative_port_dirs + +/obj/machinery/atmospherics/components/tank/proc/toggle_side_port(port_dir) + toggle_portdir_relative(port_dir) + set_init_directions() + + for(var/i in 1 to length(nodes)) + var/obj/machinery/atmospherics/components/node = nodes[i] + if(!node) + continue + if(src in node.nodes) + node.disconnect(src) + nodes[i] = null + if(parents[i]) + nullify_pipenet(parents[i]) + + atmos_init() + + for(var/obj/machinery/atmospherics/components/node as anything in nodes) + if(!node) + continue + node.atmos_init() + node.add_member(src) + SSair.add_to_rebuild_queue(src) + + update_parents() + +/////////////////////////////////////////////////////////////////// +// Pipenet stuff + +/obj/machinery/atmospherics/components/tank/return_analyzable_air() + return air_contents + +/obj/machinery/atmospherics/components/tank/return_airs_for_reconcilation(datum/pipenet/requester) + . = ..() + if(!air_contents) + return + . += air_contents + +//////////////////////////////////////////////////////////////////////////////////////// + +/obj/machinery/atmospherics/components/tank/air + icon_state = "grey" + name = "pressure tank (Air)" + +/obj/machinery/atmospherics/components/tank/air/Initialize(mapload) + . = ..() + SET_MOLES(/datum/gas/oxygen, air_contents, 6*ONE_ATMOSPHERE*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) + SET_MOLES(/datum/gas/nitrogen, air_contents, 6*ONE_ATMOSPHERE*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) + +/obj/machinery/atmospherics/components/tank/carbon_dioxide + gas_type = /datum/gas/carbon_dioxide + +/obj/machinery/atmospherics/components/tank/plasma + icon_state = "orange" + gas_type = /datum/gas/plasma + +/obj/machinery/atmospherics/components/tank/oxygen + icon_state = "blue" + gas_type = /datum/gas/oxygen + +/obj/machinery/atmospherics/components/tank/nitrogen + icon_state = "red" + gas_type = /datum/gas/nitrogen diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index ff668ee6408bc..368192b23b468 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -1,19 +1,16 @@ /obj/machinery/atmospherics/components/trinary/filter icon_state = "filter_off-0" density = FALSE - name = "gas filter" desc = "Very useful for filtering gasses." - - can_unwrench = TRUE - var/transfer_rate = MAX_TRANSFER_RATE - var/filter_type = null - var/frequency = 0 - var/datum/radio_frequency/radio_connection - construction_type = /obj/item/pipe/trinary/flippable pipe_state = "filter" + can_unwrench = TRUE + ///Rate of transfer of the gases to the outputs + var/transfer_rate = MAX_TRANSFER_RATE + ///What gases are we filtering, by typepath + var/list/filter_type = list() /obj/machinery/atmospherics/components/trinary/filter/CtrlClick(mob/user) if(can_interact(user)) @@ -30,38 +27,18 @@ ui_update() return -/obj/machinery/atmospherics/components/trinary/filter/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) - -/obj/machinery/atmospherics/components/trinary/filter/Destroy() - SSradio.remove_object(src,frequency) - return ..() - -/obj/machinery/atmospherics/components/trinary/filter/update_icon() - cut_overlays() +/obj/machinery/atmospherics/components/trinary/filter/update_overlays() + . = ..() for(var/direction in GLOB.cardinals) if(!(direction & initialize_directions)) continue - var/obj/machinery/atmospherics/node = findConnecting(direction) - var/image/cap - if(node) - cap = getpipeimage(icon, "cap", direction, node.pipe_color, piping_layer = piping_layer, trinary = TRUE) - else - cap = getpipeimage(icon, "cap", direction, piping_layer = piping_layer, trinary = TRUE) - - add_overlay(cap) - - return ..() + . += get_pipe_image(icon, "cap", direction, pipe_color, piping_layer, trinary = TRUE) /obj/machinery/atmospherics/components/trinary/filter/update_icon_nopipes() var/on_state = on && nodes[1] && nodes[2] && nodes[3] && is_operational icon_state = "filter_[on_state ? "on" : "off"]-[set_overlay_offset(piping_layer)][flipped ? "_f" : ""]" - /obj/machinery/atmospherics/components/trinary/filter/process_atmos() ..() if(!on || !(nodes[1] && nodes[2] && nodes[3]) || !is_operational) @@ -69,44 +46,70 @@ //Early return var/datum/gas_mixture/air1 = airs[1] - if(!air1 || air1.return_temperature() <= 0) + if(!air1 || air1.temperature <= 0) return var/datum/gas_mixture/air2 = airs[2] var/datum/gas_mixture/air3 = airs[3] - var/output_starting_pressure = air3.return_pressure() + var/transfer_ratio = transfer_rate / air1.volume - if(output_starting_pressure >= MAX_OUTPUT_PRESSURE) - //No need to transfer if target is already full! + if(transfer_ratio <= 0) return - var/transfer_ratio = transfer_rate / air1.return_volume() + // Attempt to transfer the gas. - //Actually transfer the gas + // If the main output is full, we try to send filtered output to the side port (air2). + // If the side output is full, we try to send the non-filtered gases to the main output port (air3). + // Any gas that can't be moved due to its destination being too full is sent back to the input (air1). - if(transfer_ratio <= 0) + var/side_output_full = air2.return_pressure() >= MAX_OUTPUT_PRESSURE + var/main_output_full = air3.return_pressure() >= MAX_OUTPUT_PRESSURE + + // If both output ports are full, there's nothing we can do. Don't bother removing anything from the input. + if (side_output_full && main_output_full) return - if(filter_type && air2.return_pressure() <= 9000) - air1.scrub_into(air2, transfer_ratio, list(filter_type)) - if(air3.return_pressure() <= 9000) - air1.transfer_ratio_to(air3, transfer_ratio) + var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio) - update_parents() + if(!removed || !removed.total_moles()) + return -/obj/machinery/atmospherics/components/trinary/filter/atmosinit() - set_frequency(frequency) - return ..() + var/filtering = TRUE + if(!filter_type.len) + filtering = FALSE + + // Process if we have a filter set. + // If no filter is set, we just try to forward everything to air3 to avoid gas being outright lost. + if(filtering) + var/datum/gas_mixture/filtered_out = new + + for(var/gas in removed.gases & filter_type) + var/datum/gas_mixture/removing = removed.remove_specific_ratio(gas, 1) + if(removing) + filtered_out.merge(removing) + // Send things to the side output if we can, return them to the input if we can't. + // This means that other gases continue to flow to the main output if the side output is blocked. + if (side_output_full) + air1.merge(filtered_out) + else + air2.merge(filtered_out) + // Make sure we don't send any now-empty gas entries to the main output + removed.garbage_collect() + // Send things to the main output if we can, return them to the input if we can't. + // This lets filtered gases continue to flow to the side output in a manner consistent with the main output behavior. + if (main_output_full) + air1.merge(removed) + else + air3.merge(removed) -/obj/machinery/atmospherics/components/trinary/filter/ui_state(mob/user) - return GLOB.default_state + update_parents() /obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "AtmosFilter") + ui = new(user, src, "AtmosFilter", name) ui.open() /obj/machinery/atmospherics/components/trinary/filter/ui_data() @@ -116,9 +119,9 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) data["filter_types"] = list() - data["filter_types"] += list(list("name" = "Nothing", "id" = "", "selected" = !filter_type)) - for(var/id in GLOB.gas_data.ids) - data["filter_types"] += list(list("name" = GLOB.gas_data.names[id], "id" = id, "selected" = (id == filter_type))) + for(var/path in GLOB.meta_gas_info) + var/list/gas = GLOB.meta_gas_info[path] + data["filter_types"] += list(list("gas_id" = gas[META_GAS_ID], "enabled" = (path in filter_type))) return data @@ -145,14 +148,17 @@ if(.) transfer_rate = clamp(rate, 0, MAX_TRANSFER_RATE) investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) - if("filter") - filter_type = null - var/filter_name = "nothing" - var/gas = params["mode"] - if(gas in GLOB.gas_data.names) - filter_type = gas - filter_name = GLOB.gas_data.names[gas] - investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS) + if("toggle_filter") + if(!gas_id2path(params["val"])) + return TRUE + filter_type ^= gas_id2path(params["val"]) + var/change + if(gas_id2path(params["val"]) in filter_type) + change = "added" + else + change = "removed" + var/gas_name = GLOB.meta_gas_info[gas_id2path(params["val"])][META_GAS_NAME] + investigate_log("[key_name(usr)] [change] [gas_name] from the filter type.", INVESTIGATE_ATMOS) . = TRUE if(.) update_icon() @@ -211,21 +217,101 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/n2 name = "nitrogen filter" - filter_type = "n2" + filter_type = list(/datum/gas/nitrogen) + /obj/machinery/atmospherics/components/trinary/filter/atmos/o2 name = "oxygen filter" - filter_type = "o2" + filter_type = list(/datum/gas/oxygen) + /obj/machinery/atmospherics/components/trinary/filter/atmos/co2 name = "carbon dioxide filter" - filter_type = "co2" + filter_type = list(/datum/gas/carbon_dioxide) /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o name = "nitrous oxide filter" - filter_type = "n2o" + filter_type = list(/datum/gas/nitrous_oxide) /obj/machinery/atmospherics/components/trinary/filter/atmos/plasma name = "plasma filter" - filter_type = "plasma" + filter_type = list(/datum/gas/plasma) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/bz + name = "bz filter" + filter_type = list(/datum/gas/bz) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/hypernoblium + name = "hypernoblium filter" + filter_type = list(/datum/gas/hypernoblium) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/no2 + name = "nitryl filter" + filter_type = list(/datum/gas/nitryl) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/stimulum + name = "stimulum filter" + filter_type = list(/datum/gas/stimulum) + + +/obj/machinery/atmospherics/components/trinary/filter/atmos/pluoxium + name = "pluoxium filter" + filter_type = list(/datum/gas/pluoxium) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/tritium + name = "tritium filter" + filter_type = list(/datum/gas/tritium) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/h2o + name = "water vapor filter" + filter_type = list(/datum/gas/water_vapor) + + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped //This feels wrong, I know + icon_state = "filter_on-0_f" + flipped = TRUE + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2 + name = "nitrogen filter" + filter_type = list(/datum/gas/nitrogen) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2 + name = "oxygen filter" + filter_type = list(/datum/gas/oxygen) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2 + name = "carbon dioxide filter" + filter_type = list(/datum/gas/carbon_dioxide) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o + name = "nitrous oxide filter" + filter_type = list(/datum/gas/nitrous_oxide) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma + name = "plasma filter" + filter_type = list(/datum/gas/plasma) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/bz + name = "bz filter" + filter_type = list(/datum/gas/bz) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/hypernoblium + name = "hypernoblium filter" + filter_type = list(/datum/gas/hypernoblium) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/no2 + name = "nitryl filter" + filter_type = list(/datum/gas/nitryl) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/pluoxium + name = "pluoxium filter" + filter_type = list(/datum/gas/pluoxium) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/tritium + name = "tritium filter" + filter_type = list(/datum/gas/tritium) + +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/h2o + name = "water vapor filter" + filter_type = list(/datum/gas/water_vapor) // These two filter types have critical_machine flagged to on and thus causes the area they are in to be exempt from the Grid Check event. diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index a81053ab9fd7a..324f0a2af0e77 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -34,22 +34,13 @@ ui_update() return -/obj/machinery/atmospherics/components/trinary/mixer/update_icon() - cut_overlays() +/obj/machinery/atmospherics/components/trinary/mixer/update_overlays() + . = ..() for(var/direction in GLOB.cardinals) if(!(direction & initialize_directions)) continue - var/obj/machinery/atmospherics/node = findConnecting(direction) - - var/image/cap - if(node) - cap = getpipeimage(icon, "cap", direction, node.pipe_color, piping_layer = piping_layer, trinary = TRUE) - else - cap = getpipeimage(icon, "cap", direction, piping_layer = piping_layer, trinary = TRUE) - add_overlay(cap) - - return ..() + . += get_pipe_image(icon, "cap", direction, pipe_color, piping_layer, trinary = TRUE) /obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes() var/on_state = on && nodes[1] && nodes[2] && nodes[3] && is_operational @@ -58,12 +49,12 @@ /obj/machinery/atmospherics/components/trinary/mixer/New() ..() var/datum/gas_mixture/air3 = airs[3] - air3.set_volume(300) + air3.volume = 300 airs[3] = air3 /obj/machinery/atmospherics/components/trinary/mixer/process_atmos() ..() - if(!on || !(nodes[1] && nodes[2] && nodes[3]) || !is_operational) + if(!on || !(nodes[1] && nodes[2] && nodes[3]) && !is_operational) return //Get those gases, mah boiiii @@ -82,26 +73,30 @@ return //Calculate necessary moles to transfer using PV=nRT - var/general_transfer = (target_pressure - output_starting_pressure) * air3.return_volume() / R_IDEAL_GAS_EQUATION + var/general_transfer = (target_pressure - output_starting_pressure) * air3.volume / R_IDEAL_GAS_EQUATION + + //Calculate combined temperature for accurate output ratio + var/combined_heat_capacity = air1.heat_capacity() + air2.heat_capacity() + var/equalized_temperature = combined_heat_capacity ? (air1.thermal_energy() + air2.thermal_energy()) / combined_heat_capacity : 0 - var/transfer_moles1 = air1.return_temperature() ? node1_concentration * general_transfer / air1.return_temperature() : 0 - var/transfer_moles2 = air2.return_temperature() ? node2_concentration * general_transfer / air2.return_temperature() : 0 + var/transfer_moles1 = equalized_temperature ? (node1_concentration * general_transfer) / equalized_temperature : 0 + var/transfer_moles2 = equalized_temperature ? (node2_concentration * general_transfer) / equalized_temperature : 0 var/air1_moles = air1.total_moles() var/air2_moles = air2.total_moles() if(!node2_concentration) - if(air1.return_temperature() <= 0) + if(air1.temperature <= 0) return transfer_moles1 = min(transfer_moles1, air1_moles) transfer_moles2 = 0 else if(!node1_concentration) - if(air2.return_temperature() <= 0) + if(air2.temperature <= 0) return transfer_moles2 = min(transfer_moles2, air2_moles) transfer_moles1 = 0 else - if(air1.return_temperature() <= 0 || air2.return_temperature() <= 0) + if(air1.temperature <= 0 || air2.temperature <= 0) return if((transfer_moles2 <= 0) || (transfer_moles1 <= 0)) return @@ -114,17 +109,19 @@ //Actually transfer the gas if(transfer_moles1) - air1.transfer_to(air3, transfer_moles1) - var/datum/pipeline/parent1 = parents[1] - parent1.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1) + air3.merge(removed1) + var/datum/pipenet/parent1 = parents[1] + parent1.update = TRUE if(transfer_moles2) - air2.transfer_to(air3, transfer_moles2) - var/datum/pipeline/parent2 = parents[2] - parent2.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2) + air3.merge(removed2) + var/datum/pipenet/parent2 = parents[2] + parent2.update = TRUE - var/datum/pipeline/parent3 = parents[3] - parent3.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + var/datum/pipenet/parent3 = parents[3] + parent3.update = TRUE /obj/machinery/atmospherics/components/trinary/mixer/ui_state(mob/user) @@ -167,12 +164,12 @@ if("node1") var/value = text2num(params["concentration"]) adjust_node1_value(value) - investigate_log("was set to [node1_concentration] % on node 1 by [key_name(usr)]", INVESTIGATE_ATMOS) + investigate_log("was set to [100 * node1_concentration] % on node 1 by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE if("node2") var/value = text2num(params["concentration"]) adjust_node1_value(100 - value) - investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS) + investigate_log("was set to [100 * node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE if(.) update_icon() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm index 01b89560d683e..1785595225b47 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm @@ -9,7 +9,7 @@ var/flipped = FALSE -/obj/machinery/atmospherics/components/trinary/SetInitDirections() +/obj/machinery/atmospherics/components/trinary/set_init_directions() switch(dir) if(NORTH) initialize_directions = EAST|NORTH|SOUTH @@ -24,7 +24,7 @@ Housekeeping and pipe network stuff */ -/obj/machinery/atmospherics/components/trinary/getNodeConnects() +/obj/machinery/atmospherics/components/trinary/get_node_connects() //Mixer: //1 and 2 is input @@ -49,7 +49,9 @@ Housekeeping and pipe network stuff /obj/machinery/atmospherics/components/trinary/proc/set_overlay_offset(var/pipe_layer) switch(pipe_layer) - if(1, 5) - return pipe_layer + if(1) + return 1 + if(5) + return 5 else return 0 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm new file mode 100644 index 0000000000000..369a50668c683 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm @@ -0,0 +1,596 @@ +/** + * The pump looks up for the airlocks automatically based on airlock_pump_distance_limit and airlock_group_distance_limit values. + * When placed, the dir value (direction where the pipes are coming from) is considered as a direction towards the station (internal). The opposite direction is external. + * The airlock then tries to find airlocks or walls towards these directions until airlock_pump_distance_limit number of tiles reached. + * When it finds a valid object, then it tries to find airlocks, in directions perpendicular to the found tiles. + * And then adds them to the corresponding group (external/internal) until airlock_group_distance_limit number of tiles reached + * + * Example scheme of a valid configuration: + * A-----W + * A-----A + * W--P--A + * W-----W + * A-----W + * + * Where: + * A - airlocks + * W - walls + * P - pump + */ +/// A vent, scrubber and a sensor in a single device meant specifically for cycling airlocks. Ideal for airlocks of up to 3x3 tiles in size to avoid wind and timing out. +/obj/machinery/atmospherics/components/unary/airlock_pump + name = "external airlock pump" + desc = "A pump for cycling an external airlock controlled by the connected doors." + icon = 'icons/obj/atmospherics/components/unary_devices.dmi' + icon_state = "airlock_pump" + pipe_state = "airlock_pump" + use_power = IDLE_POWER_USE + can_unwrench = TRUE + welded = FALSE + vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE | VENTCRAWL_ENTRANCE_ALLOWED + max_integrity = 100 + paintable = FALSE + pipe_flags = PIPING_ONE_PER_TURF | PIPING_DISTRO_AND_WASTE_LAYERS | PIPING_DEFAULT_LAYER_ONLY | PIPING_ALL_COLORS + layer = GAS_PUMP_LAYER + hide = TRUE + device_type = BINARY // Even though it is unary, it has two nodes on one side - used in node count checks + + ///Indicates that the direction of the pump, if ATMOS_DIRECTION_SIPHONING is siphoning, if ATMOS_DIRECTION_RELEASING is releasing + var/pump_direction = ATMOS_DIRECTION_SIPHONING + ///Target pressure for pressurization cycle + var/internal_pressure_target = ONE_ATMOSPHERE + ///Target pressure for depressurization cycle + var/external_pressure_target = 0 + ///Target pressure for the current cycle + var/cycle_pressure_target + ///Allowed error in pressure checks + var/allowed_pressure_error = ONE_ATMOSPHERE / 100 + ///Minimal distro pressure to start cycling + var/min_distro_pressure = ONE_ATMOSPHERE / 10 + ///Which pressure holds docked vessel\station for override of external_pressure_target + var/docked_side_pressure + ///Rate of the pump to remove gases from the air + var/volume_rate = 1000 + ///The start time of the current cycle to calculate cycle duration + var/cycle_start_time + ///Max duration of cycle, after which the pump will unlock the airlocks with a warning + var/cycle_timeout = 10 SECONDS + ///List of the turfs adjacent to the pump for faster cycling and avoiding wind + var/list/turf/adjacent_turfs = list() + ///Max distance between the airlock and the pump. Used to set up cycling. + var/airlock_pump_distance_limit = 2 + ///Max distance between the central airlock and the side airlocks in a group + var/airlock_group_distance_limit = 2 + ///Type of airlocks required for automatic cycling setup. To avoid hacking bridge doors. Ignored for mapspawn pump. + var/valid_airlock_typepath = /obj/machinery/door/airlock/external + ///Station-facing airlocks used in cycling + var/list/obj/machinery/door/airlock/internal_airlocks + ///Space-facing airlocks used in cycling + var/list/obj/machinery/door/airlock/external_airlocks + ///Whether both airlocks are specified and cycling is available + var/cycling_set_up = FALSE + ///Whether the pump opens the airlocks up instead of simpy unbolting them on cycle + var/open_airlock_on_cycle = TRUE + ///Airlocks currently animating + var/airlocks_animating = FALSE + ///Whether the airlocks comment the cycling details to the chat + var/is_cycling_audible = TRUE + + COOLDOWN_DECLARE(check_turfs_cooldown) + + +/obj/machinery/atmospherics/components/unary/airlock_pump/update_icon_nopipes() + if(!on || !is_operational || !powered()) + icon_state = "vent_off" + else + icon_state = pump_direction ? "vent_out" : "vent_in" + + +/obj/machinery/atmospherics/components/unary/airlock_pump/update_overlays() + . = ..() + if(!showpipe) + return + + var/mutable_appearance/distro_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_BLUE, piping_layer = 4) + if(nodes[1]) + distro_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_BLUE, piping_layer = 4) + . += distro_pipe_appearance + + var/mutable_appearance/waste_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_RED, piping_layer = 2) + if(nodes[2]) + waste_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_RED, piping_layer = 2) + . += waste_pipe_appearance + + var/mutable_appearance/distro_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 4) + . += distro_cap_appearance + + var/mutable_appearance/waste_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 2) + . += waste_cap_appearance + + +/obj/machinery/atmospherics/components/unary/airlock_pump/atmos_init(list/node_connects) + for(var/obj/machinery/atmospherics/target in get_step(src, dir)) + if(connection_check(target, 4) && !nodes[1]) + nodes[1] = target // Distro + if(connection_check(target, 2) && !nodes[2]) + nodes[2] = target // Waste + update_appearance() + + +/obj/machinery/atmospherics/components/unary/airlock_pump/Initialize(mapload) + . = ..() + if(mapload) + can_unwrench = FALSE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/LateInitialize() + . = ..() + set_links() + // If we are on docked shuttle - setup docking variables + // Example - 'build your own shuttle' evac vessel + var/turf/local_turf = get_turf(src) + if (!cycling_set_up || !isshuttleturf(local_turf)) + return + + var/tile_air_pressure + for(var/obj/machinery/door/airlock/external_airlock in external_airlocks) + var/current_area = get_area(external_airlock) + for(var/obj/machinery/door/airlock/other_airlock in orange(2, external_airlock)) // does not include src, extended because some escape pods have 1 plating turf exposed to space + if(get_area(other_airlock) != current_area) // does not include double-wide airlocks unless actually docked + // Cycle linking is only disabled if we are actually adjacent to another airlock + external_airlock.shuttledocked = TRUE + other_airlock.shuttledocked = TRUE + if (other_airlock.cycle_pump) + INVOKE_ASYNC(other_airlock.cycle_pump, TYPE_PROC_REF(/obj/machinery/atmospherics/components/unary/airlock_pump, on_dock_request), internal_pressure_target) // Only case when airlock pumps speaking to each other directly + // Save external airlocks turf in case our own docking purpouses + local_turf = get_turf(other_airlock) + + if (local_turf) + local_turf = get_step(local_turf, REVERSE_DIR(dir)) + tile_air_pressure = 0 + if (local_turf) + tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + on_dock_request(tile_air_pressure) + +/obj/machinery/atmospherics/components/unary/airlock_pump/New() + . = ..() + var/datum/gas_mixture/distro_air = airs[1] + var/datum/gas_mixture/waste_air = airs[2] + distro_air.volume = 1000 + waste_air.volume = 1000 + + +/obj/machinery/atmospherics/components/unary/airlock_pump/on_deconstruction(disassembled) + . = ..() + if(cycling_set_up) + break_all_links() + + +/obj/machinery/atmospherics/components/unary/airlock_pump/can_unwrench(mob/user) + . = ..() + if(!.) + to_chat(user, span_warning("You cannot unwrench [src], it is secured firmly in place!")) + return FALSE + if(. && on) + to_chat(user, span_warning("You cannot unwrench [src], wait for the cycle completion!")) + return FALSE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/process_atmos() + if(!on) + return + + if(!powered()) + stop_cycle("No power. Cycle aborted.", unbolt_only = TRUE) + return //Couldn't complete the cycle due to power outage + + var/turf/location = get_turf(loc) + if(isclosedturf(location)) + return + + if(COOLDOWN_FINISHED(src, check_turfs_cooldown)) + check_turfs() + COOLDOWN_START(src, check_turfs_cooldown, 2 SECONDS) + + if(world.time - cycle_start_time > cycle_timeout) + stop_cycle("Cycling timed out, bolts unlocked.", unbolt_only = TRUE) + return //Couldn't complete the cycle before timeout + + var/datum/gas_mixture/distro_air = airs[1] + var/datum/gas_mixture/tile_air = loc.return_air() + var/tile_air_pressure = tile_air.return_pressure() + + if(pump_direction == ATMOS_DIRECTION_RELEASING) //distro node -> tile + var/pressure_delta = cycle_pressure_target - tile_air_pressure + if(pressure_delta <= allowed_pressure_error && stop_cycle("Pressurization complete.")) + return //Internal target pressure reached + + var/available_moles = distro_air.total_moles() + var/total_tiles = adjacent_turfs.len + 1 + var/split_moles = QUANTIZE(available_moles / total_tiles) + + fill_tile(loc, split_moles, pressure_delta) + for(var/turf/tile as anything in adjacent_turfs) + fill_tile(tile, split_moles, pressure_delta) + else //tile -> waste node + var/pressure_delta = tile_air_pressure - cycle_pressure_target + if(pressure_delta <= allowed_pressure_error && stop_cycle("Decompression complete.")) + return //External target pressure reached + + siphon_tile(loc) + for(var/turf/tile as anything in adjacent_turfs) + siphon_tile(tile) + + +/// Fill a tile with air from the distro node +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/fill_tile(turf/tile, moles, pressure_delta) + var/datum/pipenet/distro_pipe = parents[1] + var/datum/gas_mixture/distro_air = airs[1] + var/datum/gas_mixture/tile_air = tile.return_air() + var/transfer_moles = (volume_rate / tile_air.volume) * (pressure_delta * tile_air.volume) / (distro_air.temperature * R_IDEAL_GAS_EQUATION) + moles = min(moles, transfer_moles) + + var/datum/gas_mixture/removed_air = distro_air.remove(moles) + + if(!removed_air) + return //No air in distro + + tile.assume_air(removed_air) + distro_pipe.update = TRUE + + +/// Siphon air from the tile to the waste node within the volume rate limit +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/siphon_tile(turf/tile) + var/datum/pipenet/waste_pipe = parents[2] + var/datum/gas_mixture/waste_air = airs[2] + var/datum/gas_mixture/tile_air = tile.return_air() + + var/transfer_moles = tile_air.total_moles() * (volume_rate / tile_air.volume) + var/datum/gas_mixture/removed_air = tile.remove_air(transfer_moles) + + if(!removed_air) + return //No air on the tile + + waste_air.merge(removed_air) + waste_pipe.update = TRUE + + +/// Proc for triggering cycle by clicking on a bolted airlock that has a pump assigned +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/airlock_act(obj/machinery/door/airlock/airlock) + if(on) + airlock.do_animate(AIRLOCK_DENY) // Already cycling + return + if(!cycling_set_up) + airlock.say("Airlock pair not found.") + return + if(airlock in external_airlocks) + // If it's not null - we shuttledocked + // (it may be 0. Maybe badmin set internal pressure to 0 as well, who knows) + if(docked_side_pressure != null) + // Space-faced airlock detection + var/turf/external_tile = get_step(airlock, REVERSE_DIR(dir)) + // Map edge or space turf + if (external_tile == null || isspaceturf(external_tile) || isopenspace(external_tile)) + airlock.do_animate(AIRLOCK_DENY) + return + var/tile_air_pressure = max(0, external_tile.return_air().return_pressure()) + var/pressure_delta = docked_side_pressure - tile_air_pressure + if (pressure_delta > 0 ? (pressure_delta > allowed_pressure_error*10) : (pressure_delta*-1 > allowed_pressure_error*10)) + // Disabled to avoid airlocks close-open spam + airlock.do_animate(AIRLOCK_DENY) + return + + start_cycle(ATMOS_DIRECTION_SIPHONING, airlock) + else if(airlock in internal_airlocks) + start_cycle(ATMOS_DIRECTION_RELEASING, airlock) + + +///Start decompression or pressurization cycle depending on the passed direction +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/start_cycle(cycle_direction, obj/machinery/door/airlock/source_airlock = null) + if(on || !cycling_set_up || airlocks_animating || !powered()) + return FALSE + + pump_direction = cycle_direction + + for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks)) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close)) + + airlocks_animating = TRUE + stoplag(1 SECONDS) // Wait for closing animation + airlocks_animating = FALSE + + on = TRUE + cycle_start_time = world.time + + var/turf/local_turf = get_turf(src) + var/tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + + if(pump_direction == ATMOS_DIRECTION_RELEASING) + cycle_pressure_target = internal_pressure_target + var/pressure_delta = cycle_pressure_target - tile_air_pressure + if(pressure_delta <= allowed_pressure_error) + stop_cycle("Pressure nominal, cycle skipped.") + return TRUE + + var/datum/gas_mixture/distro_air = airs[1] + if(distro_air.return_pressure() < min_distro_pressure) + stop_cycle("Low pipe pressure, cycle skipped. Proceed with caution.", unbolt_only = TRUE) + return TRUE + + if(!source_airlock) + source_airlock = internal_airlocks[1] + if(is_cycling_audible) + source_airlock.say("Pressurizing airlock.") + else + cycle_pressure_target = docked_side_pressure != null ? docked_side_pressure : external_pressure_target + var/pressure_delta = tile_air_pressure - cycle_pressure_target + if(pressure_delta <= allowed_pressure_error) + stop_cycle("Pressure nominal, cycle skipped.") + return TRUE + + if(!source_airlock) + source_airlock = external_airlocks[1] + if(is_cycling_audible) + source_airlock.say("Decompressing airlock.") + + update_appearance() + return TRUE + + +///Complete/Abort cycle with the passed message +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/stop_cycle(message = null, unbolt_only = FALSE) + if(!on) + return FALSE + on = FALSE + + // In case we can open both sides safe_dock will do it for us + // it also handles its own messages. If we can't - procceed + if (docked_side_pressure != null && safe_dock(unbolt_only)) + return TRUE + + var/list/obj/machinery/door/airlock/unlocked_airlocks = pump_direction == ATMOS_DIRECTION_RELEASING ? internal_airlocks : external_airlocks + for(var/obj/machinery/door/airlock/airlock as anything in unlocked_airlocks) + airlock.unbolt() + if(open_airlock_on_cycle && !unbolt_only) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) //Can unbolt, but without audio + + airlocks_animating = TRUE + stoplag(1 SECONDS) // Wait for opening animation + airlocks_animating = FALSE + + if(message && is_cycling_audible) + unlocked_airlocks[1].say(message) + + update_appearance() + return TRUE + +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/on_dock_request(requester_pressure = 0) + if (docked_side_pressure != null) + return + + docked_side_pressure = requester_pressure + + if (!powered() || !cycling_set_up) + return + + // We just finishing previous cycle + if (airlocks_animating) + say("Docking request queued.") + stoplag(1.1 SECONDS) // Wait for opening animation + if (airlocks_animating) // Should (almost) never happened + say("ERROR: D11. Please re-initiate docking sequence.") + return + + if (on) + // You can't go there, there is a shuttle now + if (pump_direction == ATMOS_DIRECTION_SIPHONING) + stop_cycle("Cycling sequence overriden by docking sequence.", TRUE) + start_cycle(ATMOS_DIRECTION_RELEASING) + // If cycling inside, docking will be handled by stop_cycle proc + return + + // Check if we need cycle in + var/turf/local_turf = get_turf(src) + var/tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + var/pressure_delta = internal_pressure_target - tile_air_pressure + if(pressure_delta <= allowed_pressure_error) + // We fine + safe_dock() + else + var/obj/machinery/door/airlock/source_airlock = pick(internal_airlocks) + source_airlock.say("Docking sequence initiated") + start_cycle(ATMOS_DIRECTION_RELEASING) + + +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/safe_dock(unbolt_only = FALSE) + var/pressure_delta = internal_pressure_target - docked_side_pressure + // Docked vessel has pressure higher then our internal + if ((pressure_delta + allowed_pressure_error) < 0) + return FALSE + // Pressure is too different, its unsafe to open both sides + else if (pressure_delta > allowed_pressure_error * 10) + return FALSE + // No power handles by stop_cycle pretty good + else if (!powered()) + return FALSE + + var/turf/local_turf = get_turf(src) + var/tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + pressure_delta = internal_pressure_target - tile_air_pressure + // Chamber is not pressurised + if(pressure_delta > allowed_pressure_error) + return FALSE + + for(var/obj/machinery/door/airlock/airlock as anything in (external_airlocks + internal_airlocks)) + if (airlock in external_airlocks) + airlock.air_tight = TRUE + local_turf = get_step(airlock, REVERSE_DIR(dir)) + // Map edge or space turf + if (local_turf == null || isspaceturf(local_turf) || isopenspace(local_turf)) + continue + + tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + pressure_delta = docked_side_pressure - tile_air_pressure + // Do not open airlocks leading in space + // If docked entity now has pressure lower or higher then was declared on docking + // We will keep airlocks closed until redocking or fixing atmos + if (pressure_delta > 0 ? (pressure_delta > allowed_pressure_error*10) : (pressure_delta*-1 > allowed_pressure_error*10)) + continue + + airlock.unbolt() + if(open_airlock_on_cycle && !unbolt_only) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) + + airlocks_animating = TRUE + stoplag(1 SECONDS) // Wait for closing animation + airlocks_animating = FALSE + update_appearance() + say("Docking complete.") + return TRUE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/undock() + if (docked_side_pressure == null) + return + docked_side_pressure = null + if(!powered()) + return + + for(var/obj/machinery/door/airlock/airlock as anything in external_airlocks) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close), TRUE) + + say("Docking connection terminated.") + airlocks_animating = TRUE + stoplag(1 SECONDS) // Wait for closing animation + airlocks_animating = FALSE + + +///Update adjacent_turfs with atmospherically adjacent tiles +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/check_turfs() + adjacent_turfs.Cut() + var/turf/local_turf = get_turf(src) + adjacent_turfs = local_turf.get_atmos_adjacent_turfs(alldir = TRUE) + + +///Find airlocks and link up with them +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/set_links() + var/perpendicular_dirs = NSCOMPONENT(dir) ? WEST|EAST : NORTH|SOUTH + var/turf/internal_airlocks_origin = find_density(get_turf(src), dir) + var/turf/external_airlocks_origin = find_density(get_turf(src), REVERSE_DIR(dir)) + internal_airlocks = get_adjacent_airlocks(internal_airlocks_origin, perpendicular_dirs) + external_airlocks = get_adjacent_airlocks(external_airlocks_origin, perpendicular_dirs) + + if(!internal_airlocks.len || !internal_airlocks.len) + if(!can_unwrench) //maploaded pump + CRASH("[type] couldn't find airlocks to cycle with!") + internal_airlocks = list() + external_airlocks = list() + say("Cycling setup failed. No opposite airlocks found.") + return + + for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks)) + airlock.set_cycle_pump(src) + RegisterSignal(airlock, COMSIG_PARENT_QDELETING, PROC_REF(unlink_airlock)) + if (airlock in external_airlocks) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close)) + else if(open_airlock_on_cycle) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) + + cycle_timeout *= round((internal_airlocks.len + external_airlocks.len) / 2) + cycling_set_up = TRUE + if(can_unwrench) + say("Cycling setup complete.") + + +///Get the turf of the first found airlock or an airtight structure (walls) within the allowed range +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/find_density(turf/origin, direction, max_distance = airlock_pump_distance_limit) + var/turf/next_turf = origin + var/limit = max(1, max_distance) + while(limit) + limit-- + next_turf = get_step(next_turf, direction) + var/obj/machinery/door/airlock/found_airlock = locate() in next_turf + if(is_valid_airlock(found_airlock)) + return found_airlock.loc + if(!next_turf.can_atmos_pass) + return next_turf + + +///Find airlocks adjacent to the central one, lined up along the provided directions +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/get_adjacent_airlocks(origin_turf, directions) + var/list/airlocks = list() + + var/obj/machinery/door/airlock/origin_airlock = locate() in origin_turf + if(is_valid_airlock(origin_airlock)) + airlocks.Add(origin_airlock) + + for(var/direction in GLOB.cardinals) + if(!(direction & directions)) + continue + var/turf/next_turf = origin_turf + var/limit = max(0, airlock_group_distance_limit) + while(limit) + limit-- + next_turf = get_step(next_turf, direction) + var/obj/machinery/door/airlock/found_airlock = locate() in next_turf + if (is_valid_airlock(found_airlock)) + airlocks.Add(found_airlock) + else + limit = 0 + + return airlocks + + +///Whether the passed airlock can be linked with +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/is_valid_airlock(obj/machinery/door/airlock/airlock) + if(!airlock) + return FALSE + if(airlock.cycle_pump) + return FALSE // Already linked + if(can_unwrench && !istype(airlock, valid_airlock_typepath)) + return FALSE // Invalid airlock type and the pump is not mapspawn + return TRUE + + +///Find airlocks and link up with them +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/unlink_airlock(airlock) + UnregisterSignal(airlock, COMSIG_PARENT_QDELETING) + + if(airlock in internal_airlocks) + internal_airlocks.Remove(airlock) + if(airlock in external_airlocks) + external_airlocks.Remove(airlock) + + if(!internal_airlocks.len || !external_airlocks.len) + break_all_links() + + +///Break the cycling setup +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/break_all_links() + for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks)) + UnregisterSignal(airlock, COMSIG_PARENT_QDELETING) + + external_airlocks = list() + internal_airlocks = list() + cycle_timeout = initial(cycle_timeout) + cycling_set_up = FALSE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/relaymove(mob/living/user, direction) + if(initialize_directions & direction) + return ..() + if((NORTH|EAST) & direction) + user.ventcrawl_layer = clamp(user.ventcrawl_layer + 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1) + if((SOUTH|WEST) & direction) + user.ventcrawl_layer = clamp(user.ventcrawl_layer - 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1) + to_chat(user, "You align yourself with the [user.ventcrawl_layer == 2 ? 1 : 2]\th output.") + +/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only + open_airlock_on_cycle = FALSE + +/obj/machinery/atmospherics/components/unary/airlock_pump/silent + is_cycling_audible = FALSE + +/obj/machinery/atmospherics/components/unary/airlock_pump/lavaland + external_pressure_target = MAXIMUM_LAVALAND_EQUIPMENT_EFFECT_PRESSURE + diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 79475998a7809..cbb73738ce52c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -1,8 +1,11 @@ #define CRYOMOBS 'icons/obj/cryo_mobs.dmi' #define CRYO_MULTIPLY_FACTOR 1.5 // Multiply factor is used with efficiency to multiply Tx quantity and how much extra is transfered to occupant magically. #define CRYO_TX_QTY 0.4 // Tx quantity is how much volume should be removed from the cell's beaker - multiplied by delta_time +#define CRYO_MIN_GAS_MOLES 5 +#define MAX_TEMPERATURE 4000 -/obj/machinery/atmospherics/components/unary/cryo_cell + +/obj/machinery/cryo_cell name = "cryo cell" icon = 'icons/obj/cryogenics.dmi' icon_state = "pod-off" @@ -12,9 +15,7 @@ layer = ABOVE_WINDOW_LAYER state_open = FALSE circuit = /obj/item/circuitboard/machine/cryo_tube - - - pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY + flags_1 = PREVENT_CLICK_UNDER_1 occupant_typecache = list(/mob/living/carbon, /mob/living/simple_animal) var/autoeject = TRUE @@ -23,6 +24,7 @@ var/efficiency = 1 var/sleep_factor = 0.00125 var/unconscious_factor = 0.001 + /// Our approximation of a mob's heat capacity. var/heat_capacity = 20000 var/conduction_coefficient = 0.3 @@ -40,6 +42,10 @@ fair_market_price = 10 dept_req_for_free = ACCOUNT_MED_BITFLAG + /// Reference to the datum connector we're using to interface with the pipe network + var/datum/gas_machine_connector/internal_connector + /// Check if the machine has been turned on + var/on = FALSE /datum/armor/unary_cryo_cell @@ -48,24 +54,23 @@ fire = 30 acid = 30 -/obj/machinery/atmospherics/components/unary/cryo_cell/Initialize(mapload) +/obj/machinery/cryo_cell/Initialize(mapload) . = ..() - initialize_directions = dir - radio = new(src) radio.keyslot = new radio_key radio.subspace_transmission = TRUE radio.canhear_range = 0 radio.recalculateChannels() + internal_connector = new(loc, src, dir, CELL_VOLUME * 0.5) -/obj/machinery/atmospherics/components/unary/cryo_cell/set_occupant(atom/movable/new_occupant) +/obj/machinery/cryo_cell/set_occupant(atom/movable/new_occupant) . = ..() update_icon() -/obj/machinery/atmospherics/components/unary/cryo_cell/on_construction() +/obj/machinery/cryo_cell/on_construction() ..(dir, dir) -/obj/machinery/atmospherics/components/unary/cryo_cell/RefreshParts() +/obj/machinery/cryo_cell/RefreshParts() var/C for(var/obj/item/stock_parts/matter_bin/M in component_parts) C += M.rating @@ -76,17 +81,18 @@ heat_capacity = initial(heat_capacity) / C conduction_coefficient = initial(conduction_coefficient) * C -/obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) //this is leaving out everything but efficiency since they follow the same idea of "better beaker, better results" +/obj/machinery/cryo_cell/examine(mob/user) //this is leaving out everything but efficiency since they follow the same idea of "better beaker, better results" . = ..() if(in_range(user, src) || isobserver(user)) . += span_notice("The status display reads: Efficiency at [efficiency*100]%.") -/obj/machinery/atmospherics/components/unary/cryo_cell/Destroy() +/obj/machinery/cryo_cell/Destroy() QDEL_NULL(radio) QDEL_NULL(beaker) + QDEL_NULL(internal_connector) return ..() -/obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target) +/obj/machinery/cryo_cell/contents_explosion(severity, target) ..() if(beaker) switch(severity) @@ -97,18 +103,18 @@ if(EXPLODE_LIGHT) SSexplosions.low_mov_atom += beaker -/obj/machinery/atmospherics/components/unary/cryo_cell/handle_atom_del(atom/A) +/obj/machinery/cryo_cell/handle_atom_del(atom/A) ..() if(A == beaker) beaker = null updateUsrDialog() -/obj/machinery/atmospherics/components/unary/cryo_cell/on_deconstruction() +/obj/machinery/cryo_cell/on_deconstruction() if(beaker) beaker.forceMove(drop_location()) beaker = null -/obj/machinery/atmospherics/components/unary/cryo_cell/update_icon() +/obj/machinery/cryo_cell/update_icon() cut_overlays() @@ -160,7 +166,7 @@ icon_state = "pod-off" add_overlay("cover-off") -/obj/machinery/atmospherics/components/unary/cryo_cell/proc/run_anim(anim_up, image/occupant_overlay) +/obj/machinery/cryo_cell/proc/run_anim(anim_up, image/occupant_overlay) if(!on || !occupant || !is_operational) running_anim = FALSE return @@ -175,10 +181,18 @@ add_overlay("cover-on") addtimer(CALLBACK(src, PROC_REF(run_anim), anim_up, occupant_overlay), 7, TIMER_UNIQUE) -/obj/machinery/atmospherics/components/unary/cryo_cell/nap_violation(mob/violator) +/obj/machinery/cryo_cell/nap_violation(mob/violator) open_machine() -/obj/machinery/atmospherics/components/unary/cryo_cell/process(delta_time) +/obj/machinery/cryo_cell/proc/set_on(active) + if(on == active) + return + SEND_SIGNAL(src, COMSIG_CRYO_SET_ON, active) + . = on + on = active + update_appearance() + +/obj/machinery/cryo_cell/process(delta_time) if(!on) return @@ -220,7 +234,7 @@ radio.talk_into(src, msg, radio_channel) return - var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air1 = internal_connector.gas_connector.airs[1] if(air1.total_moles()) if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic. @@ -230,17 +244,17 @@ beaker.reagents.trans_to(occupant, (CRYO_TX_QTY / (efficiency * CRYO_MULTIPLY_FACTOR)) * delta_time, efficiency * CRYO_MULTIPLY_FACTOR, method = VAPOR) // Transfer reagents. use_power(1000 * efficiency) - return 1 + return TRUE -/obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos() +/obj/machinery/cryo_cell/process_atmos() ..() if(!on) return - var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air1 = internal_connector.gas_connector.airs[1] - if(!nodes[1] || !airs[1] || air1.get_moles(GAS_O2) < 5) // Turn off if the machine won't work due to not having enough moles to operate. + if(!internal_connector.gas_connector.nodes[1] || !internal_connector.gas_connector.airs[1] || !air1.gases.len || air1.total_moles() < CRYO_MIN_GAS_MOLES) // Turn off if the machine won't work due to not having enough moles to operate. on = FALSE update_icon() var/msg = "Aborting. Not enough gas present to operate." @@ -259,21 +273,21 @@ if(abs(temperature_delta) > 1) var/air_heat_capacity = air1.heat_capacity() - var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * temperature_delta * (air_heat_capacity * heat_capacity / (air_heat_capacity + heat_capacity)) + var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * CALCULATE_CONDUCTION_ENERGY(temperature_delta, heat_capacity, air_heat_capacity) - air1.set_temperature(max(air1.return_temperature() - heat / air_heat_capacity, TCMB)) mob_occupant.adjust_bodytemperature(heat / heat_capacity, TCMB) + air1.temperature = clamp(air1.temperature - heat / air_heat_capacity, TCMB, MAX_TEMPERATURE) - air1.set_moles(GAS_O2, max(0,air1.get_moles(GAS_O2) - 0.5 / efficiency)) // Magically consume gas? Why not, we run on cryo magic. + SET_MOLES(/datum/gas/oxygen, air1, max(0,GET_MOLES(/datum/gas/oxygen, air1) - 0.5 / efficiency)) // Magically consume gas? Why not, we run on cryo magic. - update_parents() + internal_connector.gas_connector.update_parents() -/obj/machinery/atmospherics/components/unary/cryo_cell/relaymove(mob/living/user, direction) +/obj/machinery/cryo_cell/relaymove(mob/living/user, direction) if(message_cooldown <= world.time) message_cooldown = world.time + 50 to_chat(user, span_warning("[src]'s door won't budge!")) -/obj/machinery/atmospherics/components/unary/cryo_cell/open_machine(drop = FALSE) +/obj/machinery/cryo_cell/open_machine(drop = FALSE) if(!state_open && !panel_open) on = FALSE for(var/mob/M in contents) //only drop mobs @@ -282,13 +296,13 @@ flick("pod-open-anim", src) ..() -/obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/user) +/obj/machinery/cryo_cell/close_machine(mob/living/carbon/user) if((isnull(user) || istype(user)) && state_open && !panel_open) flick("pod-close-anim", src) ..(user) return occupant -/obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user) +/obj/machinery/cryo_cell/container_resist(mob/living/user) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message(span_notice("You see [user] kicking against the glass of [src]!"), \ @@ -301,7 +315,7 @@ span_notice("You successfully break out of [src]!")) open_machine() -/obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) +/obj/machinery/cryo_cell/examine(mob/user) . = ..() if(occupant) if(on) @@ -311,7 +325,7 @@ else . += "[src] seems empty." -/obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) +/obj/machinery/cryo_cell/MouseDrop_T(mob/target, mob/user) if(user.incapacitated() || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) return if(isliving(target)) @@ -323,7 +337,7 @@ if (do_after(user, 25, target=target)) close_machine(target) -/obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params) +/obj/machinery/cryo_cell/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/reagent_containers/cup)) . = 1 //no afterattack if(beaker) @@ -339,8 +353,7 @@ return if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I)) \ || default_change_direction_wrench(user, I) \ - || default_pry_open(I) \ - || default_deconstruction_crowbar(I)) + || default_pry_open(I)) update_icon() return else if(I.tool_behaviour == TOOL_SCREWDRIVER) @@ -348,18 +361,59 @@ return return ..() +/obj/machinery/cryo_cell/crowbar_act(mob/living/user, obj/item/tool) + if(on || state_open) + return FALSE + if(!panel_open) + balloon_alert(user, "open panel!") + return TRUE + + var/unsafe_wrenching = FALSE + var/filled_pipe = FALSE + var/datum/gas_mixture/environment_air = loc.return_air() + var/datum/gas_mixture/inside_air = internal_connector.gas_connector.airs[1] + var/obj/machinery/atmospherics/node = internal_connector.gas_connector.nodes[1] + var/internal_pressure = 0 + + if(istype(node, /obj/machinery/atmospherics/components/unary/portables_connector)) + var/obj/machinery/atmospherics/components/unary/portables_connector/portable_devices_connector = node + internal_pressure = !portable_devices_connector.connected_device ? 1 : 0 + + if(inside_air.total_moles() > 0) + filled_pipe = TRUE + if(!node || internal_pressure > 0) + internal_pressure = inside_air.return_pressure() - environment_air.return_pressure() + + if(!filled_pipe) + default_deconstruction_crowbar(tool) + return TRUE -/obj/machinery/atmospherics/components/unary/cryo_cell/ui_state(mob/user) + to_chat(user, "You begin to unfasten \the [src]...") + + if(internal_pressure > 2 * ONE_ATMOSPHERE) + to_chat(user, span_warning("As you begin deconstructing the [src] a gush of air blows in your face... maybe you should reconsider?")) + unsafe_wrenching = TRUE + + if(!do_after(user, 2 SECONDS, src)) + return + if(unsafe_wrenching) + internal_connector.gas_connector.unsafe_pressure_release(user, internal_pressure) + + tool.play_tool_sound(src, 50) + deconstruct(TRUE) + return TRUE + +/obj/machinery/cryo_cell/ui_state(mob/user) return GLOB.notcontained_state -/obj/machinery/atmospherics/components/unary/cryo_cell/ui_interact(mob/user, datum/tgui/ui) +/obj/machinery/cryo_cell/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Cryo") ui.open() ui.set_autoupdate(TRUE) -/obj/machinery/atmospherics/components/unary/cryo_cell/ui_data() +/obj/machinery/cryo_cell/ui_data() var/list/data = list() data["isOperating"] = on data["hasOccupant"] = occupant ? TRUE : FALSE @@ -398,7 +452,7 @@ else data["occupant"]["temperaturestatus"] = "bad" - var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air1 = internal_connector.gas_connector.airs[1] data["cellTemperature"] = round(air1.return_temperature(), 1) data["isBeakerLoaded"] = beaker ? TRUE : FALSE @@ -409,7 +463,7 @@ data["beakerContents"] = beakerContents return data -/obj/machinery/atmospherics/components/unary/cryo_cell/ui_act(action, params) +/obj/machinery/cryo_cell/ui_act(action, params) if(..()) return switch(action) @@ -437,13 +491,13 @@ beaker = null . = TRUE -/obj/machinery/atmospherics/components/unary/cryo_cell/CtrlClick(mob/user) +/obj/machinery/cryo_cell/CtrlClick(mob/user) if(user.canUseTopic(src, !issilicon(user)) && !state_open && occupant != user) - on = !on + set_on(!on) update_icon() return ..() -/obj/machinery/atmospherics/components/unary/cryo_cell/AltClick(mob/user) +/obj/machinery/cryo_cell/AltClick(mob/user) if(user.canUseTopic(src, !issilicon(user)) && occupant != user) if(state_open) close_machine() @@ -451,41 +505,18 @@ open_machine() return -/obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user) - return // we don't see the pipe network while inside cryo. - -/obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user) +/obj/machinery/cryo_cell/get_remote_view_fullscreens(mob/user) user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) -/obj/machinery/atmospherics/components/unary/cryo_cell/can_crawl_through() - return FALSE // can't ventcrawl in or out of cryo. - -/obj/machinery/atmospherics/components/unary/cryo_cell/can_see_pipes() - return 0 // you can't see the pipe network when inside a cryo cell. - -/obj/machinery/atmospherics/components/unary/cryo_cell/return_temperature() - var/datum/gas_mixture/G = airs[1] +/obj/machinery/cryo_cell/return_temperature() + var/datum/gas_mixture/G = internal_connector.gas_connector.airs[1] if(G.total_moles() > 10) return G.return_temperature() return ..() -/obj/machinery/atmospherics/components/unary/cryo_cell/default_change_direction_wrench(mob/user, obj/item/wrench/W) - . = ..() - if(.) - SetInitDirections() - var/obj/machinery/atmospherics/node = nodes[1] - if(node) - node.disconnect(src) - nodes[1] = null - nullifyPipenet(parents[1]) - atmosinit() - node = nodes[1] - if(node) - node.atmosinit() - node.addMember(src) - SSair.add_to_rebuild_queue(src) - #undef CRYOMOBS #undef CRYO_MULTIPLY_FACTOR #undef CRYO_TX_QTY +#undef CRYO_MIN_GAS_MOLES +#undef MAX_TEMPERATURE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm index 0021cebdc802a..5068730358e5d 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm @@ -32,7 +32,7 @@ icon_state = "he0" PIPING_LAYER_SHIFT(src, piping_layer) -/obj/machinery/atmospherics/components/unary/heat_exchanger/atmosinit() +/obj/machinery/atmospherics/components/unary/heat_exchanger/atmos_init() var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = partner_ref?.resolve() if(!partner) partner_ref = null @@ -72,8 +72,8 @@ var/combined_energy = partner_air_contents.return_temperature()*other_air_heat_capacity + air_heat_capacity*air_contents.return_temperature() var/new_temperature = combined_energy/combined_heat_capacity - air_contents.set_temperature(new_temperature) - partner_air_contents.set_temperature(new_temperature) + air_contents.temperature = (new_temperature) + partner_air_contents.temperature = (new_temperature) if(abs(old_temperature-air_contents.return_temperature()) > 1) update_parents() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/machine_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/machine_connector.dm new file mode 100644 index 0000000000000..0c92be098a402 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/unary_devices/machine_connector.dm @@ -0,0 +1,142 @@ +///To be used when there is the need of an atmos connection without repathing everything (eg: cryo.dm) +/datum/gas_machine_connector + + var/obj/machinery/connected_machine + var/obj/machinery/atmospherics/components/unary/gas_connector + +/datum/gas_machine_connector/New(location, obj/machinery/connecting_machine = null, direction = SOUTH, gas_volume) + connected_machine = connecting_machine + if(!connected_machine) + qdel(src) + return + + gas_connector = new(location) + gas_connector.dir = connected_machine.dir + gas_connector.airs[1].volume = gas_volume + + SSair.start_processing_machine(connected_machine) + register_with_machine() + gas_connector.set_init_directions() + gas_connector.atmos_init() + SSair.add_to_rebuild_queue(gas_connector) + RegisterSignal(gas_connector, COMSIG_PARENT_QDELETING, PROC_REF(connector_deleted)) + +/datum/gas_machine_connector/Destroy() + connected_machine = null + QDEL_NULL(gas_connector) + return ..() + +/datum/gas_machine_connector/proc/connector_deleted() + SIGNAL_HANDLER + gas_connector = null + if(!QDELETED(connected_machine)) + qdel(connected_machine) + +/** + * Register various signals that are required for the proper work of the connector + */ +/datum/gas_machine_connector/proc/register_with_machine() + RegisterSignal(connected_machine, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_connected_machine)) + RegisterSignal(connected_machine, COMSIG_MOVABLE_MOVED, PROC_REF(moved_connected_machine)) + RegisterSignal(connected_machine, COMSIG_MACHINERY_DEFAULT_ROTATE_WRENCH, PROC_REF(wrenched_connected_machine)) + RegisterSignal(connected_machine, COMSIG_OBJ_DECONSTRUCT, PROC_REF(deconstruct_connected_machine)) + RegisterSignal(connected_machine, COMSIG_PARENT_QDELETING, PROC_REF(destroy_connected_machine)) + +/** + * Unregister the signals previously registered + */ +/datum/gas_machine_connector/proc/unregister_from_machine() + UnregisterSignal(connected_machine, list( + COMSIG_MOVABLE_MOVED, + COMSIG_MOVABLE_PRE_MOVE, + COMSIG_MACHINERY_DEFAULT_ROTATE_WRENCH, + COMSIG_OBJ_DECONSTRUCT, + COMSIG_PARENT_QDELETING + )) + +/** + * Called when the machine has been moved, reconnect to the pipe network + */ +/datum/gas_machine_connector/proc/moved_connected_machine() + SIGNAL_HANDLER + gas_connector.forceMove(get_turf(connected_machine)) + reconnect_connector() + +/** + * Called before the machine moves, disconnect from the pipe network + */ +/datum/gas_machine_connector/proc/pre_move_connected_machine() + SIGNAL_HANDLER + disconnect_connector() + +/** + * Called when the machine has been rotated, resets the connection to the pipe network with the new direction + */ +/datum/gas_machine_connector/proc/wrenched_connected_machine() + SIGNAL_HANDLER + disconnect_connector() + reconnect_connector() + +/** + * Called when the machine has been deconstructed + */ +/datum/gas_machine_connector/proc/deconstruct_connected_machine() + SIGNAL_HANDLER + + relocate_airs() + +/** + * Called when the machine has been destroyed + */ +/datum/gas_machine_connector/proc/destroy_connected_machine() + SIGNAL_HANDLER + + disconnect_connector() + SSair.stop_processing_machine(connected_machine) + unregister_from_machine() + qdel(src) + +/** + * Handles the disconnection from the pipe network + */ +/datum/gas_machine_connector/proc/disconnect_connector() + var/obj/machinery/atmospherics/node = gas_connector.nodes[1] + if(node) + if(gas_connector in node.nodes) //Only if it's actually connected. On-pipe version would is one-sided. + node.disconnect(gas_connector) + gas_connector.nodes[1] = null + if(gas_connector.parents[1]) + gas_connector.nullify_pipenet(gas_connector.parents[1]) + +/** + * Handles the reconnection to the pipe network + */ +/datum/gas_machine_connector/proc/reconnect_connector() + gas_connector.dir = connected_machine.dir + gas_connector.set_init_directions() + var/obj/machinery/atmospherics/node = gas_connector.nodes[1] + gas_connector.atmos_init() + node = gas_connector.nodes[1] + if(node) + node.atmos_init() + node.add_member(gas_connector) + gas_connector.update_parents() + SSair.add_to_rebuild_queue(gas_connector) + +/** + * Handles air relocation to the pipe network/environment + */ +/datum/gas_machine_connector/proc/relocate_airs(mob/user) + var/turf/local_turf = get_turf(connected_machine) + var/datum/gas_mixture/inside_air = gas_connector.airs[1] + if(inside_air.total_moles() > 0) + if(!gas_connector.nodes[1]) + local_turf.assume_air(inside_air) + return + var/datum/gas_mixture/parents_air = gas_connector.parents[1].air + if(istype(gas_connector.nodes[1], /obj/machinery/atmospherics/components/unary/portables_connector)) + var/obj/machinery/atmospherics/components/unary/portables_connector/portable_devices_connector = gas_connector.nodes[1] + if(!portable_devices_connector.connected_device) + local_turf.assume_air(inside_air) + return + parents_air.merge(inside_air) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 4d3814b39a680..59d8e2d883746 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -8,49 +8,65 @@ can_unwrench = TRUE shift_underlay_only = FALSE hide = TRUE - + layer = GAS_SCRUBBER_LAYER + pipe_state = "injector" resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF //really helpful in building gas chambers for xenomorphs - var/injecting = 0 - + ///Rate of operation of the device var/volume_rate = 50 - var/frequency = 0 - var/id = null - var/datum/radio_frequency/radio_connection - interacts_with_air = TRUE - layer = GAS_SCRUBBER_LAYER +/obj/machinery/atmospherics/components/unary/outlet_injector/Initialize(mapload) + if(isnull(id_tag)) + id_tag = assign_random_name() + . = ..() - pipe_state = "injector" +REGISTER_BUFFER_HANDLER(/obj/machinery/atmospherics/components/unary/outlet_injector) +DEFINE_BUFFER_HANDLER(/obj/machinery/atmospherics/components/unary/outlet_injector) + if(istype(buffer, /obj/machinery/air_sensor)) + to_chat(user, "-% Successfully linked [buffer] with [src] %-") + var/obj/machinery/air_sensor/sensor = buffer + sensor.inlet_id = id_tag + balloon_alert(user, "input linked to sensor") + else if (TRY_STORE_IN_BUFFER(buffer_parent, src)) + to_chat(user, "-% Successfully stored [REF(src)] [name] in buffer %-") + else + return NONE + return COMPONENT_BUFFER_RECEIVED +/obj/machinery/atmospherics/components/unary/outlet_injector/examine(mob/user) + . = ..() + . += span_notice("You can link it with an air sensor using a multitool.") /obj/machinery/atmospherics/components/unary/outlet_injector/CtrlClick(mob/user) - if(can_interact(user)) + if(is_operational) on = !on + balloon_alert(user, "turned [on ? "on" : "off"]") + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) update_icon() ui_update() - return ..() + return TRUE /obj/machinery/atmospherics/components/unary/outlet_injector/AltClick(mob/user) - if(can_interact(user)) - volume_rate = MAX_TRANSFER_RATE - balloon_alert(user, "You set the volume rate to [volume_rate] L/s.") - update_icon() - ui_update() - return + if(volume_rate == MAX_TRANSFER_RATE) + return TRUE -/obj/machinery/atmospherics/components/unary/outlet_injector/Destroy() - SSradio.remove_object(src,frequency) - return ..() + volume_rate = MAX_TRANSFER_RATE + investigate_log("was set to [volume_rate] L/s by [key_name(user)]", INVESTIGATE_ATMOS) + balloon_alert(user, "You set the volume rate to [volume_rate] L/s.") + update_icon() + ui_update() + return TRUE /obj/machinery/atmospherics/components/unary/outlet_injector/update_icon_nopipes() cut_overlays() if(showpipe) // everything is already shifted so don't shift the cap - add_overlay(getpipeimage(icon, "inje_cap", initialize_directions)) + add_overlay(get_pipe_image(icon, "inje_cap", initialize_directions, pipe_color)) + else + PIPING_LAYER_SHIFT(src, PIPING_LAYER_DEFAULT) if(!nodes[1] || !on || !is_operational) icon_state = "inje_off" @@ -59,89 +75,26 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/process_atmos() ..() - - injecting = 0 - - if(!on || !is_operational || !isopenturf(loc)) + if(!on || !is_operational) return - var/datum/gas_mixture/air_contents = airs[1] - - if(air_contents != null) - if(air_contents.return_temperature() > 0) - loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume()) - air_update_turf() - - update_parents() - -/obj/machinery/atmospherics/components/unary/outlet_injector/proc/inject() - - if(on || injecting || !is_operational) + var/turf/location = get_turf(loc) + if(isclosedturf(location)) return var/datum/gas_mixture/air_contents = airs[1] - injecting = 1 - - if(air_contents.return_temperature() > 0) - loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume()) - update_parents() - - flick("inje_inject", src) + if(air_contents.temperature > 0) + var/transfer_moles = (air_contents.return_pressure() * volume_rate) / (air_contents.temperature * R_IDEAL_GAS_EQUATION) -/obj/machinery/atmospherics/components/unary/outlet_injector/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency) + if(!transfer_moles) + return -/obj/machinery/atmospherics/components/unary/outlet_injector/proc/broadcast_status() - - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id, - "device" = "AO", - "power" = on, - "volume_rate" = volume_rate, - //"timestamp" = world.time, - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal) - -/obj/machinery/atmospherics/components/unary/outlet_injector/atmosinit() - set_frequency(frequency) - broadcast_status() - ..() - -/obj/machinery/atmospherics/components/unary/outlet_injector/receive_signal(datum/signal/signal) - - if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) - return - - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("inject" in signal.data) - spawn inject() - return - - if("set_volume_rate" in signal.data) - var/number = text2num(signal.data["set_volume_rate"]) - var/datum/gas_mixture/air_contents = airs[1] - volume_rate = clamp(number, 0, air_contents.return_volume()) - - addtimer(CALLBACK(src, PROC_REF(broadcast_status)), 2) - - if(!("status" in signal.data)) //do not update_icon - update_icon() - ui_update() + var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) + location.assume_air(removed) + update_parents() /obj/machinery/atmospherics/components/unary/outlet_injector/ui_state(mob/user) return GLOB.default_state @@ -160,7 +113,8 @@ return data /obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, params) - if(..()) + . = ..() + if(.) return switch(action) @@ -179,9 +133,7 @@ if(.) volume_rate = clamp(rate, 0, MAX_TRANSFER_RATE) investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) - if(.) - update_icon() - broadcast_status() + update_icon() /obj/machinery/atmospherics/components/unary/outlet_injector/can_unwrench(mob/user) . = ..() @@ -209,75 +161,3 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4 piping_layer = 4 icon_state = "inje_map-4" - -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos - frequency = FREQ_ATMOS_STORAGE - on = TRUE - volume_rate = MAX_TRANSFER_RATE - -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste - name = "atmos waste outlet injector" - id = ATMOS_GAS_MONITOR_WASTE_ATMOS -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste - name = "engine outlet injector" - id = ATMOS_GAS_MONITOR_WASTE_ENGINE -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input - name = "plasma tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_PLASMA -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input - name = "oxygen tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_O2 -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input - name = "nitrogen tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_N2 -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input - name = "mix tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_MIX -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input - name = "nitrous oxide tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_N2O -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input - name = "air mix tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_AIR -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input - name = "carbon dioxide tank input injector" - id = ATMOS_GAS_MONITOR_INPUT_CO2 -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input - name = "incinerator chamber input injector" - id = ATMOS_GAS_MONITOR_INPUT_INCINERATOR -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input - name = "toxins mixing input injector" - id = ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_waste_input - name = "toxins waste input injector" - id = ATMOS_GAS_MONITOR_INPUT_TOXINS_WASTE -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/sm_waste_input - name = "supermatter waste input injector" - id = ATMOS_GAS_MONITOR_INPUT_SM_WASTE - - -#define LAYER_HELPER(FULLPATH)\ -##FULLPATH/layer2 {\ - piping_layer = 2;\ - icon_state = "inje_map-2";\ -}\ -##FULLPATH/layer4 {\ - piping_layer = 4;\ - icon_state = "inje_map-4";\ -} - -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_waste_input) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/sm_waste_input) - -#undef LAYER_HELPER diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm index 1fa5221e38eac..3853d3f46e2c3 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm @@ -15,30 +15,20 @@ /obj/machinery/atmospherics/components/unary/passive_vent/update_icon_nopipes() cut_overlays() if(showpipe) - var/image/cap = getpipeimage(icon, "vent_cap", initialize_directions) + var/image/cap = get_pipe_image(icon, "vent_cap", initialize_directions, pipe_color) add_overlay(cap) icon_state = "passive_vent" /obj/machinery/atmospherics/components/unary/passive_vent/process_atmos() - ..() - if(isclosedturf(loc)) + var/turf/location = get_turf(loc) + if(isclosedturf(location)) return - var/active = FALSE - var/datum/gas_mixture/external = loc.return_air() + var/datum/gas_mixture/external = location.return_air() var/datum/gas_mixture/internal = airs[1] - var/external_pressure = external.return_pressure() - var/internal_pressure = internal.return_pressure() - var/pressure_delta = abs(external_pressure - internal_pressure) - if(pressure_delta > 0.5) - equalize_all_gases_in_list(list(internal,external)) - active = TRUE - - active = internal.temperature_share(external, OPEN_HEAT_TRANSFER_COEFFICIENT) || active - - if(active) - air_update_turf() + if(internal.equalize(external)) + air_update_turf(FALSE, FALSE) update_parents() /obj/machinery/atmospherics/components/unary/passive_vent/can_crawl_through() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm index 467a5909e1dd3..78ef8f17a50a2 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm @@ -13,15 +13,22 @@ pipe_flags = PIPING_ONE_PER_TURF pipe_state = "connector" + custom_reconcilation = TRUE + ///Reference to the connected device var/obj/machinery/portable_atmospherics/connected_device - var/obj/machinery/atmospherics/components/unary/portables_connector/connect_to - /obj/machinery/atmospherics/components/unary/portables_connector/New() - ..() + . = ..() var/datum/gas_mixture/air_contents = airs[1] - air_contents.set_volume(0) + air_contents.volume = 0 + if(connected_device) + var/datum/pipenet/parent = parents[1] + if(parent) + airs[1] = connected_device.air_contents + parent.reconcile_air() + else + CRASH("Portable canister without parent pipenet at [COORD(src)]") /obj/machinery/atmospherics/components/unary/portables_connector/Destroy() if(connected_device) @@ -31,7 +38,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/update_icon_nopipes() icon_state = "connector" if(showpipe) - var/image/cap = getpipeimage(icon, "connector_cap", initialize_directions) + var/image/cap = get_pipe_image(icon, "connector_cap", initialize_directions, pipe_color) add_overlay(cap) /obj/machinery/atmospherics/components/unary/portables_connector/process_atmos() @@ -39,26 +46,18 @@ return update_parents() +/obj/machinery/atmospherics/components/unary/portables_connector/return_airs_for_reconcilation(datum/pipenet/requester) + . = ..() + if(!connected_device) + return + . += connected_device.return_air() + /obj/machinery/atmospherics/components/unary/portables_connector/can_unwrench(mob/user) . = ..() if(. && connected_device) to_chat(user, span_warning("You cannot unwrench [src], detach [connected_device] first!")) return FALSE -/obj/machinery/atmospherics/components/unary/portables_connector/portableConnectorReturnAir() - return connected_device.portableConnectorReturnAir() - -/obj/machinery/atmospherics/components/unary/portables_connector/build_network() - . = ..() - if(connect_to) - var/obj/machinery/portable_atmospherics/PA = connect_to - if(PA) - PA.connect(src) - -/obj/proc/portableConnectorReturnAir() - return - - /obj/machinery/atmospherics/components/unary/portables_connector/layer2 piping_layer = 2 icon_state = "connector_map-2" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm deleted file mode 100644 index 53cf63376ccdc..0000000000000 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ /dev/null @@ -1,53 +0,0 @@ -#define AIR_CONTENTS ((25*ONE_ATMOSPHERE)*(air_contents.return_volume())/(R_IDEAL_GAS_EQUATION*air_contents.return_temperature())) -/obj/machinery/atmospherics/components/unary/tank - icon = 'icons/obj/atmospherics/pipes/pressure_tank.dmi' - icon_state = "generic" - - name = "pressure tank" - desc = "A large vessel containing pressurized gas." - - max_integrity = 800 - density = TRUE - layer = ABOVE_WINDOW_LAYER - pipe_flags = PIPING_ONE_PER_TURF - - var/volume = 10000 //in liters - var/gas_type = null - -/obj/machinery/atmospherics/components/unary/tank/New() - ..() - var/datum/gas_mixture/air_contents = airs[1] - air_contents.set_volume(volume) - air_contents.set_temperature(T20C) - if(gas_type) - air_contents.set_moles(gas_type, AIR_CONTENTS) - name = "[name] ([GLOB.gas_data.names[gas_type]])" - setPipingLayer(piping_layer) - - -/obj/machinery/atmospherics/components/unary/tank/air - icon_state = "grey" - name = "pressure tank (Air)" - -/obj/machinery/atmospherics/components/unary/tank/air/New() - ..() - var/datum/gas_mixture/air_contents = airs[1] - air_contents.set_moles(GAS_O2, AIR_CONTENTS * 0.2) - air_contents.set_moles(GAS_N2, AIR_CONTENTS * 0.8) - -/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide - gas_type = GAS_CO2 - -/obj/machinery/atmospherics/components/unary/tank/plasma - icon_state = "orange" - gas_type = GAS_PLASMA - -/obj/machinery/atmospherics/components/unary/tank/oxygen - icon_state = "blue" - gas_type = GAS_O2 - -/obj/machinery/atmospherics/components/unary/tank/nitrogen - icon_state = "red" - gas_type = GAS_N2 - -#undef AIR_CONTENTS diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 50fa5aab17b41..5c757fc6bd246 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -1,8 +1,12 @@ +#define THERMOMACHINE_POWER_CONVERSION 0.01 + /obj/machinery/atmospherics/components/unary/thermomachine icon = 'icons/obj/atmospherics/components/thermomachine.dmi' - icon_state = "freezer" + icon_state = "thermo_base" + + name = "thermomachine" + interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT - name = "Thermomachine" desc = "Heats or cools gas in connected pipes." density = TRUE @@ -11,22 +15,23 @@ layer = OBJ_LAYER circuit = /obj/item/circuitboard/machine/thermomachine - - + move_resist = MOVE_RESIST_DEFAULT + vent_movement = NONE pipe_flags = PIPING_ONE_PER_TURF - var/icon_state_off = "freezer" - var/icon_state_on = "freezer_1" - var/icon_state_open = "freezer-o" + greyscale_config = /datum/greyscale_config/thermomachine + greyscale_colors = COLOR_VIBRANT_LIME + + set_dir_on_move = FALSE - var/min_temperature = T20C //actual temperature will be defined by RefreshParts() and by the cooling var - var/max_temperature = T20C //actual temperature will be defined by RefreshParts() and by the cooling var + var/min_temperature = T20C //actual temperature will be defined by RefreshParts() + var/max_temperature = T20C //actual temperature will be defined by RefreshParts() var/target_temperature = T20C var/heat_capacity = 0 var/interactive = TRUE // So mapmakers can disable interaction. - var/cooling = TRUE var/base_heating = 140 var/base_cooling = 170 + var/color_index = 1 /datum/armor/unary_thermomachine @@ -37,169 +42,217 @@ /obj/machinery/atmospherics/components/unary/thermomachine/Initialize(mapload) . = ..() - initialize_directions = dir - RefreshParts() - update_appearance() - -/obj/machinery/atmospherics/components/unary/thermomachine/proc/swap_function() - cooling = !cooling - if(cooling) - icon_state_off = "freezer" - icon_state_on = "freezer_1" - icon_state_open = "freezer-o" - else - icon_state_off = "heater" - icon_state_on = "heater_1" - icon_state_open = "heater-o" - target_temperature = T20C RefreshParts() update_icon() -/obj/machinery/atmospherics/components/unary/thermomachine/on_construction() +/obj/machinery/atmospherics/components/unary/thermomachine/is_connectable() + if(!anchored) + return FALSE + . = ..() + +/obj/machinery/atmospherics/components/unary/thermomachine/on_construction(mob/user, obj_color, set_layer) var/obj/item/circuitboard/machine/thermomachine/board = circuit if(board) piping_layer = board.pipe_layer - return ..(dir, piping_layer) + set_layer = piping_layer + + ..() //Skipping the rest of on_construction() would be a bad idea so we clean up after it instead. + + if(check_pipe_on_turf()) + set_anchored(FALSE) + panel_open = TRUE + icon_state = "thermo-open" + balloon_alert(user, "the port is already in use!") /obj/machinery/atmospherics/components/unary/thermomachine/RefreshParts() var/calculated_bin_rating for(var/obj/item/stock_parts/matter_bin/bin in component_parts) calculated_bin_rating += bin.rating + . = ..() heat_capacity = 5000 * ((calculated_bin_rating - 1) ** 2) - min_temperature = T20C - max_temperature = T20C - if(cooling) - var/calculated_laser_rating - for(var/obj/item/stock_parts/micro_laser/laser in component_parts) - calculated_laser_rating += laser.rating - min_temperature = max(T0C - (base_cooling + calculated_laser_rating * 15), TCMB) //73.15K with T1 stock parts - else - var/calculated_laser_rating - for(var/obj/item/stock_parts/micro_laser/laser in component_parts) - calculated_laser_rating += laser.rating - max_temperature = T20C + (base_heating * calculated_laser_rating) //573.15K with T1 stock parts -/obj/machinery/atmospherics/components/unary/thermomachine/update_icon() - cut_overlays() + var/calculated_laser_rating = 0 + for(var/obj/item/stock_parts/micro_laser/laser in component_parts) + calculated_laser_rating += laser.rating + min_temperature = max(T0C - (base_cooling + calculated_laser_rating * 15), TCMB) //73.15K with T1 stock parts + max_temperature = T20C + (base_heating * calculated_laser_rating) //573.15K with T1 stock parts + +/obj/machinery/atmospherics/components/unary/thermomachine/update_icon_state() + var/colors_to_use = "" + switch(target_temperature) + if(BODYTEMP_HEAT_WARNING_3 to INFINITY) + colors_to_use = COLOR_RED + if(BODYTEMP_HEAT_WARNING_2 to BODYTEMP_HEAT_WARNING_3) + colors_to_use = COLOR_ORANGE + if(BODYTEMP_HEAT_WARNING_1 to BODYTEMP_HEAT_WARNING_2) + colors_to_use = COLOR_YELLOW + if(BODYTEMP_COLD_WARNING_1 to BODYTEMP_HEAT_WARNING_1) + colors_to_use = COLOR_VIBRANT_LIME + if(BODYTEMP_COLD_WARNING_2 to BODYTEMP_COLD_WARNING_1) + colors_to_use = COLOR_CYAN + if(BODYTEMP_COLD_WARNING_3 to BODYTEMP_COLD_WARNING_2) + colors_to_use = COLOR_BLUE + else + colors_to_use = COLOR_VIOLET + + if(greyscale_colors != colors_to_use) + set_greyscale(colors=colors_to_use) if(panel_open) - icon_state = icon_state_open - else if(on && is_operational) - icon_state = icon_state_on - else - icon_state = icon_state_off - - add_overlay(getpipeimage(icon, "pipe", dir, , piping_layer)) + icon_state = "thermo-open" + return ..() + if(on && is_operational) + icon_state = "thermo_1" + return ..() + icon_state = "thermo_base" + return ..() -/obj/machinery/atmospherics/components/unary/thermomachine/update_icon_nopipes() - cut_overlays() - if(showpipe) - add_overlay(getpipeimage(icon, "scrub_cap", initialize_directions)) +/obj/machinery/atmospherics/components/unary/thermomachine/update_overlays() + . = ..() + if(!initial(icon)) + return + var/mutable_appearance/thermo_overlay = new(initial(icon)) + . += get_pipe_image(thermo_overlay, "pipe", dir, pipe_color, piping_layer) /obj/machinery/atmospherics/components/unary/thermomachine/examine(mob/user) . = ..() + . += span_notice("With the panel open:") + . += span_notice("-Use a wrench to rotate [src].") + . += span_notice("-Use a multitool to change the piping color.") + . += span_notice("-AltClick to cycle between temperaure ranges.") + . += span_notice("-CtrlClick to toggle on/off.") . += span_notice("The thermostat is set to [target_temperature]K ([(T0C-target_temperature)*-1]C).") + if(in_range(user, src) || isobserver(user)) - . += span_notice("The status display reads: Efficiency [(heat_capacity/5000)*100]%.") + . += span_notice("Heat capacity at [heat_capacity] Joules per Kelvin.") . += span_notice("Temperature range [min_temperature]K - [max_temperature]K ([(T0C-min_temperature)*-1]C - [(T0C-max_temperature)*-1]C).") /obj/machinery/atmospherics/components/unary/thermomachine/AltClick(mob/living/user) if(!can_interact(user)) - return - if(cooling) + return FALSE + if(panel_open) + balloon_alert(user, "close panel!") + return TRUE + + if(target_temperature == T20C) target_temperature = min_temperature - investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) - else + else if(target_temperature == min_temperature) target_temperature = max_temperature - investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) - balloon_alert(user, "You set the target temperature to [target_temperature] K.") + else + target_temperature = T20C + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + balloon_alert(user, "temperature reset to [target_temperature] K") + update_icon() + return TRUE + +/// Performs heat calculation for the freezer. +/// We just equalize the gasmix with an object at temp = var/target_temperature and heat cap = var/heat_capacity /obj/machinery/atmospherics/components/unary/thermomachine/process_atmos() - ..() - if(!is_operational || !on || !nodes[1]) //if it has no power or its switched off, dont process atmos + if(!on) return - var/datum/gas_mixture/air_contents = airs[1] - var/air_heat_capacity = air_contents.heat_capacity() - var/combined_heat_capacity = heat_capacity + air_heat_capacity - var/old_temperature = air_contents.return_temperature() + var/turf/local_turf = get_turf(src) - if(combined_heat_capacity > 0) - var/combined_energy = heat_capacity * target_temperature + air_heat_capacity * air_contents.return_temperature() - air_contents.set_temperature(combined_energy/combined_heat_capacity) + if(!is_operational || !local_turf) + on = FALSE + update_icon() + return - var/temperature_delta= abs(old_temperature - air_contents.return_temperature()) - if(temperature_delta > 1) - active_power_usage = (heat_capacity * temperature_delta) / 10 + idle_power_usage - update_parents() - else - active_power_usage = idle_power_usage - return 1 + // The gas we want to cool/heat + var/datum/gas_mixture/port = airs[1] -/obj/machinery/atmospherics/components/unary/thermomachine/attackby(obj/item/I, mob/user, params) - if(!on) - if(default_deconstruction_screwdriver(user, icon_state_open, icon_state_off, I)) - return - if(default_change_direction_wrench(user, I)) - return - if(default_deconstruction_crowbar(I)) + if(!port.total_moles()) // Nothing to cool? go home lad return - return ..() -/obj/machinery/atmospherics/components/unary/thermomachine/default_change_direction_wrench(mob/user, obj/item/I) - if(!..()) - return FALSE - SetInitDirections() - var/obj/machinery/atmospherics/node = nodes[1] - if(node) - node.disconnect(src) - nodes[1] = null - //Sometimes this gets called more than once per atmos tick; i.e. before the incoming build_network call by SSAIR_REBUILD_PIPENETS, so we check this here. - if(parents[1]) - nullifyPipenet(parents[1]) - - atmosinit() - node = nodes[1] - if(node) - node.atmosinit() - node.addMember(src) - SSair.add_to_rebuild_queue(src) + var/port_capacity = port.heat_capacity() + + // The difference between target and what we need to heat/cool. Positive if heating, negative if cooling. + var/temperature_target_delta = target_temperature - port.temperature + + // We perfectly can do W1+W2 / C1+C2 here but this lets us count the power easily. + var/heat_amount = CALCULATE_CONDUCTION_ENERGY(temperature_target_delta, port_capacity, heat_capacity) + + port.temperature = max(((port.temperature * port_capacity) + heat_amount) / port_capacity, TCMB) + + heat_amount = min(abs(heat_amount), 1e8) * THERMOMACHINE_POWER_CONVERSION + + // This produces a nice curve that scales decently well for really hot stuff, and is nice to not fusion. It'll do + var/power_usage = idle_power_usage + (heat_amount * 0.05) ** (1.05 - (5e7 * 0.16 / max(heat_amount, 5e7))) + + use_power = power_usage + update_parents() + +/obj/machinery/atmospherics/components/unary/thermomachine/screwdriver_act(mob/living/user, obj/item/tool) + if(on) + balloon_alert(user, "turn off!") + return TRUE + if(!anchored) + balloon_alert(user, "anchor!") + return TRUE + if(default_deconstruction_screwdriver(user, "thermo-open", "thermo-0", tool)) + update_icon() + return TRUE + +/obj/machinery/atmospherics/components/unary/thermomachine/wrench_act(mob/living/user, obj/item/tool) + return default_change_direction_wrench(user, tool) + +/obj/machinery/atmospherics/components/unary/thermomachine/crowbar_act(mob/living/user, obj/item/tool) + return crowbar_deconstruction_act(user, tool) + +/obj/machinery/atmospherics/components/unary/thermomachine/multitool_act(mob/living/user, obj/item/multitool/multitool) + . = ..() + if(!panel_open) + balloon_alert(user, "open panel!") + return TRUE + color_index = (color_index >= GLOB.pipe_paint_colors.len) ? (color_index = 1) : (color_index = 1 + color_index) + set_pipe_color(GLOB.pipe_paint_colors[GLOB.pipe_paint_colors[color_index]]) + visible_message(span_notice("[user] set [src]'s pipe color to [GLOB.pipe_color_name[pipe_color]]."), ignored_mobs = user) + to_chat(user, span_notice("You set [src]'s pipe color to [GLOB.pipe_color_name[pipe_color]].")) + if(anchored) + reconnect_nodes() + update_icon() return TRUE -/obj/machinery/atmospherics/components/unary/thermomachine/ui_status(mob/user) +/obj/machinery/atmospherics/components/unary/thermomachine/proc/check_pipe_on_turf() + for(var/obj/machinery/atmospherics/device in get_turf(src)) + if(device == src) + continue + if(device.piping_layer == piping_layer) + return TRUE + return FALSE + +/obj/machinery/atmospherics/components/unary/thermomachine/ui_status(mob/user, datum/ui_state/state) if(interactive) return ..() return UI_CLOSE - -/obj/machinery/atmospherics/components/unary/thermomachine/ui_state(mob/user) - return GLOB.default_state - /obj/machinery/atmospherics/components/unary/thermomachine/ui_interact(mob/user, datum/tgui/ui) + if(panel_open) + return ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "ThermoMachine") + ui = new(user, src, "ThermoMachine", name) + ui.set_autoupdate(TRUE) ui.open() - ui.set_autoupdate(TRUE) // Air temperature and pressure /obj/machinery/atmospherics/components/unary/thermomachine/ui_data(mob/user) var/list/data = list() data["on"] = on - data["cooling"] = cooling data["min"] = min_temperature data["max"] = max_temperature data["target"] = target_temperature data["initial"] = initial(target_temperature) - var/datum/gas_mixture/air1 = airs[1] - data["temperature"] = air1.return_temperature() - data["pressure"] = air1.return_pressure() + var/datum/gas_mixture/port = airs[1] + data["temperature"] = port.temperature + data["pressure"] = port.return_pressure() return data -/obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, params) - - if(..()) +/obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) return switch(action) @@ -208,10 +261,6 @@ use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE - if("cooling") - swap_function() - investigate_log("was changed to [cooling ? "cooling" : "heating"] by [key_name(usr)]", INVESTIGATE_ATMOS) - . = TRUE if("target") var/target = params["target"] var/adjust = text2num(params["adjust"]) @@ -228,25 +277,45 @@ if(.) target_temperature = clamp(target, min_temperature, max_temperature) investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) - if(.) - update_icon() + update_icon() -/obj/machinery/atmospherics/components/unary/thermomachine/CtrlClick(mob/living/user) +/obj/machinery/atmospherics/components/unary/thermomachine/CtrlClick(mob/user) if(!can_interact(user)) - return + return FALSE + if(!anchored) + return TRUE + if(panel_open) + balloon_alert(user, "close panel!") + return TRUE + if(!is_operational) + return TRUE + on = !on + balloon_alert(user, "turned [on ? "on" : "off"]") + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) update_icon() + return TRUE + +/obj/machinery/atmospherics/components/unary/thermomachine/update_layer() + return /obj/machinery/atmospherics/components/unary/thermomachine/freezer - icon_state = "freezer" - icon_state_off = "freezer" - icon_state_on = "freezer_1" - icon_state_open = "freezer-o" - cooling = TRUE + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer5 + piping_layer = 5 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on on = TRUE - icon_state = "freezer_1" + icon_state = "thermo_base_1" /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/Initialize(mapload) . = ..() @@ -254,42 +323,42 @@ target_temperature = min_temperature /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom - name = "cold room freezer" + name = "Cold room temperature control unit" + icon_state = "thermo_base_1" + greyscale_colors = COLOR_CYAN /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom/Initialize(mapload) . = ..() - target_temperature = T0C-20 + target_temperature = COLD_ROOM_TEMP /obj/machinery/atmospherics/components/unary/thermomachine/heater - icon_state = "heater" - icon_state_off = "heater" - icon_state_on = "heater_1" - icon_state_open = "heater-o" - cooling = FALSE + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer5 + piping_layer = 5 /obj/machinery/atmospherics/components/unary/thermomachine/heater/on on = TRUE - icon_state = "heater_1" - -#define QUICK_LAYER_HELPER(PATH)\ -##PATH/layer_1 {\ - piping_layer = 1;\ -}\ -##PATH/layer_2 {\ - piping_layer = 2;\ -}\ -##PATH/layer_4 {\ - piping_layer = 4;\ -}\ -##PATH/layer_5 {\ - piping_layer = 5;\ -} - -QUICK_LAYER_HELPER(/obj/machinery/atmospherics/components/unary/thermomachine/heater) -QUICK_LAYER_HELPER(/obj/machinery/atmospherics/components/unary/thermomachine/heater/on) -QUICK_LAYER_HELPER(/obj/machinery/atmospherics/components/unary/thermomachine/on) -QUICK_LAYER_HELPER(/obj/machinery/atmospherics/components/unary/thermomachine/freezer) -QUICK_LAYER_HELPER(/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on) -QUICK_LAYER_HELPER(/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom) - -#undef QUICK_LAYER_HELPER + icon_state = "thermo_base_1" + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer5 + piping_layer = 5 + +#undef THERMOMACHINE_POWER_CONVERSION diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm index 8f31f8b58ef73..572805f235073 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm @@ -12,13 +12,37 @@ pipe_interference_group = "atmos-[piping_layer]"\ ) -/obj/machinery/atmospherics/components/unary/SetInitDirections() +/obj/machinery/atmospherics/components/unary/set_init_directions() initialize_directions = dir -/obj/machinery/atmospherics/components/unary/on_construction() +/obj/machinery/atmospherics/components/unary/on_construction(mob/user) ..() update_appearance() /obj/machinery/atmospherics/components/unary/proc/assign_uid_vents() uid = num2text(gl_uid++) return uid + +/obj/machinery/atmospherics/components/unary/proc/change_pipe_connection(disconnect) + if(disconnect) + disconnect_pipes() + return + connect_pipes() + +/obj/machinery/atmospherics/components/unary/proc/connect_pipes() + var/obj/machinery/atmospherics/node1 = nodes[1] + atmos_init() + node1 = nodes[1] + if(node1) + node1.atmos_init() + node1.add_member(src) + SSair.add_to_rebuild_queue(src) + +/obj/machinery/atmospherics/components/unary/proc/disconnect_pipes() + var/obj/machinery/atmospherics/node1 = nodes[1] + if(node1) + if(src in node1.nodes) //Only if it's actually connected. On-pipe version would is one-sided. + node1.disconnect(src) + nodes[1] = null + if(parents[1]) + nullify_pipenet(parents[1]) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 6a0c56a9ae44e..3b2aabb9029c1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -1,10 +1,5 @@ -#define EXT_BOUND 1 -#define INT_BOUND 2 #define NO_BOUND 3 -#define SIPHONING 0 -#define RELEASING 1 - /obj/machinery/atmospherics/components/unary/vent_pump icon_state = "vent_map-3" @@ -21,43 +16,79 @@ interacts_with_air = TRUE - var/pump_direction = RELEASING - - var/pressure_checks = EXT_BOUND + ///Direction of pumping the gas (ATMOS_DIRECTION_RELEASING or ATMOS_DIRECTION_SIPHONING) + var/pump_direction = ATMOS_DIRECTION_RELEASING + ///Should we check internal pressure, external pressure, both or none? (ATMOS_EXTERNAL_BOUND, ATMOS_INTERNAL_BOUND, NO_BOUND) + var/pressure_checks = ATMOS_EXTERNAL_BOUND + ///The external pressure threshold (default 101 kPa) var/external_pressure_bound = ONE_ATMOSPHERE + ///The internal pressure threshold (default 0 kPa) var/internal_pressure_bound = 0 - // EXT_BOUND: Do not pass external_pressure_bound - // INT_BOUND: Do not pass internal_pressure_bound + // ATMOS_EXTERNAL_BOUND: Do not pass external_pressure_bound + // ATMOS_INTERNAL_BOUND: Do not pass internal_pressure_bound // NO_BOUND: Do not pass either - var/frequency = FREQ_ATMOS_CONTROL - var/datum/radio_frequency/radio_connection - var/radio_filter_out - var/radio_filter_in + /// id of air sensor its connected to + var/chamber_id - var/obj/machinery/advanced_airlock_controller/aac = null + ///area this vent is assigned to + var/area/assigned_area -/obj/machinery/atmospherics/components/unary/vent_pump/New() +/obj/machinery/atmospherics/components/unary/vent_pump/Initialize(mapload) if(!id_tag) - id_tag = id_tag = SSnetworks.assign_random_name() + id_tag = assign_random_name() . = ..() + assign_to_area() + /obj/machinery/atmospherics/components/unary/vent_pump/Destroy() - var/area/A = get_area(src) - if (A) - A.air_vent_names -= id_tag - A.air_vent_info -= id_tag - if(aac) - aac.vents -= src - - SSradio.remove_object(src,frequency) - radio_connection = null + disconnect_from_area() + + var/area/vent_area = get_area(src) + if (vent_area) + vent_area.air_vents -= src + return ..() +/obj/machinery/atmospherics/components/unary/vent_pump/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() + + var/area/old_area = get_area(old_loc) + var/area/new_area = get_area(src) + + if (old_area == new_area) + return + + disconnect_from_area(old_area) + assign_to_area(new_area) + +/obj/machinery/atmospherics/components/unary/vent_pump/on_enter_area(datum/source, area/area_to_register) + assign_to_area(area_to_register) + . = ..() + +/obj/machinery/atmospherics/components/unary/vent_pump/proc/assign_to_area(area/target_area = get_area(src)) + //this vent is already assigned to an area. Unassign it from here first before reassigning it to an new area + if(isnull(target_area) || !isnull(assigned_area)) + return + assigned_area = target_area + assigned_area.air_vents += src + update_name() + +/obj/machinery/atmospherics/components/unary/vent_pump/proc/disconnect_from_area(area/target_area = get_area(src)) + //you cannot unassign from an area we never were assigned to + if(isnull(target_area) || assigned_area != target_area) + return + assigned_area.air_vents -= src + assigned_area = null + +/obj/machinery/atmospherics/components/unary/vent_pump/on_exit_area(datum/source, area/area_to_unregister) + . = ..() + disconnect_from_area(area_to_unregister) + /obj/machinery/atmospherics/components/unary/vent_pump/update_icon_nopipes() cut_overlays() if(showpipe) - var/image/cap = getpipeimage(icon, "vent_cap", initialize_directions) + var/image/cap = get_pipe_image(icon, "vent_cap", initialize_directions) add_overlay(cap) else PIPING_LAYER_SHIFT(src, PIPING_LAYER_DEFAULT) @@ -71,14 +102,14 @@ icon_state = "vent_off" return - if(pump_direction & RELEASING) + if(pump_direction & ATMOS_DIRECTION_RELEASING) icon_state = "vent_out-off" else // pump_direction == SIPHONING icon_state = "vent_in-off" return if(icon_state == ("vent_out-off" || "vent_in-off" || "vent_off")) - if(pump_direction & RELEASING) + if(pump_direction & ATMOS_DIRECTION_RELEASING) icon_state = "vent_out" flick("vent_out-starting", src) else // pump_direction == SIPHONING @@ -86,11 +117,25 @@ flick("vent_in-starting", src) return - if(pump_direction & RELEASING) + if(pump_direction & ATMOS_DIRECTION_RELEASING) icon_state = "vent_out" else // pump_direction == SIPHONING icon_state = "vent_in" +REGISTER_BUFFER_HANDLER(/obj/machinery/atmospherics/components/unary/vent_pump) + +DEFINE_BUFFER_HANDLER(/obj/machinery/atmospherics/components/unary/vent_pump) + if(istype(buffer, /obj/machinery/air_sensor)) + to_chat(user, "-% Successfully linked [buffer] with [src] %-") + var/obj/machinery/air_sensor/sensor = buffer + sensor.outlet_id = id_tag + balloon_alert(user, "output linked to sensor") + else if (TRY_STORE_IN_BUFFER(buffer_parent, src)) + to_chat(user, "-% Successfully stored [REF(src)] [name] in buffer %-") + else + return NONE + return COMPONENT_BUFFER_RECEIVED + /obj/machinery/atmospherics/components/unary/vent_pump/process_atmos() ..() if(!is_operational || !isopenturf(loc)) @@ -100,157 +145,63 @@ if(!on || welded) return - var/datum/gas_mixture/air_contents = airs[1] - var/datum/gas_mixture/environment = loc.return_air() - - if(environment == null) + var/turf/open/us = loc + if(!istype(us)) return + var/datum/gas_mixture/air_contents = airs[1] + var/datum/gas_mixture/environment = us.return_air() var/environment_pressure = environment.return_pressure() - if(pump_direction & RELEASING) // internal -> external + if(pump_direction & ATMOS_DIRECTION_RELEASING) // internal -> external var/pressure_delta = 10000 - if(pressure_checks&EXT_BOUND) + if(pressure_checks&ATMOS_EXTERNAL_BOUND) pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure)) - if(pressure_checks&INT_BOUND) + if(pressure_checks&ATMOS_INTERNAL_BOUND) pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound)) if(pressure_delta > 0) - if(air_contents.return_temperature() > 0 && air_contents.return_volume() > 0) - var/transfer_moles = pressure_delta*environment.return_volume()/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - - loc.assume_air_moles(air_contents, transfer_moles) - air_update_turf() + if(air_contents.temperature > 0) + if((environment_pressure >= 50 * ONE_ATMOSPHERE)) + return FALSE - else // external -> internal - if(environment.return_pressure() > 0) - var/our_multiplier = air_contents.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION) - var/moles_delta = 10000 * our_multiplier - if(pressure_checks&EXT_BOUND) - moles_delta = min(moles_delta, (environment_pressure - external_pressure_bound) * environment.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION)) - if(pressure_checks&INT_BOUND) - moles_delta = min(moles_delta, (internal_pressure_bound - air_contents.return_pressure()) * our_multiplier) - - if(moles_delta > 0) - loc.transfer_air(air_contents, moles_delta) - air_update_turf() - update_parents() - -//Radio remote control - -/obj/machinery/atmospherics/components/unary/vent_pump/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - if(frequency) - radio_connection = SSradio.add_object(src, frequency,radio_filter_in) - -/obj/machinery/atmospherics/components/unary/vent_pump/proc/broadcast_status() - if(!radio_connection) - return - - var/datum/signal/signal = new(list( - "tag" = id_tag, - "frequency" = frequency, - "device" = "VP", - "timestamp" = world.time, - "power" = on, - "direction" = pump_direction, - "checks" = pressure_checks, - "internal" = internal_pressure_bound, - "external" = external_pressure_bound, - "sigtype" = "status", - "has_aac" = aac != null - )) - - var/area/A = get_area(src) - if(!A.air_vent_names[id_tag]) - name = "\improper [A.name] vent pump #[A.air_vent_names.len + 1]" - A.air_vent_names[id_tag] = name - A.air_vent_info[id_tag] = signal.data - - radio_connection.post_signal(src, signal, radio_filter_out) - - -/obj/machinery/atmospherics/components/unary/vent_pump/atmosinit() - //some vents work his own spesial way - radio_filter_in = frequency==FREQ_ATMOS_CONTROL?(RADIO_FROM_AIRALARM):null - radio_filter_out = frequency==FREQ_ATMOS_CONTROL?(RADIO_TO_AIRALARM):null - if(frequency) - set_frequency(frequency) - broadcast_status() - ..() - -/obj/machinery/atmospherics/components/unary/vent_pump/receive_signal(datum/signal/signal) - if(!is_operational) - return - // log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/components/unary/vent_pump/receive_signal([signal.debug_print()])") - if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) - return + var/transfer_moles = (pressure_delta * environment.volume) / (air_contents.temperature * R_IDEAL_GAS_EQUATION) - var/atom/signal_sender = signal.data["user"] + var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - if("purge" in signal.data) - pressure_checks &= ~EXT_BOUND - pump_direction = SIPHONING + if(!removed || !removed.total_moles()) + return - if("stabilize" in signal.data) - pressure_checks |= EXT_BOUND - pump_direction = RELEASING + loc.assume_air(removed) + update_parents() - if("power" in signal.data) - on = text2num(signal.data["power"]) - - if("power_toggle" in signal.data) - on = !on - - if("checks" in signal.data) - var/old_checks = pressure_checks - pressure_checks = text2num(signal.data["checks"]) - if(pressure_checks != old_checks) - investigate_log(" pressure checks were set to [pressure_checks] by [key_name(signal_sender)]",INVESTIGATE_ATMOS) - - if("checks_toggle" in signal.data) - pressure_checks = (pressure_checks?0:NO_BOUND) - - if("direction" in signal.data) - pump_direction = text2num(signal.data["direction"]) - - if("set_internal_pressure" in signal.data) - var/old_pressure = internal_pressure_bound - internal_pressure_bound = clamp(text2num(signal.data["set_internal_pressure"]),0,ONE_ATMOSPHERE*50) - if(old_pressure != internal_pressure_bound) - investigate_log(" internal pressure was set to [internal_pressure_bound] by [key_name(signal_sender)]",INVESTIGATE_ATMOS) + else // external -> internal + var/pressure_delta = 10000 + if(pressure_checks&ATMOS_EXTERNAL_BOUND) + pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound)) + if(pressure_checks&ATMOS_INTERNAL_BOUND) + pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure())) - if("set_external_pressure" in signal.data) - var/old_pressure = external_pressure_bound - external_pressure_bound = clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50) - if(old_pressure != external_pressure_bound) - investigate_log(" external pressure was set to [external_pressure_bound] by [key_name(signal_sender)]",INVESTIGATE_ATMOS) + if(pressure_delta > 0 && environment.temperature > 0) + if((air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE)) + return FALSE - if("reset_external_pressure" in signal.data) - external_pressure_bound = ONE_ATMOSPHERE + var/transfer_moles = (pressure_delta * air_contents.volume) / (environment.temperature * R_IDEAL_GAS_EQUATION) - if("reset_internal_pressure" in signal.data) - internal_pressure_bound = 0 + var/datum/gas_mixture/removed = loc.remove_air(transfer_moles) - if("adjust_internal_pressure" in signal.data) - internal_pressure_bound = clamp(internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),0,ONE_ATMOSPHERE*50) + if(!removed || !removed.total_moles()) //No venting from space 4head + return - if("adjust_external_pressure" in signal.data) - external_pressure_bound = clamp(external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),0,ONE_ATMOSPHERE*50) + air_contents.merge(removed) + update_parents() - if("init" in signal.data) - name = signal.data["init"] +/obj/machinery/atmospherics/components/unary/vent_pump/update_name() + . = ..() + if(override_naming) return - - if("status" in signal.data) - broadcast_status() - return // do not update_icon - - // log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]") - broadcast_status() - update_icon() + name = "\proper [get_area_name(src)] [name] [id_tag]" /obj/machinery/atmospherics/components/unary/vent_pump/welder_act(mob/living/user, obj/item/I) if(!I.tool_start_check(user, amount=0)) @@ -303,15 +254,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/New() ..() var/datum/gas_mixture/air_contents = airs[1] - air_contents.set_volume(1000) + air_contents.volume = 1000 // mapping -/obj/machinery/atmospherics/components/unary/vent_pump/layer1 +/obj/machinery/atmospherics/components/unary/vent_pump/layer2 piping_layer = 2 icon_state = "vent_map-2" -/obj/machinery/atmospherics/components/unary/vent_pump/layer3 +/obj/machinery/atmospherics/components/unary/vent_pump/layer4 piping_layer = 4 icon_state = "vent_map-4" @@ -328,8 +279,8 @@ icon_state = "vent_map_on-4" /obj/machinery/atmospherics/components/unary/vent_pump/siphon - pump_direction = SIPHONING - pressure_checks = INT_BOUND + pump_direction = ATMOS_DIRECTION_SIPHONING + pressure_checks = ATMOS_INTERNAL_BOUND internal_pressure_bound = 4000 external_pressure_bound = 0 @@ -353,38 +304,6 @@ piping_layer = 4 icon_state = "vent_map_siphon_on-4" -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos - frequency = FREQ_ATMOS_STORAGE - on = TRUE - icon_state = "vent_map_siphon_on-3" - -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output - name = "plasma tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_PLASMA -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output - name = "oxygen tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_O2 -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output - name = "nitrogen tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_N2 -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output - name = "mix tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_MIX -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output - name = "nitrous oxide tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_N2O -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output - name = "carbon dioxide tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_CO2 -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output - name = "incinerator chamber output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR - frequency = FREQ_ATMOS_CONTROL -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output - name = "toxins mixing output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB - frequency = FREQ_ATMOS_CONTROL - /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2 piping_layer = 2 icon_state = "vent_map-2" @@ -406,8 +325,8 @@ icon_state = "vent_map_on-4" /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon - pump_direction = SIPHONING - pressure_checks = INT_BOUND + pump_direction = ATMOS_DIRECTION_SIPHONING + pressure_checks = ATMOS_INTERNAL_BOUND internal_pressure_bound = 2000 external_pressure_bound = 0 @@ -431,47 +350,4 @@ piping_layer = 4 icon_state = "vent_map_siphon_on-4" -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos - frequency = FREQ_ATMOS_STORAGE - on = TRUE - icon_state = "vent_map_siphon_on-3" - -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output - name = "air mix tank output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_AIR - -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/toxins_waste_output - name = "toxins waste output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_TOXINS_WASTE - -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/sm_waste - name = "supermatter waste output inlet" - id_tag = ATMOS_GAS_MONITOR_OUTPUT_SM_WASTE - -#define LAYER_HELPER(FULLPATH)\ -##FULLPATH/layer2 {\ - piping_layer = 2;\ - icon_state = "vent_map_siphon_on-2";\ -}\ -##FULLPATH/layer4 {\ - piping_layer = 4;\ - icon_state = "vent_map_siphon_on-4";\ -} - -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output) -LAYER_HELPER(/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output) - -#undef LAYER_HELPER - -#undef INT_BOUND -#undef EXT_BOUND #undef NO_BOUND - -#undef SIPHONING -#undef RELEASING diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index c98506d04add8..29ba4b0b48e54 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -1,5 +1,5 @@ -#define SIPHONING 0 -#define SCRUBBING 1 +///filtered gases at or below this amount automatically get removed from the mix +#define MINIMUM_MOLES_TO_SCRUB (MOLAR_ACCURACY*100) /obj/machinery/atmospherics/components/unary/vent_scrubber icon_state = "scrub_map-3" @@ -12,61 +12,118 @@ can_unwrench = TRUE welded = FALSE layer = GAS_SCRUBBER_LAYER - shift_underlay_only = FALSE hide = TRUE + shift_underlay_only = FALSE + pipe_state = "scrubber" + vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE | VENTCRAWL_ENTRANCE_ALLOWED + processing_flags = NONE - interacts_with_air = TRUE - - var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing - var/filter_types = list(GAS_CO2, GAS_BZ) + ///The mode of the scrubber (ATMOS_DIRECTION_SCRUBBING or ATMOS_DIRECTION_SIPHONING) + var/scrubbing = ATMOS_DIRECTION_SCRUBBING + ///The list of gases we are filtering + var/list/filter_types = list(/datum/gas/carbon_dioxide) + ///Rate of the scrubber to remove gases from the air var/volume_rate = 200 - var/widenet = 0 //is this scrubber acting on the 3x3 area around it. + ///is this scrubber acting on the 3x3 area around it. + var/widenet = FALSE + ///List of the turfs near the scrubber, used for widenet var/list/turf/adjacent_turfs = list() + ///The area this scrubber is assigned to + var/area/assigned_area - var/frequency = FREQ_ATMOS_CONTROL - var/datum/radio_frequency/radio_connection - var/radio_filter_out - var/radio_filter_in - - pipe_state = "scrubber" + COOLDOWN_DECLARE(check_turfs_cooldown) -/obj/machinery/atmospherics/components/unary/vent_scrubber/New() +/obj/machinery/atmospherics/components/unary/vent_scrubber/Initialize(mapload) if(!id_tag) - id_tag = SSnetworks.assign_random_name() + id_tag = assign_random_name() . = ..() -/obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() - var/area/A = get_area(src) - if (A) - A.air_scrub_names -= id_tag - A.air_scrub_info -= id_tag + for(var/to_filter in filter_types) + if(istext(to_filter)) + filter_types -= to_filter + filter_types += gas_id2path(to_filter) + + assign_to_area() + AddElement(/datum/element/atmos_sensitive, mapload) - SSradio.remove_object(src,frequency) - radio_connection = null +/obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() + disconnect_from_area() adjacent_turfs.Cut() return ..() -/obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power() - if(!on || welded || !is_operational || !powered(power_channel)) - return FALSE +/obj/machinery/atmospherics/components/unary/vent_scrubber/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() - var/amount = idle_power_usage + var/area/old_area = get_area(old_loc) + var/area/new_area = get_area(src) - if(scrubbing & SCRUBBING) - amount += idle_power_usage * length(filter_types) - else //scrubbing == SIPHONING - amount = active_power_usage + if (old_area == new_area) + return - if(widenet) - amount += amount * (adjacent_turfs.len * (adjacent_turfs.len / 2)) - use_power(amount, power_channel) + disconnect_from_area(old_area) + assign_to_area(new_area) + +/obj/machinery/atmospherics/components/unary/vent_scrubber/on_enter_area(datum/source, area/area_to_register) + assign_to_area(area_to_register) + . = ..() + +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/assign_to_area(area/target_area = get_area(src)) + //this scrubber is already assigned to an area. Unassign it from here first before reassigning it to an new area + if(isnull(target_area) || !isnull(assigned_area)) + return + assigned_area = target_area + assigned_area.air_scrubbers += src + update_icon() + +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/disconnect_from_area(area/target_area = get_area(src)) + //you cannot unassign from an area we never were assigned to + if(isnull(target_area) || assigned_area != target_area) + return + assigned_area.air_scrubbers -= src + assigned_area = null + +/obj/machinery/atmospherics/components/unary/vent_scrubber/on_exit_area(datum/source, area/area_to_unregister) + . = ..() + disconnect_from_area(area_to_unregister) + +///remove a gas or list of gases from our filter_types.used so that the scrubber can check if its supposed to be processing after each change +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/remove_filters(filter_or_filters) + if(!islist(filter_or_filters)) + filter_or_filters = list(filter_or_filters) + + for(var/gas_to_filter in filter_or_filters) + var/translated_gas = istext(gas_to_filter) ? gas_id2path(gas_to_filter) : gas_to_filter + + if(ispath(translated_gas, /datum/gas)) + filter_types -= translated_gas + continue + + atmos_conditions_changed() return TRUE +// WARNING: This proc takes untrusted user input from toggle_filter in air alarm's ui_act +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/toggle_filters(filter_or_filters) + if(!islist(filter_or_filters)) + filter_or_filters = list(filter_or_filters) + + for(var/gas_to_filter in filter_or_filters) + var/translated_gas = istext(gas_to_filter) ? gas_id2path(gas_to_filter) : gas_to_filter + + if(ispath(translated_gas, /datum/gas)) + if(translated_gas in filter_types) + filter_types -= translated_gas + else + filter_types |= translated_gas + + atmos_conditions_changed() + return TRUE + + /obj/machinery/atmospherics/components/unary/vent_scrubber/update_icon_nopipes() cut_overlays() if(showpipe) - var/image/cap = getpipeimage(icon, "scrub_cap", initialize_directions) + var/image/cap = get_pipe_image(icon, "scrub_cap", initialize_directions) add_overlay(cap) else PIPING_LAYER_SHIFT(src, PIPING_LAYER_DEFAULT) @@ -79,7 +136,7 @@ icon_state = "scrub_off" return - if(scrubbing & SCRUBBING) + if(scrubbing == ATMOS_DIRECTION_SCRUBBING) if(widenet) icon_state = "scrub_wide" else @@ -87,142 +144,151 @@ else //scrubbing == SIPHONING icon_state = "scrub_purge" -/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, radio_filter_in) - -/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/broadcast_status() - if(!radio_connection) +/obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power() + if(!on || welded || !is_operational || !powered(power_channel)) return FALSE - var/list/f_types = list() - for(var/id in GLOB.gas_data.ids) - f_types += list(list("gas_id" = id, "gas_name" = GLOB.gas_data.names[id], "enabled" = (id in filter_types))) - - var/datum/signal/signal = new(list( - "tag" = id_tag, - "frequency" = frequency, - "device" = "VS", - "timestamp" = world.time, - "power" = on, - "scrubbing" = scrubbing, - "widenet" = widenet, - "filter_types" = f_types, - "sigtype" = "status" - )) - - var/area/A = get_area(src) - if(!A.air_scrub_names[id_tag]) - name = "\improper [A.name] air scrubber #[A.air_scrub_names.len + 1]" - A.air_scrub_names[id_tag] = name - - A.air_scrub_info[id_tag] = signal.data - radio_connection.post_signal(src, signal, radio_filter_out) + var/amount = idle_power_usage + + if(scrubbing == ATMOS_DIRECTION_SCRUBBING) + amount += idle_power_usage * length(filter_types) + else + amount = active_power_usage + if(widenet) + amount += amount * (adjacent_turfs.len * (adjacent_turfs.len / 2)) + use_power(amount, power_channel) return TRUE -/obj/machinery/atmospherics/components/unary/vent_scrubber/atmosinit() - radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null - radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null - if(frequency) - set_frequency(frequency) - broadcast_status() - check_turfs() - ..() -/obj/machinery/atmospherics/components/unary/vent_scrubber/process_atmos() - ..() +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/update_power_usage() + idle_power_usage = initial(idle_power_usage) + active_power_usage = initial(idle_power_usage) + var/new_power_usage = 0 + if(scrubbing == ATMOS_DIRECTION_SCRUBBING) + new_power_usage = idle_power_usage + idle_power_usage * length(filter_types) + active_power_usage = IDLE_POWER_USE + else + new_power_usage = active_power_usage + active_power_usage = ACTIVE_POWER_USE + if(widenet) + new_power_usage += new_power_usage * (length(adjacent_turfs) * (length(adjacent_turfs) / 2)) + active_power_usage = new_power_usage + +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/set_scrubbing(scrubbing, mob/user) + if (src.scrubbing != scrubbing) + investigate_log("was toggled to [scrubbing ? "scrubbing" : "siphon"] mode by [isnull(user) ? "the game" : key_name(user)]", INVESTIGATE_ATMOS) + + src.scrubbing = scrubbing + atmos_conditions_changed() + update_power_usage() + update_icon() + +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/set_widenet(widenet) + src.widenet = widenet + update_power_usage() + update_icon() + +/obj/machinery/atmospherics/components/unary/vent_scrubber/update_name() + . = ..() + if(override_naming) + return + name = "\proper [get_area_name(src)] [name] [id_tag]" + +/obj/machinery/atmospherics/components/unary/vent_scrubber/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + if(welded || !is_operational) + return FALSE + if(!nodes[1] || !on || (!filter_types && scrubbing != ATMOS_DIRECTION_SIPHONING)) + on = FALSE + return FALSE + + var/list/changed_gas = air.gases + + if(!changed_gas) + return FALSE + + if(scrubbing == ATMOS_DIRECTION_SIPHONING || length(filter_types & changed_gas)) + return TRUE + + return FALSE + +/obj/machinery/atmospherics/components/unary/vent_scrubber/atmos_expose(datum/gas_mixture/air, exposed_temperature) if(welded || !is_operational) return FALSE if(!nodes[1] || !on) on = FALSE return FALSE - scrub(loc) + var/turf/open/open_turf = loc + if(!istype(open_turf)) + return + scrub(open_turf) if(widenet) + if(COOLDOWN_FINISHED(src, check_turfs_cooldown)) + check_turfs() + COOLDOWN_START(src, check_turfs_cooldown, 2 SECONDS) for(var/turf/tile in adjacent_turfs) scrub(tile) return TRUE -/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/open/tile) +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(turf/tile) if(!istype(tile)) return FALSE var/datum/gas_mixture/environment = tile.return_air() var/datum/gas_mixture/air_contents = airs[1] + var/list/env_gases = environment.gases - if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE || !islist(filter_types)) + if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE) return FALSE - if(scrubbing & SCRUBBING) - environment.scrub_into(air_contents, volume_rate/environment.return_volume(), filter_types) - tile.air_update_turf() + if(scrubbing == ATMOS_DIRECTION_SCRUBBING) + if(length(env_gases & filter_types)) + ///contains all of the gas we're sucking out of the tile, gets put into our parent pipenet + var/datum/gas_mixture/filtered_out = new + var/list/filtered_gases = filtered_out.gases + filtered_out.temperature = environment.temperature + + ///maximum percentage of the turfs gas we can filter + var/removal_ratio = min(1, volume_rate / environment.volume) + + var/total_moles_to_remove = 0 + for(var/gas in filter_types & env_gases) + total_moles_to_remove += env_gases[gas][MOLES] + + if(total_moles_to_remove == 0)//sometimes this gets non gc'd values + environment.garbage_collect() + return FALSE + + for(var/gas in filter_types & env_gases) + filtered_out.add_gas(gas) + //take this gases portion of removal_ratio of the turfs air, or all of that gas if less than or equal to MINIMUM_MOLES_TO_SCRUB + var/transferred_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MINIMUM_MOLES_TO_SCRUB, env_gases[gas][MOLES])) + + filtered_gases[gas][MOLES] = transferred_moles + env_gases[gas][MOLES] -= transferred_moles + + environment.garbage_collect() + + //Remix the resulting gases + air_contents.merge(filtered_out) + update_parents() else //Just siphoning all air - environment.transfer_ratio_to(air_contents, volume_rate/environment.return_volume()) - tile.air_update_turf() - update_parents() + var/transfer_moles = environment.total_moles() * (volume_rate / environment.volume) - return TRUE + var/datum/gas_mixture/removed = tile.remove_air(transfer_moles) -//There is no easy way for an object to be notified of changes to atmos can pass flags -// So we check every machinery process (2 seconds) -/obj/machinery/atmospherics/components/unary/vent_scrubber/process() - if(widenet) - check_turfs() + air_contents.merge(removed) + update_parents() -//we populate a list of turfs with nonatmos-blocked cardinal turfs AND -// diagonal turfs that can share atmos with *both* of the cardinal turfs + return TRUE +///we populate a list of turfs with nonatmos-blocked cardinal turfs AND +/// diagonal turfs that can share atmos with *both* of the cardinal turfs /obj/machinery/atmospherics/components/unary/vent_scrubber/proc/check_turfs() adjacent_turfs.Cut() - var/turf/T = get_turf(src) - if(istype(T)) - adjacent_turfs = T.GetAtmosAdjacentTurfs(alldir = 1) - -/obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal) - if(!is_operational || !signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command")) - return 0 - - var/atom/signal_sender = signal.data["user"] - - if("power" in signal.data) - on = text2num(signal.data["power"]) - if("power_toggle" in signal.data) - on = !on - - if("widenet" in signal.data) - widenet = text2num(signal.data["widenet"]) - if("toggle_widenet" in signal.data) - widenet = !widenet - - var/old_scrubbing = scrubbing - if("scrubbing" in signal.data) - scrubbing = text2num(signal.data["scrubbing"]) - if("toggle_scrubbing" in signal.data) - scrubbing = !scrubbing - if(scrubbing != old_scrubbing) - investigate_log(" was toggled to [scrubbing ? "scrubbing" : "siphon"] mode by [key_name(signal_sender)]",INVESTIGATE_ATMOS) - - if("toggle_filter" in signal.data) - filter_types ^= signal.data["toggle_filter"] - - if("set_filters" in signal.data) - filter_types = list() - for(var/gas in signal.data["set_filters"]) - filter_types += gas - - if("init" in signal.data) - name = signal.data["init"] - return - - if("status" in signal.data) - broadcast_status() - return //do not update_icon - - broadcast_status() - update_icon() - return + var/turf/local_turf = get_turf(src) + adjacent_turfs = local_turf.get_atmos_adjacent_turfs(alldir = TRUE) /obj/machinery/atmospherics/components/unary/vent_scrubber/power_change() . = ..() @@ -242,6 +308,7 @@ update_icon() pipe_vision_img = image(src, loc, dir = dir) pipe_vision_img.plane = ABOVE_HUD_PLANE + investigate_log("was [welded ? "welded shut" : "unwelded"] by [key_name(user)]", INVESTIGATE_ATMOS) return TRUE /obj/machinery/atmospherics/components/unary/vent_scrubber/can_unwrench(mob/user) @@ -289,11 +356,8 @@ piping_layer = 4 icon_state = "scrub_map_on-4" -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/lavaland - filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ) - -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4/lavaland - filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ) +/obj/machinery/atmospherics/components/unary/vent_scrubber/disconnect() + ..() + on = FALSE -#undef SIPHONING -#undef SCRUBBING +#undef MINIMUM_MOLES_TO_SCRUB diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 94b347f1be75e..ed30d29b779b0 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -1,228 +1,286 @@ -/datum/pipeline +/datum/pipenet var/datum/gas_mixture/air var/list/datum/gas_mixture/other_airs var/list/obj/machinery/atmospherics/pipe/members - var/list/obj/machinery/atmospherics/components/other_atmosmch + var/list/obj/machinery/atmospherics/components/other_atmos_machines + /// List of other_atmos_machines that have custom_reconcilation set + /// We're essentially caching this to avoid needing to filter over it when processing our machines + var/list/obj/machinery/atmospherics/components/require_custom_reconcilation + + ///Should we equalize air amoung all our members? var/update = TRUE + ///Is this pipenet being reconstructed? + var/building = FALSE -/datum/pipeline/New() +/datum/pipenet/New() other_airs = list() members = list() - other_atmosmch = list() + other_atmos_machines = list() + require_custom_reconcilation = list() SSair.networks += src -/datum/pipeline/Destroy() +/datum/pipenet/Destroy() SSair.networks -= src - if(air && air.return_volume()) + if(building) + SSair.remove_from_expansion(src) + if(air?.volume) temporarily_store_air() - for(var/obj/machinery/atmospherics/pipe/P in members) - P.parent = null - for(var/obj/machinery/atmospherics/components/C in other_atmosmch) - C.nullifyPipenet(src) + for(var/obj/machinery/atmospherics/pipe/considered_pipe in members) + considered_pipe.replace_pipenet(considered_pipe.parent, null) + if(QDELETED(considered_pipe)) + continue + SSair.add_to_rebuild_queue(considered_pipe) + for(var/obj/machinery/atmospherics/components/considered_component in other_atmos_machines) + considered_component.nullify_pipenet(src) return ..() -/datum/pipeline/process() - if(update) - update = FALSE - reconcile_air() +/datum/pipenet/process() + if(!update || building) + return + + reconcile_air() update = air.react(src) -/datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/base) +/datum/pipenet/proc/set_air(datum/gas_mixture/new_air) + if(new_air == air) + return + air = new_air + +///Preps a pipenet for rebuilding, inserts it into the rebuild queue +/datum/pipenet/proc/build_pipenet(obj/machinery/atmospherics/base) + building = TRUE var/volume = 0 if(istype(base, /obj/machinery/atmospherics/pipe)) - var/obj/machinery/atmospherics/pipe/E = base - volume = E.volume - members += E - if(E.air_temporary) - air = E.air_temporary - E.air_temporary = null + var/obj/machinery/atmospherics/pipe/considered_pipe = base + volume = considered_pipe.volume + members += considered_pipe + if(considered_pipe.air_temporary) + air = considered_pipe.air_temporary + considered_pipe.air_temporary = null else - addMachineryMember(base) + add_machinery_member(base) + if(!air) air = new + + air.volume = volume + SSair.add_to_expansion(src, base) + +///Has the same effect as build_pipenet(), but this doesn't queue its work, so overrun abounds. It's useful for the pregame +/datum/pipenet/proc/build_pipenet_blocking(obj/machinery/atmospherics/base) + var/volume = 0 + if(istype(base, /obj/machinery/atmospherics/pipe)) + var/obj/machinery/atmospherics/pipe/considered_pipe = base + volume = considered_pipe.volume + members += considered_pipe + if(considered_pipe.air_temporary) + set_air(considered_pipe.air_temporary) + considered_pipe.air_temporary = null + else + add_machinery_member(base) + + if(!air) + set_air(new /datum/gas_mixture) var/list/possible_expansions = list(base) - while(possible_expansions.len>0) + while(length(possible_expansions)) for(var/obj/machinery/atmospherics/borderline in possible_expansions) - - var/list/result = borderline.pipeline_expansion(src) - - if(result.len>0) - for(var/obj/machinery/atmospherics/P in result) - if(istype(P, /obj/machinery/atmospherics/pipe)) - var/obj/machinery/atmospherics/pipe/item = P - if(!members.Find(item)) - - if(item.parent) - var/static/pipenetwarnings = 10 - if(pipenetwarnings > 0) - log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) Nearby: ([item.x], [item.y], [item.z]).") - pipenetwarnings -= 1 - if(pipenetwarnings == 0) - log_mapping("build_pipeline(): further messages about pipenets will be suppressed") - members += item - possible_expansions += item - - volume += item.volume - item.parent = src - - if(item.air_temporary) - air.merge(item.air_temporary) - item.air_temporary = null - else - P.setPipenet(src, borderline) - addMachineryMember(P) + var/list/result = borderline.pipenet_expansion(src) + if(!result?.len) + possible_expansions -= borderline + continue + for(var/obj/machinery/atmospherics/considered_device in result) + if(!istype(considered_device, /obj/machinery/atmospherics/pipe)) + considered_device.set_pipenet(src, borderline) + add_machinery_member(considered_device) + continue + var/obj/machinery/atmospherics/pipe/item = considered_device + if(members.Find(item)) + continue + if(item.parent) + var/static/pipenetwarnings = 10 + if(pipenetwarnings > 0) + log_mapping("build_pipenet(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) around [AREACOORD(item)].") + pipenetwarnings-- + if(pipenetwarnings == 0) + log_mapping("build_pipenet(): further messages about pipenets will be suppressed") + + members += item + possible_expansions += item + + volume += item.volume + item.replace_pipenet(item.parent, src) + + if(item.air_temporary) + air.merge(item.air_temporary) + item.air_temporary = null possible_expansions -= borderline - air.set_volume(volume) - -/datum/pipeline/proc/addMachineryMember(obj/machinery/atmospherics/components/C) - other_atmosmch |= C - var/datum/gas_mixture/G = C.returnPipenetAir(src) - if(!G) - stack_trace("addMachineryMember: Null gasmix added to pipeline datum from [C] which is of type [C.type]. Nearby: ([C.x], [C.y], [C.z])") - other_airs |= G - -/datum/pipeline/proc/addMember(obj/machinery/atmospherics/A, obj/machinery/atmospherics/N) - if(istype(A, /obj/machinery/atmospherics/pipe)) - var/obj/machinery/atmospherics/pipe/P = A - if(P.parent) - merge(P.parent) - P.parent = src - var/list/adjacent = P.pipeline_expansion() - for(var/obj/machinery/atmospherics/pipe/I in adjacent) - if(I.parent == src) - continue - var/datum/pipeline/E = I.parent - merge(E) - if(!members.Find(P)) - members += P - air.set_volume(air.return_volume() + P.volume) + air.volume = volume + +/** + * For a machine to properly "connect" to a pipenet and share gases, + * the pipenet needs to acknowledge a gas mixture as it's member. + * This is currently handled by the other_airs list in the pipenet datum. + * + * Other_airs itself is populated by gas mixtures through the parents list that each machineries have. +* This parents list is populated when a machinery calls update_parents and is then added into the queue by the controller. +*/ + +/datum/pipenet/proc/add_machinery_member(obj/machinery/atmospherics/components/considered_component) + other_atmos_machines |= considered_component + if(considered_component.custom_reconcilation) + require_custom_reconcilation |= considered_component + var/list/returned_airs = considered_component.return_pipenet_airs(src) + if (!length(returned_airs) || (null in returned_airs)) + stack_trace("add_machinery_member: Nonexistent (empty list) or null machinery gasmix added to pipenet datum from [considered_component] \ + which is of type [considered_component.type]. Nearby: ([considered_component.x], [considered_component.y], [considered_component.z])") + other_airs |= returned_airs + +/datum/pipenet/proc/add_member(obj/machinery/atmospherics/reference_device, obj/machinery/atmospherics/device_to_add) + if(!istype(reference_device, /obj/machinery/atmospherics/pipe)) + reference_device.set_pipenet(src, device_to_add) + add_machinery_member(reference_device) else - A.setPipenet(src, N) - addMachineryMember(A) - -/datum/pipeline/proc/merge(datum/pipeline/E) - if(E == src) + var/obj/machinery/atmospherics/pipe/reference_pipe = reference_device + if(reference_pipe.parent) + merge(reference_pipe.parent) + reference_pipe.replace_pipenet(reference_pipe.parent, src) + var/list/adjacent = reference_pipe.pipenet_expansion() + for(var/obj/machinery/atmospherics/pipe/adjacent_pipe in adjacent) + if(adjacent_pipe.parent == src) + continue + var/datum/pipenet/parent_pipenet = adjacent_pipe.parent + merge(parent_pipenet) + if(!members.Find(reference_pipe)) + members += reference_pipe + air.volume += reference_pipe.volume + +/datum/pipenet/proc/merge(datum/pipenet/parent_pipenet) + if(parent_pipenet == src) return - air.set_volume(air.return_volume() + E.air.return_volume()) - members.Add(E.members) - for(var/obj/machinery/atmospherics/pipe/S in E.members) - S.parent = src - air.merge(E.air) - for(var/obj/machinery/atmospherics/components/C in E.other_atmosmch) - C.replacePipenet(E, src) - other_atmosmch.Add(E.other_atmosmch) - other_airs.Add(E.other_airs) - E.members.Cut() - E.other_atmosmch.Cut() + air.volume += parent_pipenet.air.volume + members.Add(parent_pipenet.members) + for(var/obj/machinery/atmospherics/pipe/reference_pipe in parent_pipenet.members) + reference_pipe.replace_pipenet(reference_pipe.parent, src) + air.merge(parent_pipenet.air) + for(var/obj/machinery/atmospherics/components/reference_component in parent_pipenet.other_atmos_machines) + reference_component.replace_pipenet(parent_pipenet, src) + if(reference_component.custom_reconcilation) + require_custom_reconcilation |= reference_component + other_atmos_machines |= parent_pipenet.other_atmos_machines + other_airs |= parent_pipenet.other_airs + parent_pipenet.members.Cut() + parent_pipenet.other_atmos_machines.Cut() + parent_pipenet.require_custom_reconcilation.Cut() update = TRUE - qdel(E) + qdel(parent_pipenet) -/obj/machinery/atmospherics/proc/addMember(obj/machinery/atmospherics/A) +/obj/machinery/atmospherics/proc/add_member(obj/machinery/atmospherics/considered_device) return -/obj/machinery/atmospherics/pipe/addMember(obj/machinery/atmospherics/A) - parent.addMember(A, src) +/obj/machinery/atmospherics/pipe/add_member(obj/machinery/atmospherics/considered_device) + parent?.add_member(considered_device, src) -/obj/machinery/atmospherics/components/addMember(obj/machinery/atmospherics/A) - var/datum/pipeline/P = returnPipenet(A) - if(!P) - CRASH("null.addMember() called by [type] on [COORD(src)]") - P.addMember(A, src) +/obj/machinery/atmospherics/components/add_member(obj/machinery/atmospherics/considered_device) + var/datum/pipenet/device_pipenet = return_pipenet(considered_device) + if(!device_pipenet) + CRASH("null.add_member() called by [type] on [COORD(src)]") + device_pipenet.add_member(considered_device, src) -/datum/pipeline/proc/temporarily_store_air() +/datum/pipenet/proc/temporarily_store_air() //Update individual gas_mixtures by volume ratio for(var/obj/machinery/atmospherics/pipe/member in members) member.air_temporary = new - member.air_temporary.set_volume(member.volume) - member.air_temporary.copy_from(air) - - member.air_temporary.multiply(member.volume/air.return_volume()) + member.air_temporary.volume = member.volume + member.air_temporary.copy_from_ratio(air, member.volume / air.volume) - member.air_temporary.set_temperature(air.return_temperature()) + member.air_temporary.temperature = air.temperature -/datum/pipeline/proc/temperature_interact(turf/target, share_volume, thermal_conductivity) +/datum/pipenet/proc/temperature_interact(turf/target, share_volume, thermal_conductivity) var/total_heat_capacity = air.heat_capacity() - var/partial_heat_capacity = total_heat_capacity*(share_volume/air.return_volume()) - var/target_temperature - var/target_heat_capacity - - if(isopenturf(target)) + var/partial_heat_capacity = total_heat_capacity * (share_volume / air.volume) - var/turf/open/modeled_location = target - target_temperature = modeled_location.GetTemperature() - target_heat_capacity = modeled_location.GetHeatCapacity() + var/turf_temperature = target.get_temperature() + var/turf_heat_capacity = target.get_heat_capacity() + if(turf_heat_capacity <= 0 || partial_heat_capacity <= 0) + return TRUE - var/delta_temperature = 0 - var/sharer_heat_capacity = 0 + var/delta_temperature = turf_temperature - air.temperature - delta_temperature = (air.return_temperature() - target_temperature) - sharer_heat_capacity = target_heat_capacity + var/heat = thermal_conductivity * CALCULATE_CONDUCTION_ENERGY(delta_temperature, partial_heat_capacity, turf_heat_capacity) + air.temperature += heat / total_heat_capacity + target.take_temperature(-1 * heat / turf_heat_capacity) - var/self_temperature_delta = 0 - var/sharer_temperature_delta = 0 + if(target.blocks_air) + target.temperature_expose(air, target.temperature) + update = TRUE - if((sharer_heat_capacity>0) && (partial_heat_capacity>0)) - var/heat = thermal_conductivity*delta_temperature* \ - (partial_heat_capacity*sharer_heat_capacity/(partial_heat_capacity+sharer_heat_capacity)) +/datum/pipenet/proc/return_air() + . = other_airs + air + if(list_clear_nulls(.)) + stack_trace("[src] has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().") - self_temperature_delta = -heat/total_heat_capacity - sharer_temperature_delta = heat/sharer_heat_capacity - else - return 1 +/datum/pipenet/proc/reconcile_air() + var/list/datum/gas_mixture/gas_mixture_list = list() + var/list/datum/pipenet/pipenet_list = list() + pipenet_list += src - air.set_temperature(air.return_temperature() + self_temperature_delta) - modeled_location.TakeTemperature(sharer_temperature_delta) + for(var/i = 1; i <= pipenet_list.len; i++) //can't do a for-each here because we may add to the list within the loop + var/datum/pipenet/pipenet = pipenet_list[i] + if(!pipenet) + continue + gas_mixture_list += pipenet.other_airs + gas_mixture_list += pipenet.air + for(var/obj/machinery/atmospherics/components/atmos_machine as anything in pipenet.require_custom_reconcilation) + pipenet_list |= atmos_machine.return_pipenets_for_reconcilation(src) + gas_mixture_list += atmos_machine.return_airs_for_reconcilation(src) + var/total_thermal_energy = 0 + var/total_heat_capacity = 0 - else - if((target.heat_capacity>0) && (partial_heat_capacity>0)) - var/delta_temperature = air.return_temperature() - target.return_temperature() + var/list/total_gases = list() - var/heat = thermal_conductivity*delta_temperature* \ - (partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity)) + var/volume_sum = 0 - air.set_temperature(air.return_temperature() - heat/total_heat_capacity) - update = TRUE + var/static/process_id = 0 + process_id = (process_id + 1) % (SHORT_REAL_LIMIT - 1) -/datum/pipeline/proc/return_air() - . = other_airs + air - if(null in .) - stack_trace("[src]([REF(src)]) has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().") - list_clear_nulls(.) - -/datum/pipeline/proc/empty() - for(var/datum/gas_mixture/GM in get_all_connected_airs()) - GM.clear() - -/datum/pipeline/proc/get_all_connected_airs() - var/list/datum/gas_mixture/GL = list() - var/list/datum/pipeline/PL = list() - PL += src - - for(var/i = 1; i <= PL.len; i++) //can't do a for-each here because we may add to the list within the loop - var/datum/pipeline/P = PL[i] - if(!P) + for(var/datum/gas_mixture/gas_mixture as anything in gas_mixture_list) + // Ensure we never walk the same mix twice + if(gas_mixture.pipenet_cycle == process_id) + gas_mixture_list -= gas_mixture continue - GL += P.return_air() - for(var/atmosmch in P.other_atmosmch) - if (istype(atmosmch, /obj/machinery/atmospherics/components/binary/valve)) - var/obj/machinery/atmospherics/components/binary/valve/V = atmosmch - if(V.on) - PL |= V.parents[1] - PL |= V.parents[2] - else if (istype(atmosmch, /obj/machinery/atmospherics/components/unary/portables_connector)) - var/obj/machinery/atmospherics/components/unary/portables_connector/C = atmosmch - if(C.connected_device) - GL += C.portableConnectorReturnAir() - return GL - -/datum/pipeline/proc/reconcile_air() - var/list/datum/gas_mixture/GL = get_all_connected_airs() - equalize_all_gases_in_list(GL) + gas_mixture.pipenet_cycle = process_id + volume_sum += gas_mixture.volume + + // This is sort of a combined merge + heat_capacity calculation + + var/list/giver_gases = gas_mixture.gases + var/heat_capacity = 0 + //gas transfer + for(var/giver_id in giver_gases) + var/giver_gas_data = giver_gases[giver_id] + ASSERT_GAS_IN_LIST(giver_id, total_gases) + total_gases[giver_id][MOLES] += giver_gas_data[MOLES] + heat_capacity += giver_gas_data[MOLES] * giver_gas_data[GAS_META][META_GAS_SPECIFIC_HEAT] + + total_heat_capacity += heat_capacity + total_thermal_energy += gas_mixture.temperature * heat_capacity + + if(volume_sum == 0) + return + + var/datum/gas_mixture/total_gas_mixture = new(volume_sum) + total_gas_mixture.temperature = total_heat_capacity ? (total_thermal_energy / total_heat_capacity) : 0 + total_gas_mixture.gases = total_gases + total_gas_mixture.garbage_collect() + + //Update individual gas_mixtures by volume ratio + for(var/datum/gas_mixture/gas_mixture as anything in gas_mixture_list) + gas_mixture.copy_from_ratio(total_gas_mixture, gas_mixture.volume / volume_sum) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 0ba035cc3121d..4a1486a13d775 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -2,16 +2,17 @@ name = "gas flow meter" desc = "It measures something." icon = 'icons/obj/atmospherics/pipes/meter.dmi' - icon_state = "meterX" - layer = GAS_PUMP_LAYER + icon_state = "meter" + layer = HIGH_PIPE_LAYER power_channel = AREA_USAGE_ENVIRON use_power = IDLE_POWER_USE idle_power_usage = 2 - active_power_usage = 4 + active_power_usage = 9 max_integrity = 150 armor_type = /datum/armor/machinery_meter - var/frequency = 0 - var/atom/target + greyscale_config = /datum/greyscale_config/meter + greyscale_colors = COLOR_GRAY + var/obj/machinery/atmospherics/pipe/target var/target_layer = PIPING_LAYER_DEFAULT @@ -20,17 +21,6 @@ rad = 100 fire = 40 -/obj/machinery/meter/atmos - frequency = FREQ_ATMOS_STORAGE - -/obj/machinery/meter/atmos/atmos_waste_loop - name = "waste loop gas flow meter" - id_tag = ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE - -/obj/machinery/meter/atmos/distro_loop - name = "distribution loop gas flow meter" - id_tag = ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION - CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/meter) /obj/machinery/meter/Initialize(mapload, new_piping_layer) @@ -39,11 +29,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/meter) SSair.start_processing_machine(src) if(!target) reattach_to_layer() + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/atmos_meter, + )) return ..() /obj/machinery/meter/Destroy() SSair.stop_processing_machine(src) - target = null + if(!isnull(target)) + UnregisterSignal(target, COMSIG_PARENT_QDELETING) + target = null return ..() /obj/machinery/meter/proc/reattach_to_layer() @@ -53,62 +48,81 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/meter) candidate = pipe if(candidate) target = candidate + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(drop_meter)) setAttachLayer(candidate.piping_layer) +///Called when the parent pipe is removed +/obj/machinery/meter/proc/drop_meter() + SIGNAL_HANDLER + deconstruct(FALSE) + /obj/machinery/meter/proc/setAttachLayer(new_layer) target_layer = new_layer PIPING_LAYER_DOUBLE_SHIFT(src, target_layer) -/obj/machinery/meter/process_atmos() - if(!target) - icon_state = "meterX" - return 0 - - if(machine_stat & (BROKEN|NOPOWER)) - icon_state = "meter0" - return 0 +/obj/machinery/meter/on_set_is_operational(old_value) + if(is_operational) + SSair.start_processing_machine(src)//dont set icon_state here because it will be reset on next process() if it ever happens + else + icon_state = "meter" + SSair.stop_processing_machine(src) - use_power(5) +/obj/machinery/meter/return_air() + return target?.return_air() || ..() - var/datum/gas_mixture/environment = target.return_air() - if(!environment) - icon_state = "meterX" - return 0 +/obj/machinery/meter/process_atmos() + var/datum/gas_mixture/pipe_air = target?.return_air() + if(isnull(pipe_air)) + icon_state = "meter0" + return FALSE - var/env_pressure = environment.return_pressure() - if(env_pressure <= 0.15*ONE_ATMOSPHERE) + var/env_pressure = pipe_air.return_pressure() + if(env_pressure <= 0.15 * ONE_ATMOSPHERE) icon_state = "meter0" - else if(env_pressure <= 1.8*ONE_ATMOSPHERE) - var/val = round(env_pressure/(ONE_ATMOSPHERE*0.3) + 0.5) + else if(env_pressure <= 1.8 * ONE_ATMOSPHERE) + var/val = round(env_pressure / (ONE_ATMOSPHERE * 0.3) + 0.5) icon_state = "meter1_[val]" - else if(env_pressure <= 30*ONE_ATMOSPHERE) - var/val = round(env_pressure/(ONE_ATMOSPHERE*5)-0.35) + 1 + else if(env_pressure <= 30 * ONE_ATMOSPHERE) + var/val = round(env_pressure / (ONE_ATMOSPHERE * 5) - 0.35) + 1 icon_state = "meter2_[val]" - else if(env_pressure <= 59*ONE_ATMOSPHERE) - var/val = round(env_pressure/(ONE_ATMOSPHERE*5) - 6) + 1 + else if(env_pressure <= 59 * ONE_ATMOSPHERE) + var/val = round(env_pressure / (ONE_ATMOSPHERE * 5) - 6) + 1 icon_state = "meter3_[val]" else icon_state = "meter4" - if(frequency) - var/datum/radio_frequency/radio_connection = SSradio.return_frequency(frequency) + var/env_temperature = pipe_air.temperature - if(!radio_connection) - return + var/new_greyscale = greyscale_colors - var/datum/signal/signal = new(list( - "id_tag" = id_tag, - "device" = "AM", - "pressure" = round(env_pressure), - "sigtype" = "status" - )) - radio_connection.post_signal(src, signal) + if(env_pressure == 0 || env_temperature == 0) + new_greyscale = COLOR_GRAY + else + switch(env_temperature) + if(BODYTEMP_HEAT_WARNING_3 to INFINITY) + new_greyscale = COLOR_RED + if(BODYTEMP_HEAT_WARNING_2 to BODYTEMP_HEAT_WARNING_3) + new_greyscale = COLOR_ORANGE + if(BODYTEMP_HEAT_WARNING_1 to BODYTEMP_HEAT_WARNING_2) + new_greyscale = COLOR_YELLOW + if(BODYTEMP_COLD_WARNING_1 to BODYTEMP_HEAT_WARNING_1) + new_greyscale = COLOR_VIBRANT_LIME + if(BODYTEMP_COLD_WARNING_2 to BODYTEMP_COLD_WARNING_1) + new_greyscale = COLOR_CYAN + if(BODYTEMP_COLD_WARNING_3 to BODYTEMP_COLD_WARNING_2) + new_greyscale = COLOR_BLUE + else + new_greyscale = COLOR_VIOLET + + if(new_greyscale != greyscale_colors)//dont update if nothing has changed since last update + greyscale_colors = new_greyscale + set_greyscale(greyscale_colors) /obj/machinery/meter/proc/status() if (target) - var/datum/gas_mixture/environment = target.return_air() - if(environment) - . = "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.return_temperature(),0.01)] K ([round(environment.return_temperature()-T0C,0.01)]°C)." + var/datum/gas_mixture/pipe_air = target.return_air() + if(pipe_air) + . = "The pressure gauge reads [round(pipe_air.return_pressure(), 0.01)] kPa; [round(pipe_air.temperature,0.01)] K ([round(pipe_air.temperature-T0C,0.01)]°C)." else . = "The sensor error light is blinking." else @@ -150,3 +164,45 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/meter) /obj/machinery/meter/turf/reattach_to_layer() target = loc + + +////////////// CIRCUITS ///////////////// + + +/obj/item/circuit_component/atmos_meter + display_name = "Atmospheric Meter" + desc = "Allows to read the pressure and temperature of the pipenet." + + ///Signals the circuit to retrieve the pipenet's current pressure and temperature + var/datum/port/input/request_data + + ///Pressure of the pipenet + var/datum/port/output/pressure + ///Temperature of the pipenet + var/datum/port/output/temperature + + ///The component parent object + var/obj/machinery/meter/connected_meter + +/obj/item/circuit_component/atmos_meter/populate_ports() + request_data = add_input_port("Request Meter Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(request_meter_data)) + + pressure = add_output_port("Pressure", PORT_TYPE_NUMBER) + temperature = add_output_port("Temperature", PORT_TYPE_NUMBER) + +/obj/item/circuit_component/atmos_meter/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/meter)) + connected_meter = shell + +/obj/item/circuit_component/atmos_meter/unregister_usb_parent(atom/movable/shell) + connected_meter = null + return ..() + +/obj/item/circuit_component/atmos_meter/proc/request_meter_data() + CIRCUIT_TRIGGER + if(!connected_meter) + return + var/datum/gas_mixture/environment = connected_meter.target.return_air() + pressure.set_output(environment.return_pressure()) + temperature.set_output(environment.temperature) diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index 1f78654f1dc9a..9c40d1be7ee14 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -120,22 +120,23 @@ on_overlay.color = overlay_color add_overlay(on_overlay) -/obj/machinery/atmospherics/miner/process_atmos() //TODO figure out delta_time for this +/obj/machinery/atmospherics/miner/process(delta_time) update_power() check_operation() if(active && !broken) if(isnull(spawn_id)) return FALSE if(do_use_power(active_power_usage)) - mine_gas() + mine_gas(delta_time) /obj/machinery/atmospherics/miner/proc/mine_gas(delta_time = 2) var/turf/open/O = get_turf(src) if(!isopenturf(O)) return FALSE var/datum/gas_mixture/merger = new - merger.set_moles(spawn_id, spawn_mol * delta_time) - merger.set_temperature(spawn_temp) + merger.assert_gas(spawn_id) + merger.gases[spawn_id][MOLES] = spawn_mol * delta_time + merger.temperature = spawn_temp O.assume_air(merger) /obj/machinery/atmospherics/miner/attack_silicon(mob/living/silicon/user) @@ -146,62 +147,62 @@ /obj/machinery/atmospherics/miner/n2o name = "\improper N2O Gas Miner" overlay_color = "#FFCCCC" - spawn_id = GAS_NITROUS + spawn_id = /datum/gas/nitrous_oxide /obj/machinery/atmospherics/miner/nitrogen name = "\improper N2 Gas Miner" overlay_color = "#CCFFCC" - spawn_id = GAS_N2 + spawn_id = /datum/gas/nitrogen /obj/machinery/atmospherics/miner/oxygen name = "\improper O2 Gas Miner" overlay_color = "#007FFF" - spawn_id = GAS_O2 + spawn_id = /datum/gas/oxygen /obj/machinery/atmospherics/miner/plasma name = "\improper Plasma Gas Miner" overlay_color = "#FF0000" - spawn_id = GAS_PLASMA + spawn_id = /datum/gas/plasma /obj/machinery/atmospherics/miner/carbon_dioxide name = "\improper CO2 Gas Miner" overlay_color = "#CDCDCD" - spawn_id = GAS_CO2 + spawn_id = /datum/gas/carbon_dioxide /obj/machinery/atmospherics/miner/bz name = "\improper BZ Gas Miner" overlay_color = "#FAFF00" - spawn_id = GAS_BZ + spawn_id = /datum/gas/bz /obj/machinery/atmospherics/miner/water_vapor name = "\improper Water Vapor Gas Miner" overlay_color = "#99928E" - spawn_id = GAS_H2O + spawn_id = /datum/gas/water_vapor /obj/machinery/atmospherics/miner/tritium name = "\improper Tritium Gas Miner" overlay_color = "#1ae000" - spawn_id = GAS_TRITIUM + spawn_id = /datum/gas/tritium /obj/machinery/atmospherics/miner/hypernoblium name = "\improper Hypernoblium Gas Miner" overlay_color = "#00a6e7" - spawn_id = GAS_HYPERNOB + spawn_id = /datum/gas/hypernoblium /obj/machinery/atmospherics/miner/nitryl name = "\improper Nitryl Gas Miner" overlay_color = "#5e4000" - spawn_id = GAS_NITRYL + spawn_id = /datum/gas/nitryl /obj/machinery/atmospherics/miner/stimulum name = "\improper Stimulum Gas Miner" overlay_color = "#c9c9c9" - spawn_id = GAS_STIMULUM + spawn_id = /datum/gas/stimulum /obj/machinery/atmospherics/miner/pluoxium name = "\improper Pluoxium Gas Miner" overlay_color = "#c5c9b1" - spawn_id = GAS_PLUOXIUM + spawn_id = /datum/gas/pluoxium /obj/machinery/atmospherics/miner/station power_draw = GASMINER_POWER_FULLSCALE @@ -211,37 +212,37 @@ /obj/machinery/atmospherics/miner/station/n2o name = "\improper N2O Gas Miner" overlay_color = "#FFCCCC" - spawn_id = GAS_NITROUS + spawn_id = /datum/gas/nitrous_oxide /obj/machinery/atmospherics/miner/station/nitrogen name = "\improper N2 Gas Miner" overlay_color = "#CCFFCC" - spawn_id = GAS_N2 + spawn_id = /datum/gas/nitrogen /obj/machinery/atmospherics/miner/station/oxygen name = "\improper O2 Gas Miner" overlay_color = "#007FFF" - spawn_id = GAS_O2 + spawn_id = /datum/gas/oxygen /obj/machinery/atmospherics/miner/station/plasma name = "\improper Plasma Gas Miner" overlay_color = "#FF0000" - spawn_id = GAS_PLASMA + spawn_id = /datum/gas/plasma /obj/machinery/atmospherics/miner/station/carbon_dioxide name = "\improper CO2 Gas Miner" overlay_color = "#CDCDCD" - spawn_id = GAS_CO2 + spawn_id = /datum/gas/carbon_dioxide /obj/machinery/atmospherics/miner/station/bz name = "\improper BZ Gas Miner" overlay_color = "#FAFF00" - spawn_id = GAS_BZ + spawn_id = /datum/gas/bz /obj/machinery/atmospherics/miner/station/water_vapor name = "\improper Water Vapor Gas Miner" overlay_color = "#99928E" - spawn_id = GAS_H2O + spawn_id = /datum/gas/water_vapor #undef GASMINER_POWER_NONE diff --git a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm new file mode 100644 index 0000000000000..d4adfdb0d3a3d --- /dev/null +++ b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm @@ -0,0 +1,29 @@ +/obj/machinery/atmospherics/pipe/bridge_pipe + icon = 'icons/obj/atmospherics/pipes/bridge_pipe.dmi' + icon_state = "bridge_center" + + name = "bridge pipe" + desc = "A one meter section of regular pipe used to connect pipenets over pipes." + + dir = SOUTH + initialize_directions = NORTH | SOUTH + pipe_flags = PIPING_CARDINAL_AUTONORMALIZE | PIPING_BRIDGE + device_type = BINARY + + construction_type = /obj/item/pipe/binary + pipe_state = "bridge_center" + +/obj/machinery/atmospherics/pipe/bridge_pipe/set_init_directions() + switch(dir) + if(NORTH, SOUTH) + initialize_directions = SOUTH|NORTH + if(EAST, WEST) + initialize_directions = EAST|WEST + +/obj/machinery/atmospherics/pipe/bridge_pipe/update_overlays() + . = ..() + var/mutable_appearance/center = mutable_appearance('icons/obj/atmospherics/pipes/bridge_pipe.dmi', "bridge_center") + PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) + . += center + + layer = HIGH_PIPE_LAYER //to stay above all sorts of pipes diff --git a/code/modules/atmospherics/machinery/pipes/color_adapter.dm b/code/modules/atmospherics/machinery/pipes/color_adapter.dm new file mode 100644 index 0000000000000..300737a98863f --- /dev/null +++ b/code/modules/atmospherics/machinery/pipes/color_adapter.dm @@ -0,0 +1,67 @@ +/obj/machinery/atmospherics/pipe/color_adapter + icon = 'icons/obj/atmospherics/pipes/color_adapter.dmi' + icon_state = "adapter_map-3" + + name = "color adapter" + desc = "A one meter section of regular pipe used to connect different colored pipes." + + dir = SOUTH + initialize_directions = NORTH | SOUTH + pipe_flags = PIPING_CARDINAL_AUTONORMALIZE | PIPING_ALL_COLORS | PIPING_BRIDGE + device_type = BINARY + + construction_type = /obj/item/pipe/binary + pipe_state = "adapter_center" + + paintable = FALSE + hide = FALSE + + var/static/list/mutable_appearance/center_cache = list() + +/obj/machinery/atmospherics/pipe/color_adapter/Initialize(mapload) + icon_state = "" + . = ..() + +/obj/machinery/atmospherics/pipe/color_adapter/set_init_directions() + switch(dir) + if(NORTH, SOUTH) + initialize_directions = SOUTH|NORTH + if(EAST, WEST) + initialize_directions = EAST|WEST + +/obj/machinery/atmospherics/pipe/color_adapter/update_overlays() + . = ..() + var/mutable_appearance/center = center_cache["[piping_layer]"] + if(!center) + center = mutable_appearance(initial(icon), "adapter_center") + PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) + center_cache["[piping_layer]"] = center + . += center + + update_layer() + + //Add non-broken pieces + for(var/i in 1 to device_type) + if(!nodes[i]) + continue + var/image/pipe = get_pipe_image('icons/obj/atmospherics/pipes/manifold.dmi', "pipe-3", get_dir(src, nodes[i]), nodes[i].pipe_color) + PIPING_LAYER_DOUBLE_SHIFT(pipe, piping_layer) + pipe.layer = layer + 0.01 + . += pipe + +/obj/machinery/atmospherics/pipe/color_adapter/layer1 + icon_state = "adapter_map-1" + piping_layer = 1 + +/obj/machinery/atmospherics/pipe/color_adapter/layer2 + icon_state = "adapter_map-2" + piping_layer = 2 + +/obj/machinery/atmospherics/pipe/color_adapter/layer4 + icon_state = "adapter_map-4" + piping_layer = 4 + +/obj/machinery/atmospherics/pipe/color_adapter/layer5 + + icon_state = "adapter_map-5" + piping_layer = 5 diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index b0070488a00af..4997b7e1e4f9f 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -14,7 +14,7 @@ add_atom_colour("#404040", FIXED_COLOUR_PRIORITY) -/obj/machinery/atmospherics/pipe/heat_exchanging/isConnectable(obj/machinery/atmospherics/pipe/heat_exchanging/target, given_layer, HE_type_check = TRUE) +/obj/machinery/atmospherics/pipe/heat_exchanging/is_connectable(obj/machinery/atmospherics/pipe/heat_exchanging/target, given_layer, HE_type_check = TRUE) if(istype(target, /obj/machinery/atmospherics/pipe/heat_exchanging) != HE_type_check) return FALSE . = ..() @@ -23,19 +23,19 @@ var/environment_temperature = 0 var/datum/gas_mixture/pipe_air = return_air() - var/turf/T = loc - if(istype(T)) - if(isclosedturf(T)) - environment_temperature = T.return_temperature() + var/turf/local_turf = loc + if(istype(local_turf)) + if(islava(local_turf)) + environment_temperature = 5000 //Yuck + else if(local_turf.blocks_air) + environment_temperature = local_turf.temperature else - var/turf/open/OT = T - environment_temperature = OT.GetTemperature() - else if(T != null) - environment_temperature = T.return_temperature() - - if(pipe_air != null) - if(abs(environment_temperature-pipe_air.return_temperature()) > minimum_temperature_difference) - parent.temperature_interact(T, volume, thermal_conductivity) + var/turf/open/open_local = local_turf + environment_temperature = open_local.get_temperature() + else + environment_temperature = local_turf.temperature + if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference) + parent.temperature_interact(local_turf, volume, thermal_conductivity) //heatup/cooldown any mobs buckled to ourselves based on our temperature @@ -43,11 +43,10 @@ var/hc = pipe_air.heat_capacity() var/mob/living/heat_source = buckled_mobs[1] //Best guess-estimate of the total bodytemperature of all the mobs, since they share the same environment it's ~ok~ to guess like this - var/avg_temp = (pipe_air.return_temperature() * hc + (heat_source.bodytemperature * buckled_mobs.len) * 3500) / (hc + (buckled_mobs ? buckled_mobs.len * 3500 : 0)) - for(var/m in buckled_mobs) - var/mob/living/L = m - L.bodytemperature = avg_temp - pipe_air.set_temperature(avg_temp) + var/avg_temp = (pipe_air.temperature * hc + (heat_source.bodytemperature * buckled_mobs.len) * 3500) / (hc + (buckled_mobs ? buckled_mobs.len * 3500 : 0)) + for(var/mob/living/buckled_mob as anything in buckled_mobs) + buckled_mob.bodytemperature = avg_temp + pipe_air.temperature = avg_temp /obj/machinery/atmospherics/pipe/heat_exchanging/process(delta_time) if(!parent) @@ -79,3 +78,6 @@ for(var/m in buckled_mobs) var/mob/living/buckled_mob = m buckled_mob.apply_damage(delta_time * 2 * log(pipe_air.return_temperature() - heat_limit), BURN, BODY_ZONE_CHEST) + +/obj/machinery/atmospherics/pipe/heat_exchanging/update_pipe_icon() + return diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm index a5b736806f0fb..ded4067e2a45a 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm @@ -15,24 +15,23 @@ construction_type = /obj/item/pipe/directional pipe_state = "junction" -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/SetInitDirections() +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/set_init_directions() switch(dir) if(NORTH, SOUTH) initialize_directions = SOUTH|NORTH if(EAST, WEST) initialize_directions = WEST|EAST -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/getNodeConnects() +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/get_node_connects() return list(turn(dir, 180), dir) -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/isConnectable(obj/machinery/atmospherics/target, given_layer, he_type_check) +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/is_connectable(obj/machinery/atmospherics/target, given_layer, he_type_check) if(dir == get_dir(target, src)) return ..(target, given_layer, FALSE) //we want a normal pipe instead return ..(target, given_layer, TRUE) -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/update_icon() +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/update_pipe_icon() icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]" - update_layer() /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2 piping_layer = 2 diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm index f02e1a4b75a61..9775e315637f7 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm @@ -3,6 +3,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold icon = 'icons/obj/atmospherics/pipes/he-manifold.dmi' icon_state = "manifold-3" + base_icon_state = "manifold" name = "pipe manifold" desc = "A manifold composed of regular pipes." @@ -15,29 +16,22 @@ construction_type = /obj/item/pipe/trinary pipe_state = "he_manifold" - var/mutable_appearance/center - -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/New() - icon_state = "" - center = mutable_appearance(icon, "manifold_center") - return ..() - -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/SetInitDirections() +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/set_init_directions() initialize_directions = ALL_CARDINALS initialize_directions &= ~dir -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_icon() - cut_overlays() +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_pipe_icon() + icon_state = "[base_icon_state]-[piping_layer]" +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_overlays() + . = ..() + var/mutable_appearance/center = mutable_appearance(icon, "manifold_center") PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - add_overlay(center) //Add non-broken pieces for(var/i in 1 to device_type) if(nodes[i]) - add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) - - update_layer() + . += get_pipe_image(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2 piping_layer = 2 diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm index 18b4b1923f302..33b7f719219de 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm @@ -3,6 +3,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w icon = 'icons/obj/atmospherics/pipes/he-manifold.dmi' icon_state = "manifold4w-3" + base_icon_state = "manifold4w" name = "4-way pipe manifold" desc = "A manifold composed of heat-exchanging pipes." @@ -14,27 +15,24 @@ construction_type = /obj/item/pipe/quaternary pipe_state = "he_manifold4w" - var/mutable_appearance/center -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/New() - icon_state = "" - center = mutable_appearance(icon, "manifold4w_center") - return ..() - -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections() +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/set_init_directions() initialize_directions = initial(initialize_directions) -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_icon() - cut_overlays() +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_pipe_icon() + icon_state = "[base_icon_state]-[piping_layer]" + +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_overlays() + . = ..() + var/mutable_appearance/center = mutable_appearance(icon, "manifold4w_center") PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - add_overlay(center) + . += center //Add non-broken pieces for(var/i in 1 to device_type) if(nodes[i]) - add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) - + . += get_pipe_image(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) update_layer() /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2 diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm index 7a5d9e5e6d1ef..44271377fbc2a 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm @@ -14,7 +14,7 @@ construction_type = /obj/item/pipe/binary/bendable pipe_state = "he" -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/SetInitDirections() +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/set_init_directions() if(dir in GLOB.diagonals) initialize_directions = dir return @@ -24,9 +24,9 @@ if(EAST, WEST) initialize_directions = EAST|WEST -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/update_icon() +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/update_pipe_icon() icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]" - update_layer() + return /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2 piping_layer = 2 diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index d0473acdaab3d..224e26e07120a 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -5,12 +5,13 @@ desc = "A special pipe to bridge pipe layers with." dir = SOUTH initialize_directions = NORTH|SOUTH - pipe_flags = PIPING_ALL_LAYER | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE + pipe_flags = PIPING_ALL_LAYER | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE | PIPING_BRIDGE piping_layer = PIPING_LAYER_DEFAULT device_type = 0 + volume = 200 construction_type = /obj/item/pipe/binary pipe_state = "manifoldlayer" - paintable = FALSE + paintable = TRUE ///Reference to all the nodes in the front var/list/front_nodes @@ -23,111 +24,114 @@ ) /obj/machinery/atmospherics/pipe/layer_manifold/Initialize(mapload) - volume = 350 // was previously 280 which was 8 ports but now this thing has 10 front_nodes = list() back_nodes = list() icon_state = "manifoldlayer_center" return ..() /obj/machinery/atmospherics/pipe/layer_manifold/Destroy() - nullifyAllNodes() + nullify_all_nodes() return ..() -/obj/machinery/atmospherics/pipe/layer_manifold/proc/nullifyAllNodes() - var/list/obj/machinery/atmospherics/needs_nullifying = get_all_connected_nodes() +/obj/machinery/atmospherics/pipe/layer_manifold/update_pipe_icon() + return + +/obj/machinery/atmospherics/pipe/layer_manifold/proc/nullify_all_nodes() + for(var/obj/machinery/atmospherics/node in nodes) + node.disconnect(src) + SSair.add_to_rebuild_queue(node) front_nodes = null back_nodes = null nodes = list() - for(var/obj/machinery/atmospherics/A in needs_nullifying) - if(A != null && src != null) //if it's already null why are we doing this? The answer is byond... it'll always find a way - A.disconnect(src) - SSair.add_to_rebuild_queue(A) -/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_all_connected_nodes() - return front_nodes + back_nodes + nodes +/obj/machinery/atmospherics/pipe/layer_manifold/update_layer() + layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. -/obj/machinery/atmospherics/pipe/layer_manifold/update_icon() - cut_overlays() - layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. +/obj/machinery/atmospherics/pipe/layer_manifold/update_overlays() + . = ..() for(var/node in front_nodes) - add_attached_images(node) + var/list/front_images = get_attached_images(node) + if(length(front_images)) + . += front_images for(var/node in back_nodes) - add_attached_images(node) + var/list/back_images = get_attached_images(node) + if(length(back_images)) + . += back_images -/obj/machinery/atmospherics/pipe/layer_manifold/proc/add_attached_images(obj/machinery/atmospherics/A) - if(!A) +/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_attached_images(obj/machinery/atmospherics/machine_check) + if(!machine_check) return - if(istype(A, /obj/machinery/atmospherics/pipe/layer_manifold)) - for(var/i in PIPING_LAYER_MIN to PIPING_LAYER_MAX) - add_attached_image(get_dir(src, A), i) - return - add_attached_image(get_dir(src, A), A.piping_layer, A.pipe_color) -/obj/machinery/atmospherics/pipe/layer_manifold/proc/add_attached_image(p_dir, p_layer, p_color = null) - var/image/I + . = list() - if(p_color) - I = getpipeimage(icon, "pipe", p_dir, p_color, piping_layer = p_layer) - else - I = getpipeimage(icon, "pipe", p_dir, piping_layer = p_layer) + if(istype(machine_check, /obj/machinery/atmospherics/pipe/layer_manifold)) + for(var/i in PIPING_LAYER_MIN to PIPING_LAYER_MAX) + . += get_attached_image(get_dir(src, machine_check), i, COLOR_VERY_LIGHT_GRAY) + return + if(istype(machine_check, /obj/machinery/atmospherics/components/unary/airlock_pump)) + . += get_attached_image(get_dir(src, machine_check), 4, COLOR_BLUE) + //. += get_attached_image(get_dir(src, machine_check), 2, COLOR_RED) // Only the distro node is added currently to the pipenet, it doesn't merge the pipenet with the waste node + return + . += get_attached_image(get_dir(src, machine_check), machine_check.piping_layer, machine_check.pipe_color) - I.layer = layer - 0.01 - add_overlay(I) +/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_attached_image(p_dir, p_layer, p_color) + var/mutable_appearance/muta = mutable_appearance('icons/obj/atmospherics/pipes/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = layer - 0.01, appearance_flags = RESET_COLOR) + muta.color = p_color + return muta -/obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections() +/obj/machinery/atmospherics/pipe/layer_manifold/set_init_directions() switch(dir) if(NORTH, SOUTH) initialize_directions = NORTH|SOUTH if(EAST, WEST) initialize_directions = EAST|WEST -/obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer) +/obj/machinery/atmospherics/pipe/layer_manifold/is_connectable(obj/machinery/atmospherics/target, given_layer) if(!given_layer) return TRUE . = ..() -/obj/machinery/atmospherics/pipe/layer_manifold/proc/findAllConnections() +/obj/machinery/atmospherics/pipe/layer_manifold/proc/find_all_connections() front_nodes = list() back_nodes = list() - var/list/new_nodes = list() + nodes = list() for(var/iter in PIPING_LAYER_MIN to PIPING_LAYER_MAX) - var/obj/machinery/atmospherics/foundfront = findConnecting(dir, iter) - var/obj/machinery/atmospherics/foundback = findConnecting(turn(dir, 180), iter) + var/obj/machinery/atmospherics/foundfront = find_connecting(dir, iter) + var/obj/machinery/atmospherics/foundback = find_connecting(turn(dir, 180), iter) front_nodes += foundfront back_nodes += foundback if(foundfront && !QDELETED(foundfront)) - new_nodes += foundfront + nodes += foundfront if(foundback && !QDELETED(foundback)) - new_nodes += foundback - update_appearance() - return new_nodes + nodes += foundback + update_icon() + return nodes -/obj/machinery/atmospherics/pipe/layer_manifold/atmosinit() +/obj/machinery/atmospherics/pipe/layer_manifold/atmos_init() normalize_cardinal_directions() - findAllConnections() + find_all_connections() -/obj/machinery/atmospherics/pipe/layer_manifold/setPipingLayer() +/obj/machinery/atmospherics/pipe/layer_manifold/set_piping_layer() piping_layer = PIPING_LAYER_DEFAULT -/obj/machinery/atmospherics/pipe/layer_manifold/pipeline_expansion() - return get_all_connected_nodes() +/obj/machinery/atmospherics/pipe/layer_manifold/pipenet_expansion() + return nodes /obj/machinery/atmospherics/pipe/layer_manifold/disconnect(obj/machinery/atmospherics/reference) if(istype(reference, /obj/machinery/atmospherics/pipe)) - var/obj/machinery/atmospherics/pipe/P = reference - P.destroy_network() - while(reference in get_all_connected_nodes()) - if(reference in nodes) - var/i = nodes.Find(reference) - nodes[i] = null - if(reference in front_nodes) - var/i = front_nodes.Find(reference) + var/obj/machinery/atmospherics/pipe/pipe_reference = reference + pipe_reference.destroy_network() + while(reference in nodes) + var/i = nodes.Find(reference) + nodes[i] = null + i = front_nodes.Find(reference) + if(i) front_nodes[i] = null - if(reference in back_nodes) - var/i = back_nodes.Find(reference) + i = back_nodes.Find(reference) + if(i) back_nodes[i] = null - update_appearance() + update_icon() /obj/machinery/atmospherics/pipe/layer_manifold/relaymove(mob/living/user, direction) if(initialize_directions & direction) diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm deleted file mode 100644 index 93353618e61ef..0000000000000 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ /dev/null @@ -1,50 +0,0 @@ -//3-Way Manifold - -/obj/machinery/atmospherics/pipe/manifold - icon = 'icons/obj/atmospherics/pipes/manifold.dmi' - icon_state = "manifold-3" - - name = "pipe manifold" - desc = "A manifold composed of regular pipes." - - dir = SOUTH - initialize_directions = EAST|NORTH|WEST - - device_type = TRINARY - - construction_type = /obj/item/pipe/trinary - pipe_state = "manifold" - - FASTDMM_PROP(\ - pipe_type = PIPE_TYPE_MANIFOLD,\ - pipe_interference_group = "atmos-[piping_layer]"\ - ) - - var/mutable_appearance/center - -/* We use New() instead of Initialize() because these values are used in update_icon() - * in the mapping subsystem init before Initialize() is called in the atoms subsystem init. - * This is true for the other manifolds (the 4 ways and the heat exchanges) too. - */ -/obj/machinery/atmospherics/pipe/manifold/New() - icon_state = "" - center = mutable_appearance(icon, "manifold_center") - return ..() - -/obj/machinery/atmospherics/pipe/manifold/SetInitDirections() - initialize_directions = NORTH|SOUTH|EAST|WEST - initialize_directions &= ~dir - -/obj/machinery/atmospherics/pipe/manifold/update_icon() - cut_overlays() - if(!center) - center = mutable_appearance(icon, "manifold_center") - PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - add_overlay(center) - - //Add non-broken pieces - for(var/i in 1 to device_type) - if(nodes[i]) - add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) - - update_layer() diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm deleted file mode 100644 index 48e47d5405805..0000000000000 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ /dev/null @@ -1,44 +0,0 @@ -//4-Way Manifold - -/obj/machinery/atmospherics/pipe/manifold4w - icon = 'icons/obj/atmospherics/pipes/manifold.dmi' - icon_state = "manifold4w-3" - - name = "4-way pipe manifold" - desc = "A manifold composed of regular pipes." - - initialize_directions = ALL_CARDINALS - - device_type = QUATERNARY - - construction_type = /obj/item/pipe/quaternary - pipe_state = "manifold4w" - - FASTDMM_PROP(\ - pipe_type = PIPE_TYPE_MANIFOLD4W,\ - pipe_interference_group = "atmos-[piping_layer]"\ - ) - - var/mutable_appearance/center - -/obj/machinery/atmospherics/pipe/manifold4w/New() - icon_state = "" - center = mutable_appearance(icon, "manifold4w_center") - return ..() - -/obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections() - initialize_directions = initial(initialize_directions) - -/obj/machinery/atmospherics/pipe/manifold4w/update_icon() - cut_overlays() - if(!center) - center = mutable_appearance(icon, "manifold_center") - PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) - add_overlay(center) - - //Add non-broken pieces - for(var/i in 1 to device_type) - if(nodes[i]) - add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) - - update_layer() diff --git a/code/modules/atmospherics/machinery/pipes/mapping.dm b/code/modules/atmospherics/machinery/pipes/mapping.dm index 1be896d3882c6..dce09be9092ed 100644 --- a/code/modules/atmospherics/machinery/pipes/mapping.dm +++ b/code/modules/atmospherics/machinery/pipes/mapping.dm @@ -1,84 +1,100 @@ //Colored pipes, use these for mapping -#define HELPER_PARTIAL(Fulltype, Type, Iconbase, Color) \ - ##Fulltype { \ - pipe_color = Color; \ - color = Color; \ - } \ - ##Fulltype/visible { \ - hide = FALSE; \ - layer = GAS_PIPE_VISIBLE_LAYER; \ - FASTDMM_PROP(pipe_group = "atmos-[piping_layer]-"+Type+"-visible");\ - } \ - ##Fulltype/visible/layer2 { \ - piping_layer = 2; \ - icon_state = Iconbase + "-2"; \ - } \ - ##Fulltype/visible/layer4 { \ - piping_layer = 4; \ - icon_state = Iconbase + "-4"; \ - } \ - ##Fulltype/visible/layer1 { \ - piping_layer = 1; \ - icon_state = Iconbase + "-1"; \ - } \ - ##Fulltype/visible/layer5 { \ - piping_layer = 5; \ - icon_state = Iconbase + "-5"; \ - } \ - ##Fulltype/hidden { \ - hide = TRUE; \ - } \ - ##Fulltype/hidden/layer2 { \ - piping_layer = 2; \ - icon_state = Iconbase + "-2"; \ - } \ - ##Fulltype/hidden/layer4 { \ - piping_layer = 4; \ - icon_state = Iconbase + "-4"; \ - } \ - ##Fulltype/hidden/layer1 { \ - piping_layer = 1; \ - icon_state = Iconbase + "-1"; \ - } \ - ##Fulltype/hidden/layer5 { \ - piping_layer = 5; \ - icon_state = Iconbase + "-5"; \ +#define HELPER_PIPING_LAYER(Fulltype) \ + ##Fulltype/layer1 { \ + piping_layer = 1; \ + } \ + ##Fulltype/layer2 { \ + piping_layer = 2; \ + } \ + ##Fulltype/layer4 { \ + piping_layer = 4; \ + } \ + ##Fulltype/layer5 { \ + piping_layer = 5; \ } -#define HELPER_PARTIAL_NAMED(Fulltype, Type, Iconbase, Color, Name) \ - HELPER_PARTIAL(Fulltype, Type, Iconbase, Color) \ - ##Fulltype { \ - name = Name; \ +#define HELPER_PARTIAL(Fulltype, Iconbase, Color) \ + HELPER_PIPING_LAYER(Fulltype/visible) \ + HELPER_PIPING_LAYER(Fulltype/hidden) \ + ##Fulltype { \ + pipe_color = Color; \ + color = Color; \ + } \ + ##Fulltype/visible { \ + hide = FALSE; \ + layer = GAS_PIPE_VISIBLE_LAYER; \ + } \ + ##Fulltype/visible/layer2 { \ + icon_state = Iconbase + "-2"; \ + } \ + ##Fulltype/visible/layer4 { \ + icon_state = Iconbase + "-4"; \ + } \ + ##Fulltype/visible/layer1 { \ + icon_state = Iconbase + "-1"; \ + } \ + ##Fulltype/visible/layer5 { \ + icon_state = Iconbase + "-5"; \ + } \ + ##Fulltype/hidden { \ + hide = TRUE; \ + } \ + ##Fulltype/hidden/layer2 { \ + icon_state = Iconbase + "-2"; \ + } \ + ##Fulltype/hidden/layer4 { \ + icon_state = Iconbase + "-4"; \ + } \ + ##Fulltype/hidden/layer1 { \ + icon_state = Iconbase + "-1"; \ + } \ + ##Fulltype/hidden/layer5 { \ + icon_state = Iconbase + "-5"; \ + } + +#define HELPER_PARTIAL_NAMED(Fulltype, Iconbase, Name, Color) \ + HELPER_PARTIAL(Fulltype, Iconbase, Color) \ + ##Fulltype { \ + name = Name; \ } #define HELPER(Type, Color) \ - HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/simple/##Type, #Type, "pipe11", Color) \ - HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold/##Type, #Type, "manifold", Color) \ - HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold4w/##Type, #Type, "manifold4w", Color) \ - HELPER_PARTIAL(/obj/effect/mapping_helpers/simple_pipes/##Type, #Type, "pipe", Color) + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/smart/simple/##Type, "pipe11", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/smart/manifold/##Type, "manifold", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/smart/manifold4w/##Type, "manifold4w", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/bridge_pipe/##Type, "bridge_map", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/layer_manifold/##Type, "manifoldlayer", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/components/binary/pump/off/##Type, "pump_map", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/components/binary/pump/on/##Type, "pump_on_map", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/multiz/##Type, "adapter", Color) \ #define HELPER_NAMED(Type, Name, Color) \ - HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/simple/##Type, #Type, "pipe11", Color, Name) \ - HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold/##Type, #Type, "manifold", Color, Name) \ - HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold4w/##Type, #Type, "manifold4w", Color, Name) \ - HELPER_PARTIAL_NAMED(/obj/effect/mapping_helpers/simple_pipes/##Type, #Type, "pipe", Color, Name) + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/smart/simple/##Type, "pipe11", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/smart/manifold/##Type, "manifold", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/smart/manifold4w/##Type, "manifold4w", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/bridge_pipe/##Type, "bridge_map", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/layer_manifold/##Type, "manifoldlayer", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/components/binary/pump/off/##Type, "pump_map", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/components/binary/pump/on/##Type, "pump_on_map", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/multiz/##Type, "adapter", Name, Color) \ -HELPER(general, null) -HELPER(yellow, rgb(255, 198, 0)) -HELPER(cyan, rgb(0, 255, 249)) -HELPER(green, rgb(30, 255, 0)) -HELPER(orange, rgb(255, 129, 25)) -HELPER(purple, rgb(128, 0, 182)) -HELPER(dark, rgb(69, 69, 69)) -HELPER(brown, rgb(178, 100, 56)) -HELPER(violet, rgb(64, 0, 128)) -HELPER(amethyst, rgb(130, 43, 255)) +HELPER(yellow, COLOR_YELLOW) +HELPER(general, COLOR_VERY_LIGHT_GRAY) +HELPER(cyan, COLOR_CYAN) +HELPER(green, COLOR_VIBRANT_LIME) +HELPER(orange, COLOR_ENGINEERING_ORANGE) +HELPER(purple, COLOR_PURPLE) +HELPER(dark, COLOR_DARK) +HELPER(brown, COLOR_BROWN) +HELPER(violet, COLOR_STRONG_VIOLET) +HELPER(pink, COLOR_LIGHT_PINK) -HELPER_NAMED(scrubbers, "scrubbers pipe", rgb(255, 0, 0)) -HELPER_NAMED(supply, "air supply pipe", rgb(0, 0, 255)) +HELPER_NAMED(scrubbers, "scrubbers pipe", COLOR_RED) +HELPER_NAMED(supply, "air supply pipe", COLOR_BLUE) #undef HELPER_NAMED #undef HELPER #undef HELPER_PARTIAL_NAMED #undef HELPER_PARTIAL +#undef HELPER_PIPING_LAYER diff --git a/code/modules/atmospherics/machinery/pipes/multiz.dm b/code/modules/atmospherics/machinery/pipes/multiz.dm index 699e4ab965f8a..21e45e18c75aa 100644 --- a/code/modules/atmospherics/machinery/pipes/multiz.dm +++ b/code/modules/atmospherics/machinery/pipes/multiz.dm @@ -10,7 +10,7 @@ hide = FALSE layer = HIGH_OBJ_LAYER - device_type = UNARY + device_type = TRINARY paintable = FALSE construction_type = /obj/item/pipe/directional @@ -32,7 +32,7 @@ pipe = mutable_appearance(icon, "pipe-[piping_layer]") return ..() -/obj/machinery/atmospherics/pipe/multiz/SetInitDirections() +/obj/machinery/atmospherics/pipe/multiz/set_init_directions() initialize_directions = dir /obj/machinery/atmospherics/pipe/multiz/update_icon() @@ -44,15 +44,15 @@ add_overlay(center) /// Attempts to locate a multiz pipe that's above us, if it finds one it merges us into its pipenet -/obj/machinery/atmospherics/pipe/multiz/pipeline_expansion() +/obj/machinery/atmospherics/pipe/multiz/pipenet_expansion() var/turf/T = get_turf(src) for(var/obj/machinery/atmospherics/pipe/multiz/above in GET_TURF_ABOVE(T)) - if(above.piping_layer == piping_layer) - nodes += above - above.nodes += src // Two way travel :) + if(is_connectable(above, piping_layer)) + nodes[2] = above + above.nodes[3] = src //Two way travel :) for(var/obj/machinery/atmospherics/pipe/multiz/below in GET_TURF_BELOW(T)) - if(below.piping_layer == piping_layer) - below.pipeline_expansion() // If we've got one below us, force it to add us on facebook + if(is_connectable(below, piping_layer)) + below.pipenet_expansion() // If we've got one below us, force it to add us on facebook return ..() // MAPPING diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 4438640af5597..5c4e2e4ce9522 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -1,11 +1,16 @@ /obj/machinery/atmospherics/pipe + icon = 'icons/obj/atmospherics/pipes/pipes_bitmask.dmi' damage_deflection = 12 - var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke + /// Temporary holder for gases in the absence of a pipenet + var/datum/gas_mixture/air_temporary + /// The gas capacity this pipe contributes to a pipenet var/volume = 0 use_power = NO_POWER_USE can_unwrench = 1 - var/datum/pipeline/parent = null + /// The pipenet this pipe is a member of + var/datum/pipenet/parent = null + paintable = TRUE //Buckling @@ -13,15 +18,12 @@ buckle_requires_restraints = 1 buckle_lying = NO_BUCKLE_LYING - FASTDMM_PROP(\ - set_instance_vars(\ - icon_state = INSTANCE_VAR_DEFAULT\ - ),\ - ) + vis_flags = VIS_INHERIT_PLANE /obj/machinery/atmospherics/pipe/New() add_atom_colour(pipe_color, FIXED_COLOUR_PRIORITY) - volume = 35 * device_type + if(!volume) // Pipes can have specific volumes or have it determined by their device_type. + volume = UNARY_PIPE_VOLUME * device_type ..() ///I have no idea why there's a new and at this point I'm too afraid to ask @@ -29,83 +31,108 @@ . = ..() if(hide) - AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) - -/obj/machinery/atmospherics/pipe/nullifyNode(i) - var/obj/machinery/atmospherics/oldN = nodes[i] - ..() - if(oldN) - SSair.add_to_rebuild_queue(oldN) + AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) //if changing this, change the subtypes RemoveElements too, because thats how bespoke works -/obj/machinery/atmospherics/pipe/destroy_network() +/obj/machinery/atmospherics/pipe/on_deconstruction(disassembled) + //we delete the parent here so it initializes air_temporary for us. See /datum/pipenet/Destroy() which calls temporarily_store_air() QDEL_NULL(parent) -/obj/machinery/atmospherics/pipe/build_network() - if(QDELETED(parent)) - parent = new - parent.build_pipeline(src) - -/obj/machinery/atmospherics/pipe/proc/releaseAirToTurf() if(air_temporary) var/turf/T = loc T.assume_air(air_temporary) - air_update_turf() + + return ..() + +/obj/machinery/atmospherics/pipe/Destroy() + QDEL_NULL(parent) + return ..() + +/obj/machinery/atmospherics/pipe/proc/update_pipe_icon() + switch(initialize_directions) + if(NORTH, EAST, SOUTH, WEST) // Pipes with only a single connection aren't handled by this system + icon = null + return + else + icon = 'icons/obj/atmospherics/pipes/pipes_bitmask.dmi' + var/connections = NONE + var/bitfield = NONE + for(var/i in 1 to device_type) + if(!nodes[i]) + continue + var/obj/machinery/atmospherics/node = nodes[i] + var/connected_dir = get_dir(src, node) + connections |= connected_dir + bitfield = CARDINAL_TO_FULLPIPES(connections) + bitfield |= CARDINAL_TO_SHORTPIPES(initialize_directions & ~connections) + icon_state = "[bitfield]_[piping_layer]" + +/obj/machinery/atmospherics/pipe/update_icon() + update_pipe_icon() + update_layer() + return ..() + +/obj/machinery/atmospherics/proc/update_node_icon() + for(var/i in 1 to device_type) + if(nodes[i]) + var/obj/machinery/atmospherics/N = nodes[i] + N.update_icon() + +/obj/machinery/atmospherics/pipe/paint(paint_color) + if(paintable) + add_atom_colour(paint_color, FIXED_COLOUR_PRIORITY) + pipe_color = paint_color + update_node_icon() + return paintable + +//----------------- +// PIPENET STUFF + +/obj/machinery/atmospherics/pipe/nullify_node(i) + var/obj/machinery/atmospherics/old_node = nodes[i] + . = ..() + if(old_node) + SSair.add_to_rebuild_queue(old_node) + +/obj/machinery/atmospherics/pipe/destroy_network() + QDEL_NULL(parent) + +/obj/machinery/atmospherics/pipe/get_rebuild_targets() + if(!QDELETED(parent)) + return + replace_pipenet(parent, new /datum/pipenet) + return list(parent) /obj/machinery/atmospherics/pipe/return_air() - if(parent) - return parent.air + if(air_temporary) + return air_temporary + return parent.air /obj/machinery/atmospherics/pipe/return_analyzable_air() - if(parent) - return parent.air + if(air_temporary) + return air_temporary + return parent.air /obj/machinery/atmospherics/pipe/remove_air(amount) + if(air_temporary) + return air_temporary.remove(amount) return parent.air.remove(amount) -/obj/machinery/atmospherics/pipe/remove_air_ratio(ratio) - return parent.air.remove_ratio(ratio) - -/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/pipe_meter)) - var/obj/item/pipe_meter/meter = W +/obj/machinery/atmospherics/pipe/attackby(obj/item/item, mob/user, params) + if(istype(item, /obj/item/pipe_meter)) + var/obj/item/pipe_meter/meter = item user.dropItemToGround(meter) - meter.setAttachLayer(piping_layer) + meter.set_attach_layer(piping_layer) else return ..() -/obj/machinery/atmospherics/pipe/returnPipenet() - if(parent) - return parent.air - -/obj/machinery/atmospherics/pipe/setPipenet(datum/pipeline/P) - parent = P - -/obj/machinery/atmospherics/pipe/Destroy() - QDEL_NULL(parent) - - releaseAirToTurf() - QDEL_NULL(air_temporary) +/obj/machinery/atmospherics/pipe/return_pipenet() + return parent - var/turf/T = loc - for(var/obj/machinery/meter/meter in T) - if(meter.target == src) - var/obj/item/pipe_meter/PM = new (T) - meter.transfer_fingerprints_to(PM) - qdel(meter) - . = ..() - -/obj/machinery/atmospherics/pipe/proc/update_node_icon() - for(var/i in 1 to device_type) - if(nodes[i]) - var/obj/machinery/atmospherics/N = nodes[i] - N.update_icon() +/obj/machinery/atmospherics/pipe/replace_pipenet(datum/pipenet/old_pipenet, datum/pipenet/new_pipenet) + parent = new_pipenet -/obj/machinery/atmospherics/pipe/returnPipenets() +/obj/machinery/atmospherics/pipe/return_pipenets() . = list(parent) -/obj/machinery/atmospherics/pipe/paint(paint_color) - if(paintable) - add_atom_colour(paint_color, FIXED_COLOUR_PRIORITY) - pipe_color = paint_color - update_node_icon() - return paintable +/obj/machinery/atmospherics/pipe/update_layer() + layer = (HAS_TRAIT(src, TRAIT_T_RAY_VISIBLE) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001) diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm deleted file mode 100644 index da6fab8c66d0d..0000000000000 --- a/code/modules/atmospherics/machinery/pipes/simple.dm +++ /dev/null @@ -1,37 +0,0 @@ -// Simple Pipe -// The regular pipe you see everywhere, including bent ones. - -/obj/machinery/atmospherics/pipe/simple - icon = 'icons/obj/atmospherics/pipes/simple.dmi' - icon_state = "pipe11-3" - - name = "pipe" - desc = "A one meter section of regular pipe." - - dir = SOUTH - initialize_directions = SOUTH|NORTH - pipe_flags = PIPING_CARDINAL_AUTONORMALIZE - - device_type = BINARY - - construction_type = /obj/item/pipe/binary/bendable - pipe_state = "simple" - - FASTDMM_PROP(\ - pipe_type = PIPE_TYPE_SIMPLE,\ - pipe_interference_group = "atmos-[piping_layer]"\ - ) - -/obj/machinery/atmospherics/pipe/simple/SetInitDirections() - if(dir in GLOB.diagonals) - initialize_directions = dir - return - switch(dir) - if(NORTH, SOUTH) - initialize_directions = SOUTH|NORTH - if(EAST, WEST) - initialize_directions = EAST|WEST - -/obj/machinery/atmospherics/pipe/simple/update_icon() - icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]" - update_layer() diff --git a/code/modules/atmospherics/machinery/pipes/smart.dm b/code/modules/atmospherics/machinery/pipes/smart.dm new file mode 100644 index 0000000000000..38cde9635e775 --- /dev/null +++ b/code/modules/atmospherics/machinery/pipes/smart.dm @@ -0,0 +1,103 @@ +GLOBAL_LIST_INIT(atmos_components, typecacheof(list(/obj/machinery/atmospherics))) +//Smart pipes... or are they? +/obj/machinery/atmospherics/pipe/smart + icon = 'icons/obj/atmospherics/pipes/simple.dmi' + icon_state = "pipe11-3" + + name = "pipe" + desc = "A one meter section of regular pipe." + + device_type = QUATERNARY + construction_type = /obj/item/pipe/quaternary + pipe_state = "manifold4w" + + ///Current active connections + var/connections = NONE + +/obj/machinery/atmospherics/pipe/smart/update_pipe_icon() + icon = 'icons/obj/atmospherics/pipes/pipes_bitmask.dmi' + + //find all directions this pipe is connected with other nodes + connections = NONE + var/new_volume = 0 + for(var/i in 1 to device_type) + if(!nodes[i]) + continue + var/obj/machinery/atmospherics/node = nodes[i] + var/connected_dir = get_dir(src, node) + connections |= connected_dir + new_volume += UNARY_PIPE_VOLUME + new_volume = max(new_volume, UNARY_PIPE_VOLUME * 2) + + if(parent && parent.air && parent.air.volume) + parent.air.volume = parent.air.volume + new_volume - volume // Update associate pipenet with new volume. + volume = new_volume + + + //set the correct direction for this node in case of binary directions + switch(connections) + if(EAST | WEST) + dir = EAST + if(SOUTH | NORTH) + dir = SOUTH + else + dir = connections + + // Smart pipe icons differ from classic pipe icons in that we stop adding + // short pipe directions as soon as we find a valid sprite, rather than + // adding in all connectable directions. + // This prevents a lot of visual clutter, though it does make it harder to + // notice completely disconnected pipes. + var/bitfield = CARDINAL_TO_FULLPIPES(connections) + if(ISSTUB(connections)) + var/bits_to_add = NONE + if(connections != NONE) + bits_to_add |= REVERSE_DIR(connections) & initialize_directions + + var/candidate = 0 + var/shift = 0 + + // Note that candidates "should" never reach 0, as stub pipes are not allowed and break things + while (ISSTUB(connections | bits_to_add) && (initialize_directions >> shift)!=0) + //lets see if this direction is eligable to be added + candidate = initialize_directions & (1 << shift) + //we dont want to add connections again else it creates wrong values & its also redundant[bitfield was already initialized with connections so we shoudnt append it again] + if(!(candidate & connections)) + bits_to_add |= candidate + shift += 1 + bitfield |= CARDINAL_TO_SHORTPIPES(bits_to_add) + icon_state = "[bitfield]_[piping_layer]" + +/obj/machinery/atmospherics/pipe/smart/set_init_directions(init_dir) + if(init_dir) + initialize_directions = init_dir + var/j = 1 + for (var/i in 1 to 4) + if (init_dir & j) + volume += UNARY_PIPE_VOLUME + j << 1 + volume = max(volume, UNARY_PIPE_VOLUME * 2) // Minimum 2 directions + else + initialize_directions = ALL_CARDINALS + volume = UNARY_PIPE_VOLUME * 4 + +//mapping helpers +/obj/machinery/atmospherics/pipe/smart/simple + icon = 'icons/obj/atmospherics/pipes/simple.dmi' + icon_state = "pipe11-3" + +/obj/machinery/atmospherics/pipe/smart/manifold + icon = 'icons/obj/atmospherics/pipes/manifold.dmi' + icon_state = "manifold-3" + +/obj/machinery/atmospherics/pipe/smart/manifold4w + icon = 'icons/obj/atmospherics/pipes/manifold.dmi' + icon_state = "manifold4w-3" + +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2 + icon = 'icons/obj/atmospherics/pipes/manifold.dmi' + icon_state = "manifold4w-2" + +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubber/hidden/layer4 + icon = 'icons/obj/atmospherics/pipes/manifold.dmi' + icon_state = "manifold4w-4" diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 332750033261d..41b11283ad295 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -1,4 +1,7 @@ +///The default pressure for releasing air into an holding tank or the turf #define CAN_DEFAULT_RELEASE_PRESSURE (ONE_ATMOSPHERE) +///The temperature resistance of this canister +#define TEMPERATURE_RESISTANCE (1000 + T0C) /obj/machinery/portable_atmospherics/canister name = "canister" @@ -8,52 +11,33 @@ greyscale_config = /datum/greyscale_config/canister/hazard greyscale_colors = "#ffff00#000000" density = TRUE - volume = 1000 + volume = 2000 armor_type = /datum/armor/portable_atmospherics_canister - max_integrity = 250 + max_integrity = 300 integrity_failure = 0.4 pressure_resistance = 7 * ONE_ATMOSPHERE req_access = list() var/icon/canister_overlay_file = 'icons/obj/atmospherics/canisters.dmi' + ///Is the valve open? var/valve_open = FALSE + ///Used to log opening and closing of the valve, available on VV var/release_log = "" + ///How much the canister should be filled (recommended from 0 to 1) var/filled = 0.5 - var/gas_type + ///Maximum pressure allowed on initialize inside the canister, multiplied by the filled var + var/maximum_pressure = 90 * ONE_ATMOSPHERE + ///Stores the path of the gas for mapped canisters + var/datum/gas/gas_type + ///Player controlled var that set the release pressure of the canister var/release_pressure = ONE_ATMOSPHERE - var/can_max_release_pressure = (ONE_ATMOSPHERE * 10) - var/can_min_release_pressure = (ONE_ATMOSPHERE / 10) - var/temperature_resistance = 1000 + T0C - var/starter_temp = T20C - // Prototype vars - var/prototype = FALSE - var/valve_timer = null - var/timer_set = 30 - var/default_timer_set = 30 - var/minimum_timer_set = 1 - var/maximum_timer_set = 300 - var/timing = FALSE - var/restricted = FALSE - - var/update = 0 - var/static/list/label2types = list( - "n2" = /obj/machinery/portable_atmospherics/canister/nitrogen, - "o2" = /obj/machinery/portable_atmospherics/canister/oxygen, - "co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide, - "plasma" = /obj/machinery/portable_atmospherics/canister/plasma, - "n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide, - "no2" = /obj/machinery/portable_atmospherics/canister/nitryl, - "bz" = /obj/machinery/portable_atmospherics/canister/bz, - "air" = /obj/machinery/portable_atmospherics/canister/air, - "water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor, - "tritium" = /obj/machinery/portable_atmospherics/canister/tritium, - "hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob, - "stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum, - "pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium, - "caution" = /obj/machinery/portable_atmospherics/canister, - ) - + ///Is shielding turned on/off + var/shielding_powered = FALSE + ///The powercell used to enable shielding + var/obj/item/stock_parts/cell/internal_cell + ///used while processing to update appearance only when its pressure state changes + var/current_pressure_state /datum/armor/portable_atmospherics_canister melee = 50 @@ -65,199 +49,48 @@ fire = 80 acid = 50 -/obj/machinery/portable_atmospherics/canister/Initialize(mapload) - . = ..() - AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/canister_valve)) - -/obj/item/circuit_component/canister_valve - display_name = "Canister Valve" - desc = "The interface for communicating with a canister's valve." - var/obj/machinery/portable_atmospherics/canister/attached_can - - /// Toggles the canister's valve - var/datum/port/input/toggle - /// Set's the can's target pressure value - var/datum/port/input/pressure - -/obj/item/circuit_component/canister_valve/populate_ports() - toggle = add_input_port("Toggle", PORT_TYPE_SIGNAL) - pressure = add_input_port("Target Pressure", PORT_TYPE_NUMBER) - -/obj/item/circuit_component/canister_valve/register_usb_parent(atom/movable/shell) +/obj/machinery/portable_atmospherics/canister/Initialize(mapload, datum/gas_mixture/existing_mixture) . = ..() - if(istype(shell, /obj/machinery/portable_atmospherics/canister)) - attached_can = shell - -/obj/item/circuit_component/canister_valve/unregister_usb_parent(atom/movable/shell) - attached_can = null - return ..() + if(mapload) + internal_cell = new /obj/item/stock_parts/cell/high(src) -/obj/item/circuit_component/canister_valve/input_received(datum/port/input/port) - . = ..() - if(.) - return + if(existing_mixture) + air_contents.copy_from(existing_mixture) + else + create_gas() - if(!attached_can) - return + if(ispath(gas_type, /datum/gas)) + desc = "[GLOB.meta_gas_info[gas_type][META_GAS_NAME]]. [GLOB.meta_gas_info[gas_type][META_GAS_DESC]]" - var/logmsg + var/random_quality = rand() + pressure_limit = initial(pressure_limit) * (1 + 0.2 * random_quality) - if(COMPONENT_TRIGGERED_BY(toggle, port)) - logmsg = "Valve was toggled by [parent.get_creator_admin()]'s circuit, starting a transfer into \the [attached_can.holding || "air"].
    " - if(!attached_can.holding) - var/list/danger = list() - for(var/id in attached_can.air_contents.get_gases()) - if(!(GLOB.gas_data.flags[id] & GAS_FLAG_DANGEROUS)) - continue - if(attached_can.air_contents.get_moles(id) > (GLOB.gas_data.visibility[id] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility - danger[GLOB.gas_data.names[id]] = attached_can.air_contents.get_moles(id) //ex. "plasma" = 20 + update_icon() + AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/canister_valve)) + AddElement(/datum/element/atmos_sensitive, mapload) + AddElement(/datum/element/volatile_gas_storage) + AddComponent(/datum/component/gas_leaker, leak_rate=0.01) - if(danger.len && attached_can.valve_open) - message_admins("[parent.get_creator_admin()]'s circuit opened a canister that contains the following at [ADMIN_VERBOSEJMP(attached_can)]:") - log_admin("[parent.get_creator_admin()]'s circuit opened a canister that contains the following at [AREACOORD(attached_can)]:") - for(var/name in danger) - var/msg = "[name]: [danger[name]] moles." - log_admin(msg) - message_admins(msg) - attached_can.set_valve() - attached_can.release_log += logmsg - if(COMPONENT_TRIGGERED_BY(pressure, port)) - attached_can.release_pressure = clamp(round(pressure), attached_can.can_min_release_pressure, attached_can.can_max_release_pressure) - investigate_log("[attached_can.name] was set to [pressure] kPa by [parent.get_creator()]'s circuit'.", INVESTIGATE_ATMOS) +/obj/machinery/portable_atmospherics/canister/examine(user) + . = ..() + if(atom_integrity < max_integrity) + . += span_danger("Integrity compromised, repair hull with a welding tool.") + . += span_notice("A sticker on its side says MAX SAFE PRESSURE: [siunit_pressure(initial(pressure_limit), 0)]; MAX SAFE TEMPERATURE: [siunit(temp_limit, "K", 0)].") + . += span_notice("The hull is welded together and can be cut apart.") + if(internal_cell) + . += span_notice("The internal cell has [internal_cell.percent()]% of its total charge.") + else + . += span_notice("Warning, no cell installed, use a screwdriver to open the hatch and insert one.") + if(panel_open) + . += span_notice("Hatch open, close it with a screwdriver.") /obj/machinery/portable_atmospherics/canister/interact(mob/user) + . = ..() if(!allowed(user)) to_chat(user, span_warning("Error - Unauthorized User")) playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1) return - ..() - -/obj/machinery/portable_atmospherics/canister/air - name = "air canister" - desc = "Pre-mixed air." - greyscale_config = /datum/greyscale_config/canister - greyscale_colors = "#c6c0b5" - -/obj/machinery/portable_atmospherics/canister/bz - name = "\improper BZ canister" - desc = "BZ, a powerful hallucinogenic nerve agent." - gas_type = GAS_BZ - greyscale_config = /datum/greyscale_config/canister/double_stripe - greyscale_colors = "#9b5d7f#d0d2a0" - -/obj/machinery/portable_atmospherics/canister/carbon_dioxide - name = "co2 canister" - desc = "Carbon dioxide. What the fuck is carbon dioxide?" - gas_type = GAS_CO2 - greyscale_config = /datum/greyscale_config/canister - greyscale_colors = "#4e4c48" - -/obj/machinery/portable_atmospherics/canister/nitrogen - name = "n2 canister" - desc = "Nitrogen gas. Reportedly useful for something." - gas_type = GAS_N2 - greyscale_config = /datum/greyscale_config/canister - greyscale_colors = "#d41010" - -/obj/machinery/portable_atmospherics/canister/nitrous_oxide - name = "n2o canister" - desc = "Nitrous oxide gas. Known to cause drowsiness." - gas_type = GAS_NITROUS - greyscale_config = /datum/greyscale_config/canister/double_stripe - greyscale_colors = "#c63e3b#f7d5d3" - -/obj/machinery/portable_atmospherics/canister/nitryl - name = "nitryl canister" - desc = "Nitryl gas. Feels great 'til the acid eats your lungs." - gas_type = GAS_NITRYL - greyscale_config = /datum/greyscale_config/canister - greyscale_colors = "#7b4732" - -/obj/machinery/portable_atmospherics/canister/nob - name = "hyper-noblium canister" - desc = "Hyper-Noblium. More noble than all other gases." - gas_type = GAS_HYPERNOB - greyscale_config = /datum/greyscale_config/canister/double_stripe - greyscale_colors = "#6399fc#b2b2b2" - -/obj/machinery/portable_atmospherics/canister/oxygen - name = "o2 canister" - desc = "Oxygen. Necessary for human life." - gas_type = GAS_O2 - greyscale_config = /datum/greyscale_config/canister/stripe - greyscale_colors = "#2786e5#e8fefe" - -/obj/machinery/portable_atmospherics/canister/pluoxium - name = "pluoxium canister" - desc = "Pluoxium. Like oxygen, but more bang for your buck." - gas_type = GAS_PLUOXIUM - greyscale_config = /datum/greyscale_config/canister - greyscale_colors = "#2786e5" - -/obj/machinery/portable_atmospherics/canister/stimulum - name = "stimulum canister" - desc = "Stimulum. High energy gas, high energy people." - gas_type = GAS_STIMULUM - greyscale_config = /datum/greyscale_config/canister - greyscale_colors = "#9b5d7f" - -/obj/machinery/portable_atmospherics/canister/plasma - name = "plasma canister" - desc = "Plasma gas. The reason YOU are here. Highly toxic." - gas_type = GAS_PLASMA - greyscale_config = /datum/greyscale_config/canister/hazard - greyscale_colors = "#f64300#000000" - -/obj/machinery/portable_atmospherics/canister/tritium - name = "tritium canister" - desc = "Tritium. Inhalation might cause irradiation." - gas_type = GAS_TRITIUM - greyscale_config = /datum/greyscale_config/canister/hazard - greyscale_colors = "#3fcd40#000000" - -/obj/machinery/portable_atmospherics/canister/water_vapor - name = "water vapor canister" - desc = "Water Vapor. We get it, you vape." - gas_type = GAS_H2O - filled = 1 - greyscale_config = /datum/greyscale_config/canister/double_stripe - greyscale_colors = "#4c4e4d#f7d5d3" - - -/obj/machinery/portable_atmospherics/canister/proc/get_time_left() - if(timing) - . = round(max(0, valve_timer - world.time) / 10, 1) - else - . = timer_set - -/obj/machinery/portable_atmospherics/canister/proc/set_active() - timing = !timing - if(timing) - valve_timer = world.time + (timer_set * 10) - update_icon() - -/obj/machinery/portable_atmospherics/canister/proto - name = "prototype canister" - greyscale_config = /datum/greyscale_config/prototype_canister - greyscale_colors = "#ffffff#a50021#ffffff" - -/obj/machinery/portable_atmospherics/canister/proto/default - name = "prototype canister" - desc = "The best way to fix an atmospheric emergency... or the best way to introduce one." - volume = 5000 - max_integrity = 300 - temperature_resistance = 2000 + T0C - can_max_release_pressure = (ONE_ATMOSPHERE * 30) - can_min_release_pressure = (ONE_ATMOSPHERE / 30) - prototype = TRUE - -/obj/machinery/portable_atmospherics/canister/proto/default/oxygen - name = "prototype canister" - desc = "A prototype canister for a prototype bike, what could go wrong?" - gas_type = GAS_O2 - filled = 1 - release_pressure = ONE_ATMOSPHERE*2 /obj/machinery/portable_atmospherics/canister/vv_get_dropdown() . = ..() @@ -278,95 +111,108 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/portable_atmospherics/canister) create_gas() update_icon() - -/obj/machinery/portable_atmospherics/canister/proc/create_gas() - if(gas_type) - if(starter_temp) - air_contents.set_temperature(starter_temp) - if(!air_contents.return_volume()) - CRASH("Auxtools is failing somehow! Gas with pointer [air_contents._extools_pointer_gasmixture] is not valid.") - air_contents.set_moles(gas_type, (maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) - -/obj/machinery/portable_atmospherics/canister/air/create_gas() - air_contents.set_temperature(starter_temp) - air_contents.set_moles(GAS_O2, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) - air_contents.set_moles(GAS_N2, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) - /obj/machinery/portable_atmospherics/canister/update_icon() . = ..() update_overlays() /obj/machinery/portable_atmospherics/canister/update_overlays() . = ..() - if(machine_stat & BROKEN) - . += mutable_appearance(canister_overlay_file, "broken") - return - var/last_update = update - update = 0 + if(shielding_powered) + . += mutable_appearance(canister_overlay_file, "shielding") + . += emissive_appearance(canister_overlay_file, "shielding", layer) + + if(panel_open) + . += mutable_appearance(canister_overlay_file, "cell_hatch") + if(machine_stat & BROKEN) + . += mutable_appearance(canister_overlay_file, "broken") if(holding) . += mutable_appearance(canister_overlay_file, "can-open") if(connected_port) . += mutable_appearance(canister_overlay_file, "can-connector") - var/pressure = air_contents.return_pressure() - switch(pressure) - if((40 * ONE_ATMOSPHERE) to INFINITY) - . += mutable_appearance(canister_overlay_file, "can-3") - if((10 * ONE_ATMOSPHERE) to (40 * ONE_ATMOSPHERE)) - . += mutable_appearance(canister_overlay_file, "can-2") - if((5 * ONE_ATMOSPHERE) to (10 * ONE_ATMOSPHERE)) - . += mutable_appearance(canister_overlay_file, "can-1") - if((10) to (5 * ONE_ATMOSPHERE)) - . += mutable_appearance(canister_overlay_file, "can-0") - if(update == last_update) - return + var/light_state = get_pressure_state() + if(light_state) //happens when pressure is below 10kpa which means no light + . += mutable_appearance(canister_overlay_file, light_state) + . += emissive_appearance(canister_overlay_file, "[light_state]-light", layer, src.alpha) -/obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > temperature_resistance) - take_damage(5, BURN, 0) +/obj/machinery/portable_atmospherics/canister/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > TEMPERATURE_RESISTANCE && !shielding_powered) +/obj/machinery/portable_atmospherics/canister/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(5, BURN, 0) -/obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - if(!(machine_stat & BROKEN)) - canister_break() - if(disassembled) - new /obj/item/stack/sheet/iron (loc, 10) +/obj/machinery/portable_atmospherics/canister/on_deconstruction(disassembled = TRUE) + if(!(machine_stat & BROKEN)) + canister_break() + if(!disassembled) + new /obj/item/stack/sheet/iron (drop_location(), 5) + qdel(src) + return + new /obj/item/stack/sheet/iron (drop_location(), 10) + if(internal_cell) + internal_cell.forceMove(drop_location()) + +/obj/machinery/portable_atmospherics/canister/attackby(obj/item/item, mob/user, params) + if(istype(item, /obj/item/stock_parts/cell)) + var/obj/item/stock_parts/cell/active_cell = item + if(!panel_open) + balloon_alert(user, "open hatch first!") + return TRUE + if(!user.transferItemToLoc(active_cell, src)) + return TRUE + if(internal_cell) + user.put_in_hands(internal_cell) + balloon_alert(user, "you replace the cell") else - new /obj/item/stack/sheet/iron (loc, 5) - qdel(src) + balloon_alert(user, "you install the cell") + internal_cell = active_cell + return TRUE + return ..() -/obj/machinery/portable_atmospherics/canister/welder_act(mob/living/user, obj/item/I) - if(user.a_intent == INTENT_HARM) - return FALSE +/obj/machinery/portable_atmospherics/canister/screwdriver_act(mob/living/user, obj/item/screwdriver) + if(default_deconstruction_screwdriver(user, icon_state, icon_state, screwdriver)) + update_appearance() + return TRUE - if(machine_stat & BROKEN) - if(!I.tool_start_check(user, amount=0)) - return TRUE - to_chat(user, span_notice("You begin cutting [src] apart...")) - if(I.use_tool(src, user, 30, volume=50)) - deconstruct(TRUE) - else - to_chat(user, span_notice("You cannot slice [src] apart when it isn't broken.")) +/obj/machinery/portable_atmospherics/canister/crowbar_act(mob/living/user, obj/item/tool) + if(!panel_open || !internal_cell) + return TRUE + internal_cell.forceMove(drop_location()) + balloon_alert(user, "cell removed") return TRUE +/obj/machinery/portable_atmospherics/canister/Exited(atom/movable/gone, direction) + . = ..() + if(gone == internal_cell) + internal_cell = null + +/obj/machinery/portable_atmospherics/canister/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0) + . = ..() + if(!. || QDELETED(src)) + return + SSair.start_processing_machine(src) + /obj/machinery/portable_atmospherics/canister/atom_break(damage_flag) . = ..() if(!.) return canister_break() +/** + * Handle canisters disassemble, releases the gas content in the turf + */ /obj/machinery/portable_atmospherics/canister/proc/canister_break() disconnect() + var/datum/gas_mixture/expelled_gas = air_contents.remove(air_contents.total_moles()) var/turf/T = get_turf(src) - T.assume_air(air_contents) - air_update_turf() + T.assume_air(expelled_gas) - set_machine_stat(machine_stat | BROKEN) - density = FALSE + atom_break() + + set_density(FALSE) playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) update_icon() investigate_log("was destroyed.", INVESTIGATE_ATMOS) @@ -388,27 +234,67 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/portable_atmospherics/canister) else if(valve_open && holding) user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) +/obj/machinery/portable_atmospherics/canister/process(seconds_per_tick) + if(!shielding_powered) + return + + var/our_pressure = air_contents.return_pressure() + var/our_temperature = air_contents.return_temperature() + var/energy_factor = round(log(10, max(our_pressure - pressure_limit, 1)) + log(10, max(our_temperature - temp_limit, 1))) + var/energy_consumed = energy_factor * 250 * seconds_per_tick + + if(!energy_consumed) + return + + if(powered(AREA_USAGE_EQUIP)) + use_power(energy_consumed, AREA_USAGE_EQUIP) + else if(!internal_cell?.use(energy_consumed * 0.025)) + shielding_powered = FALSE + SSair.start_processing_machine(src) + investigate_log("shielding turned off due to power loss") + update_icon() + +///return the icon_state component for the canister's indicator light based on its current pressure reading +/obj/machinery/portable_atmospherics/canister/proc/get_pressure_state() + var/air_pressure = air_contents.return_pressure() + switch(air_pressure) + if((40 * ONE_ATMOSPHERE) to INFINITY) + return "can-3" + if((10 * ONE_ATMOSPHERE) to (40 * ONE_ATMOSPHERE)) + return "can-2" + if((5 * ONE_ATMOSPHERE) to (10 * ONE_ATMOSPHERE)) + return "can-1" + if((10) to (5 * ONE_ATMOSPHERE)) + return "can-0" + else + return null + /obj/machinery/portable_atmospherics/canister/process_atmos() - ..() if(machine_stat & BROKEN) return PROCESS_KILL - if(timing && valve_timer < world.time) - valve_open = !valve_open - timing = FALSE // Handle gas transfer. if(valve_open) - var/turf/T = get_turf(src) - var/datum/gas_mixture/target_air = holding ? holding.air_contents : T.return_air() + var/turf/location = get_turf(src) + var/datum/gas_mixture/target_air = holding?.return_air() || location.return_air() + excited = TRUE - if(air_contents.release_gas_to(target_air, release_pressure) && !holding) - air_update_turf() - update_icon() + if(air_contents.release_gas_to(target_air, release_pressure)) + if(!holding) + air_update_turf(FALSE, FALSE) -/obj/machinery/portable_atmospherics/canister/ui_status(mob/user) - . = ..() - if(. > UI_UPDATE && !allowed(user)) - . = UI_UPDATE + // A bit different than other atmos devices. Wont stop if currently taking damage. + if(take_atmos_damage()) + update_icon() + excited = TRUE + return ..() //we have already updated appearance so dont need to update again below + + var/new_pressure_state = get_pressure_state() + if(current_pressure_state != new_pressure_state) //update apperance only when its pressure changes significantly from its current value + update_icon() + current_pressure_state = new_pressure_state + + return ..() /obj/machinery/portable_atmospherics/canister/ui_state(mob/user) return GLOB.physical_state @@ -417,148 +303,337 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/portable_atmospherics/canister) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Canister") + ui.set_autoupdate(TRUE) // Canister pressure, tank pressure ui.open() - ui.set_autoupdate(TRUE) // Canister pressure, tank pressure, prototype canister timer + +/obj/machinery/portable_atmospherics/canister/ui_static_data(mob/user) + return list( + "defaultReleasePressure" = round(CAN_DEFAULT_RELEASE_PRESSURE), + "minReleasePressure" = round(CAN_MIN_RELEASE_PRESSURE), + "maxReleasePressure" = round(CAN_MAX_RELEASE_PRESSURE), + "pressureLimit" = round(pressure_limit), + "holdingTankLeakPressure" = round(TANK_LEAK_PRESSURE), + "holdingTankFragPressure" = round(TANK_FRAGMENT_PRESSURE) + ) /obj/machinery/portable_atmospherics/canister/ui_data() var/data = list() - data["portConnected"] = connected_port ? 1 : 0 + data["portConnected"] = !!connected_port data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) - data["releasePressure"] = round(release_pressure ? release_pressure : 0) - data["defaultReleasePressure"] = round(CAN_DEFAULT_RELEASE_PRESSURE) - data["minReleasePressure"] = round(can_min_release_pressure) - data["maxReleasePressure"] = round(can_max_release_pressure) - data["valveOpen"] = valve_open ? 1 : 0 - - data["isPrototype"] = prototype ? 1 : 0 - if (prototype) - data["restricted"] = restricted - data["timing"] = timing - data["time_left"] = get_time_left() - data["timer_set"] = timer_set - data["timer_is_not_default"] = timer_set != default_timer_set - data["timer_is_not_min"] = timer_set != minimum_timer_set - data["timer_is_not_max"] = timer_set != maximum_timer_set - - data["hasHoldingTank"] = holding ? 1 : 0 + data["releasePressure"] = round(release_pressure) + data["valveOpen"] = !!valve_open + data["hasHoldingTank"] = !!holding if (holding) + var/datum/gas_mixture/holding_mix = holding.return_air() data["holdingTank"] = list() data["holdingTank"]["name"] = holding.name - data["holdingTank"]["tankPressure"] = round(holding.air_contents.return_pressure()) + data["holdingTank"]["tankPressure"] = round(holding_mix.return_pressure()) + + data["shielding"] = shielding_powered + data["cellCharge"] = internal_cell ? internal_cell.percent() : 0 return data -/obj/machinery/portable_atmospherics/canister/ui_act(action, params) - if(..()) +/obj/machinery/portable_atmospherics/canister/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) return switch(action) if("relabel") - var/label = input("New canister label:", name) as null|anything in sort_list(label2types) + var/label = tgui_input_list(usr, "New canister label", "Canister", GLOB.gas_id_to_canister) if(label && !..()) - var/newtype = label2types[label] - if(newtype) - var/obj/machinery/portable_atmospherics/canister/replacement = newtype - name = initial(replacement.name) - desc = initial(replacement.desc) - icon_state = initial(replacement.icon_state) - set_greyscale(initial(replacement.greyscale_colors), initial(replacement.greyscale_config)) - if("restricted") - if(!prototype) - return // Prototype canister only feature - restricted = !restricted - if(restricted) - req_access = list(ACCESS_ENGINE) - else - req_access = list() - . = TRUE + var/newtype = GLOB.gas_id_to_canister[label] + if(isnull(newtype)) + return + var/obj/machinery/portable_atmospherics/canister/replacement = newtype + investigate_log("was relabelled to [initial(replacement.name)] by [key_name(usr)].", INVESTIGATE_ATMOS) + name = initial(replacement.name) + desc = initial(replacement.desc) + icon_state = initial(replacement.icon_state) + set_greyscale(initial(replacement.greyscale_colors), initial(replacement.greyscale_config)) if("pressure") var/pressure = params["pressure"] if(pressure == "reset") pressure = CAN_DEFAULT_RELEASE_PRESSURE . = TRUE else if(pressure == "min") - pressure = can_min_release_pressure + pressure = CAN_MIN_RELEASE_PRESSURE . = TRUE else if(pressure == "max") - pressure = can_max_release_pressure + pressure = CAN_MAX_RELEASE_PRESSURE . = TRUE else if(pressure == "input") - pressure = input("New release pressure ([can_min_release_pressure]-[can_max_release_pressure] kPa):", name, release_pressure) as num|null - if(!isnull(pressure) && !..()) + pressure = tgui_input_number(usr, message = "New release pressure", title = "Canister Pressure", default = release_pressure, max_value = CAN_MAX_RELEASE_PRESSURE, min_value = CAN_MIN_RELEASE_PRESSURE, round_value = FALSE) + if(!isnull(pressure)) . = TRUE else if(text2num(pressure) != null) pressure = text2num(pressure) . = TRUE if(.) - release_pressure = clamp(round(pressure), can_min_release_pressure, can_max_release_pressure) + release_pressure = clamp(pressure, CAN_MIN_RELEASE_PRESSURE, CAN_MAX_RELEASE_PRESSURE) investigate_log("was set to [release_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS) if("valve") - set_valve(usr) + toggle_valve(usr) . = TRUE - /* // Apparently the timer isn't present in TGUI - commenting out so it can't be used via exploits - if("timer") - if(!prototype) - return - var/change = params["change"] - switch(change) - if("reset") - timer_set = default_timer_set - . = TRUE - if("decrease") - timer_set = max(minimum_timer_set, timer_set - 10) - . = TRUE - if("increase") - timer_set = min(maximum_timer_set, timer_set + 10) - . = TRUE - if("input") - var/user_input = input(usr, "Set time to valve toggle.", name) as null|num - if(!user_input) - return - var/N = text2num(user_input) - if(!N) - return - timer_set = clamp(N,minimum_timer_set,maximum_timer_set) - log_admin("[key_name(usr)] has activated a prototype valve timer") - . = TRUE - if("toggle_timer") - set_active() - . = TRUE - */ if("eject") - if(holding) - if(valve_open) - message_admins("[ADMIN_LOOKUPFLW(usr)] removed [holding] from [src] with valve still open at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_boldannounce("air")].") - usr.investigate_log(" removed the [holding], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS) - replace_tank(usr, FALSE) + if(eject_tank(usr)) . = TRUE + if("shielding") + toggle_shielding(usr) + . = TRUE + ui_update() update_icon() -/obj/machinery/portable_atmospherics/canister/proc/set_valve(mob/user) - var/logmsg +/obj/machinery/portable_atmospherics/canister/proc/toggle_valve(mob/user, wire_pulsed = FALSE) valve_open = !valve_open + if(!valve_open) + var/logmsg = "valve was closed by [key_name(user)] [wire_pulsed ? "via wire pulse" : ""], stopping the transfer into \the [holding || "air"].
    " + investigate_log(logmsg, INVESTIGATE_ATMOS) + release_log += logmsg + return + + SSair.start_processing_machine(src) + if(holding) + var/logmsg = "Valve was opened by [key_name(user)] [wire_pulsed ? "via wire pulse" : ""], starting a transfer into \the [holding || "air"].
    " + investigate_log(logmsg, INVESTIGATE_ATMOS) + release_log += logmsg + return + + // Go over the gases in canister, pull all their info and mark the spooky ones + var/list/output = list() + output += "[key_name(user)] opened a canister [wire_pulsed ? "via wire pulse" : ""] that contains the following:" + var/list/admin_output = list() + admin_output += "[ADMIN_LOOKUPFLW(user)] opened a canister [wire_pulsed ? "via wire pulse" : ""] that contains the following at [ADMIN_VERBOSEJMP(src)]:" + var/list/gases = air_contents.gases + var/danger = FALSE + for(var/gas_index in 1 to length(gases)) + var/list/gas_info = gases[gases[gas_index]] + var/list/meta = gas_info[GAS_META] + var/name = meta[META_GAS_NAME] + var/moles = gas_info[MOLES] + + output += "[name]: [moles] moles." + if(gas_index <= 5) //the first five gases added + admin_output += "[name]: [moles] moles." + else if(gas_index == 6) // anddd the warning + admin_output += "Too many gases to log. Check investigate log." + //if moles_visible is undefined, default to default visibility + if(meta[META_GAS_DANGER] && moles > (meta[META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) + danger = TRUE + + if(danger) //sent to admin's chat if contains dangerous gases + message_admins(admin_output.Join("\n")) + var/logmsg = output.Join("\n") + investigate_log(logmsg, INVESTIGATE_ATMOS) + release_log += logmsg + +/// Turns canister shielding on or off +/obj/machinery/portable_atmospherics/canister/proc/toggle_shielding(mob/user, wire_pulsed = FALSE) + shielding_powered = !shielding_powered + SSair.start_processing_machine(src) + message_admins("[ADMIN_LOOKUPFLW(user)] turned [shielding_powered ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] powered shielding.") + user.investigate_log("turned [shielding_powered ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] powered shielding.") + update_icon() + +/// Ejects tank from canister, if any +/obj/machinery/portable_atmospherics/canister/proc/eject_tank(mob/user, wire_pulsed = FALSE) + if(!holding) + return FALSE if(valve_open) - SEND_SIGNAL(src, COMSIG_VALVE_SET_OPEN, TRUE) - if(user) - logmsg = "Valve was opened by [key_name(user)], starting a transfer into \the [holding || "air"].
    " - if(!holding) + message_admins("[ADMIN_LOOKUPFLW(user)] removed [holding] from [src] with valve still open [wire_pulsed ? "via wire pulse" : ""] at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_boldannounce("air")].") + user.investigate_log("removed the [holding] [wire_pulsed ? "via wire pulse" : ""], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS) + replace_tank(user, FALSE) + return TRUE + +/obj/machinery/portable_atmospherics/canister/unregister_holding() + valve_open = FALSE + return ..() + +/obj/machinery/portable_atmospherics/canister/take_atmos_damage() + return shielding_powered ? FALSE : ..() + +//////////// Circuit stuffs! /////////////////////////////////////////////////// + +/obj/item/circuit_component/canister_valve + display_name = "Canister Valve" + desc = "The interface for communicating with a canister's valve." + + var/obj/machinery/portable_atmospherics/canister/attached_can + + /// Toggles the canister's valve + var/datum/port/input/toggle + /// Set's the can's target pressure value + var/datum/port/input/pressure + +/obj/item/circuit_component/canister_valve/populate_ports() + toggle = add_input_port("Toggle", PORT_TYPE_SIGNAL) + pressure = add_input_port("Target Pressure", PORT_TYPE_NUMBER) + +/obj/item/circuit_component/canister_valve/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/portable_atmospherics/canister)) + attached_can = shell + +/obj/item/circuit_component/canister_valve/unregister_usb_parent(atom/movable/shell) + attached_can = null + return ..() + +/obj/item/circuit_component/canister_valve/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_can) + return + + var/logmsg + + if(COMPONENT_TRIGGERED_BY(toggle, port)) + logmsg = "Valve was toggled by [parent.get_creator_admin()]'s circuit, starting a transfer into \the [attached_can.holding || "air"].
    " + if(!attached_can.holding) var/list/danger = list() - for(var/id in air_contents.get_gases()) - if(!(GLOB.gas_data.flags[id] & GAS_FLAG_DANGEROUS)) + var/datum/gas_mixture/attached_can_air = attached_can.return_air() + for(var/id in attached_can_air.gases) + if(!(GLOB.meta_gas_info[id][META_GAS_DANGER])) continue - if(air_contents.get_moles(id) > (GLOB.gas_data.visibility[id] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility - danger[GLOB.gas_data.names[id]] = air_contents.get_moles(id) //ex. "plasma" = 20 + if(attached_can_air.gases[id][MOLES] > (GLOB.meta_gas_info[id][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility + danger[GLOB.meta_gas_info[id][META_GAS_NAME]] = attached_can_air.gases[id][MOLES] //ex. "plasma" = 20 - if(danger.len && user) - message_admins("[ADMIN_LOOKUPFLW(user)] opened a canister that contains the following at [ADMIN_VERBOSEJMP(src)]:") - log_admin("[key_name(user)] opened a canister that contains the following at [AREACOORD(src)]:") + if(danger.len && attached_can.valve_open) + message_admins("[parent.get_creator_admin()]'s circuit opened a canister that contains the following at [ADMIN_VERBOSEJMP(attached_can)]:") + log_admin("[parent.get_creator_admin()]'s circuit opened a canister that contains the following at [AREACOORD(attached_can)]:") for(var/name in danger) var/msg = "[name]: [danger[name]] moles." log_admin(msg) message_admins(msg) - else - SEND_SIGNAL(src, COMSIG_VALVE_SET_OPEN, FALSE) - if(user) - logmsg = "Valve was closed by [key_name(user)], stopping the transfer into \the [holding || "air"].
    " - investigate_log(logmsg, INVESTIGATE_ATMOS) - release_log += logmsg + attached_can.toggle_valve() + attached_can.release_log += logmsg + if(COMPONENT_TRIGGERED_BY(pressure, port)) + attached_can.release_pressure = clamp(round(pressure), CAN_MIN_RELEASE_PRESSURE, CAN_MAX_RELEASE_PRESSURE) + investigate_log("[attached_can.name] was set to [pressure] kPa by [parent.get_creator()]'s circuit'.", INVESTIGATE_ATMOS) + +///////////////////Canister Presets//////////////////////////////////// + +/obj/machinery/portable_atmospherics/canister/air + name = "air canister" + desc = "Pre-mixed air." + greyscale_config = /datum/greyscale_config/canister + greyscale_colors = "#c6c0b5" + +/obj/machinery/portable_atmospherics/canister/bz + name = "\improper BZ canister" + desc = "BZ, a powerful hallucinogenic nerve agent." + gas_type = /datum/gas/bz + greyscale_config = /datum/greyscale_config/canister/double_stripe + greyscale_colors = "#9b5d7f#d0d2a0" + +/obj/machinery/portable_atmospherics/canister/carbon_dioxide + name = "co2 canister" + desc = "Carbon dioxide. What the fuck is carbon dioxide?" + gas_type = /datum/gas/carbon_dioxide + greyscale_config = /datum/greyscale_config/canister + greyscale_colors = "#4e4c48" + +/obj/machinery/portable_atmospherics/canister/nitrogen + name = "n2 canister" + desc = "Nitrogen gas. Reportedly useful for something." + gas_type = /datum/gas/nitrogen + greyscale_config = /datum/greyscale_config/canister + greyscale_colors = "#d41010" + +/obj/machinery/portable_atmospherics/canister/nitrous_oxide + name = "n2o canister" + desc = "Nitrous oxide gas. Known to cause drowsiness." + gas_type = /datum/gas/nitrous_oxide + greyscale_config = /datum/greyscale_config/canister/double_stripe + greyscale_colors = "#c63e3b#f7d5d3" + +/obj/machinery/portable_atmospherics/canister/nitryl + name = "nitryl canister" + desc = "Nitryl gas. Feels great 'til the acid eats your lungs." + gas_type = /datum/gas/nitryl + greyscale_config = /datum/greyscale_config/canister + greyscale_colors = "#7b4732" + +/obj/machinery/portable_atmospherics/canister/nob + name = "hyper-noblium canister" + desc = "Hyper-Noblium. More noble than all other gases." + gas_type = /datum/gas/hypernoblium + greyscale_config = /datum/greyscale_config/canister/double_stripe + greyscale_colors = "#6399fc#b2b2b2" + +/obj/machinery/portable_atmospherics/canister/oxygen + name = "o2 canister" + desc = "Oxygen. Necessary for human life." + gas_type = /datum/gas/oxygen + greyscale_config = /datum/greyscale_config/canister/stripe + greyscale_colors = "#2786e5#e8fefe" + +/obj/machinery/portable_atmospherics/canister/pluoxium + name = "pluoxium canister" + desc = "Pluoxium. Like oxygen, but more bang for your buck." + gas_type = /datum/gas/pluoxium + greyscale_config = /datum/greyscale_config/canister + greyscale_colors = "#2786e5" + +/obj/machinery/portable_atmospherics/canister/stimulum + name = "stimulum canister" + desc = "Stimulum. High energy gas, high energy people." + gas_type = /datum/gas/stimulum + greyscale_config = /datum/greyscale_config/canister + greyscale_colors = "#9b5d7f" + +/obj/machinery/portable_atmospherics/canister/plasma + name = "plasma canister" + desc = "Plasma gas. The reason YOU are here. Highly toxic." + gas_type = /datum/gas/plasma + greyscale_config = /datum/greyscale_config/canister/hazard + greyscale_colors = "#f64300#000000" + +/obj/machinery/portable_atmospherics/canister/tritium + name = "tritium canister" + desc = "Tritium. Inhalation might cause irradiation." + gas_type = /datum/gas/tritium + greyscale_config = /datum/greyscale_config/canister/hazard + greyscale_colors = "#3fcd40#000000" + +/obj/machinery/portable_atmospherics/canister/water_vapor + name = "water vapor canister" + desc = "Water Vapor. We get it, you vape." + gas_type = /datum/gas/water_vapor + filled = 1 + greyscale_config = /datum/greyscale_config/canister/double_stripe + greyscale_colors = "#4c4e4d#f7d5d3" + +/obj/machinery/portable_atmospherics/canister/fusion_test + name = "fusion test canister" + desc = "Don't be a badmin." + temp_limit = 1e12 + pressure_limit = 1e14 + +/** + * Called on Initialize(), fill the canister with the gas_type specified up to the filled level (half if 0.5, full if 1) + * Used for canisters spawned in maps and by admins + */ +/obj/machinery/portable_atmospherics/canister/proc/create_gas() + if(!gas_type) + return + air_contents.add_gas(gas_type) + air_contents.gases[gas_type][MOLES] = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) + SSair.start_processing_machine(src) + +/obj/machinery/portable_atmospherics/canister/air/create_gas() + air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen) + air_contents.gases[/datum/gas/oxygen][MOLES] = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) + air_contents.gases[/datum/gas/nitrogen][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) + SSair.start_processing_machine(src) + +/obj/machinery/portable_atmospherics/canister/fusion_test/create_gas() + air_contents.add_gases(/datum/gas/carbon_dioxide, /datum/gas/tritium) + air_contents.gases[/datum/gas/carbon_dioxide][MOLES] = 300 + air_contents.gases[/datum/gas/tritium][MOLES] = 300 + air_contents.temperature = 10000 + SSair.start_processing_machine(src) + #undef CAN_DEFAULT_RELEASE_PRESSURE +#undef TEMPERATURE_RESISTANCE diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index b668cf265106a..b20196f3d7c7f 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -1,3 +1,5 @@ +#define PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT 0 + /obj/machinery/portable_atmospherics name = "portable_atmospherics" icon = 'icons/obj/atmos.dmi' @@ -7,12 +9,23 @@ anchored = FALSE interacts_with_air = TRUE + ///Stores the gas mixture of the portable component. Don't access this directly, use return_air() so you support the temporary processing it provides var/datum/gas_mixture/air_contents + ///Stores the reference of the connecting port var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port + ///Stores the reference of the tank the machine is holding var/obj/item/tank/holding - + ///Volume (in L) of the inside of the machine var/volume = 0 - var/maximum_pressure = 90 * ONE_ATMOSPHERE + ///Used to track if anything of note has happen while running process_atmos(). + ///Treat it as a process_atmos() scope var, we just declare it here to pass it between parent calls. + ///Should be false on start of every process_atmos() proc, since true means we'll process again next tick. + var/excited = FALSE + + /// Max amount of heat allowed inside the machine before it starts to melt. [PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT] is special value meaning we are immune. + var/temp_limit = 100000 + /// Max amount of pressure allowed inside of the canister before it starts to break. [PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT] is special value meaning we are immune. + var/pressure_limit = 500000 /datum/armor/machinery_portable_atmospherics @@ -23,43 +36,70 @@ /obj/machinery/portable_atmospherics/Initialize(mapload) . = ..() - air_contents = new(volume) - air_contents.set_temperature(T20C) + air_contents = new + air_contents.volume = volume + air_contents.temperature = T20C SSair.start_processing_machine(src) /obj/machinery/portable_atmospherics/Destroy() - SSair.stop_processing_machine(src) disconnect() - qdel(air_contents) air_contents = null + SSair.stop_processing_machine(src) + return ..() /obj/machinery/portable_atmospherics/ex_act(severity, target) - if(severity == 1 || target == src) - if(resistance_flags & INDESTRUCTIBLE) - return //Indestructable cans shouldn't release air + if(resistance_flags & INDESTRUCTIBLE) + return FALSE //Indestructible cans shouldn't release air + if(severity == EXPLODE_DEVASTATE || target == src) //This explosion will destroy the can, release its air. - var/turf/T = get_turf(src) - T.assume_air(air_contents) - T.air_update_turf() + var/turf/local_turf = get_turf(src) + local_turf.assume_air(air_contents) return ..() -/obj/machinery/portable_atmospherics/analyzer_act(mob/living/user, obj/item/I) - if(..() && holding) - return atmosanalyzer_scan(user, holding, TRUE) - /obj/machinery/portable_atmospherics/process_atmos() - if(!connected_port && air_contents != null && src != null) // Pipe network handles reactions if connected. - air_contents.react(src) + excited = (excited | air_contents.react(src)) + if(!excited) + return PROCESS_KILL + excited = FALSE + +/// Take damage if a variable is exceeded. Damage is equal to temp/limit * heat/limit. +/// The damage multiplier is treated as 1 if something is being ignored while the other one is exceeded. +/// On most cases only one will be exceeded, so the other one is scaled down. +/obj/machinery/portable_atmospherics/proc/take_atmos_damage() + var/taking_damage = FALSE + + var/temp_damage = 1 + var/pressure_damage = 1 + + if(temp_limit != PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT) + temp_damage = air_contents.temperature / temp_limit + taking_damage = temp_damage > 1 + + if(pressure_limit != PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT) + pressure_damage = air_contents.return_pressure() / pressure_limit + taking_damage = taking_damage || pressure_damage > 1 + + if(!taking_damage) + return FALSE + + take_damage(clamp(temp_damage * pressure_damage, 5, 50), BURN, 0) + return TRUE /obj/machinery/portable_atmospherics/return_air() + SSair.start_processing_machine(src) return air_contents /obj/machinery/portable_atmospherics/return_analyzable_air() return air_contents +/** + * Allow the portable machine to be connected to a connector + * Arguments: + * * new_port - the connector that we trying to connect to + */ /obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/components/unary/portables_connector/new_port) //Make sure not already connected to something else if(connected_port || !new_port || new_port.connected_device) @@ -72,12 +112,15 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src - connected_port.parents[1].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + var/datum/pipenet/connected_port_parent = connected_port.parents[1] + if(connected_port_parent) + connected_port_parent.reconcile_air() set_anchored(TRUE) //Prevent movement pixel_x = new_port.pixel_x pixel_y = new_port.pixel_y + SSair.start_processing_machine(src) update_appearance() return TRUE @@ -86,85 +129,111 @@ if(.) disconnect() +/** + * Allow the portable machine to be disconnected from the connector + */ /obj/machinery/portable_atmospherics/proc/disconnect() if(!connected_port) return FALSE - anchored = FALSE + set_anchored(FALSE) connected_port.connected_device = null connected_port = null pixel_x = 0 pixel_y = 0 + SSair.start_processing_machine(src) update_appearance() return TRUE -/obj/machinery/portable_atmospherics/portableConnectorReturnAir() - return air_contents - /obj/machinery/portable_atmospherics/AltClick(mob/living/user) . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, !ismonkey(user)) || !can_interact(user)) return - if(holding) - to_chat(user, span_notice("You remove [holding] from [src].")) - replace_tank(user, TRUE) + if(!holding) + return + to_chat(user, span_notice("You remove [holding] from [src].")) + replace_tank(user, TRUE) /obj/machinery/portable_atmospherics/examine(mob/user) . = ..() - if(holding) - . += "[span_notice("\The [src] contains [holding]. Alt-click [src] to remove it.")]\n"+\ - span_notice("Click [src] with another gas tank to hot swap [holding].") + if(!holding) + return + . += span_notice("\The [src] contains [holding]. Alt-click [src] to remove it.") + . += span_notice("Click [src] with another gas tank to hot swap [holding].") +/** + * Allow the player to place a tank inside the machine. + * Arguments: + * * User: the player doing the act + * * close_valve: used in the canister.dm file, check if the valve is open or not + * * new_tank: the tank we are trying to put in the machine + */ /obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank) + if(machine_stat & BROKEN) + return FALSE if(!user) return FALSE - if(holding) + if(new_tank && !user.transferItemToLoc(new_tank, src)) + return FALSE + if(holding && new_tank)//for when we are actually switching tanks + investigate_log("had its internal [holding] swapped with [new_tank] by [key_name(user)].", INVESTIGATE_ATMOS) + to_chat(user, span_notice("In one smooth motion you pop [holding] out of [src]'s connector and replace it with [new_tank].")) user.put_in_hands(holding) + UnregisterSignal(holding, COMSIG_PARENT_QDELETING) + holding = new_tank + RegisterSignal(holding, COMSIG_PARENT_QDELETING, PROC_REF(unregister_holding)) + else if(holding)//we remove a tank + investigate_log("had its internal [holding] removed by [key_name(user)].", INVESTIGATE_ATMOS) + to_chat(user, span_notice("You remove [holding] from [src].")) + if(Adjacent(user)) + user.put_in_hands(holding) + else + holding.forceMove(get_turf(src)) + UnregisterSignal(holding, COMSIG_PARENT_QDELETING) holding = null - if(new_tank) + else if(new_tank)//we insert the tank + investigate_log("had [new_tank] inserted into it by [key_name(user)].", INVESTIGATE_ATMOS) + to_chat(user, span_notice("You insert [new_tank] into [src].")) holding = new_tank - update_appearance() + RegisterSignal(holding, COMSIG_PARENT_QDELETING, PROC_REF(unregister_holding)) + + SSair.start_processing_machine(src) + update_icon() return TRUE -/obj/machinery/portable_atmospherics/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/tank)) - if(!(machine_stat & BROKEN)) - var/obj/item/tank/T = W - if(!user.transferItemToLoc(T, src)) - return - to_chat(user, span_notice("[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].")) - investigate_log("had its internal [holding] swapped with [T] by [key_name(user)].", INVESTIGATE_ATMOS) - replace_tank(user, FALSE, T) - update_appearance() - else if(W.tool_behaviour == TOOL_WRENCH) - if(!(machine_stat & BROKEN)) - if(connected_port) - investigate_log("was disconnected from [connected_port] by [key_name(user)].", INVESTIGATE_ATMOS) - disconnect() - W.play_tool_sound(src) - user.visible_message( \ - "[user] disconnects [src].", \ - span_notice("You unfasten [src] from the port."), \ - span_italics("You hear a ratchet.")) - update_appearance() - return - else - var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in loc - if(!possible_port) - to_chat(user, span_notice("Nothing happens.")) - return - if(!connect(possible_port)) - to_chat(user, span_notice("[name] failed to connect to the port.")) - return - W.play_tool_sound(src) - user.visible_message( \ - "[user] connects [src].", \ - span_notice("You fasten [src] to the port."), \ - span_italics("You hear a ratchet.")) - update_appearance() - investigate_log("was connected to [possible_port] by [key_name(user)].", INVESTIGATE_ATMOS) - else - return ..() +/obj/machinery/portable_atmospherics/attackby(obj/item/item, mob/user, params) + if(istype(item, /obj/item/tank)) + return replace_tank(user, FALSE, item) + return ..() + +/obj/machinery/portable_atmospherics/wrench_act(mob/living/user, obj/item/wrench) + if(machine_stat & BROKEN) + return FALSE + if(connected_port) + investigate_log("was disconnected from [connected_port] by [key_name(user)].", INVESTIGATE_ATMOS) + disconnect() + wrench.play_tool_sound(src) + user.visible_message( \ + "[user] disconnects [src].", \ + span_notice("You unfasten [src] from the port."), \ + span_italics("You hear a ratchet.")) + update_appearance() + return TRUE + var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in loc + if(!possible_port) + to_chat(user, span_notice("Nothing happens.")) + return FALSE + if(!connect(possible_port)) + to_chat(user, span_notice("[name] failed to connect to the port.")) + return FALSE + wrench.play_tool_sound(src) + user.visible_message( \ + "[user] connects [src].", \ + span_notice("You fasten [src] to the port."), \ + span_italics("You hear a ratchet.")) + update_appearance() + investigate_log("was connected to [possible_port] by [key_name(user)].", INVESTIGATE_ATMOS) + return TRUE /obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user) if(I.force < 10 && !(machine_stat & BROKEN)) @@ -173,3 +242,26 @@ investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS) add_fingerprint(user) ..() + +/// Holding tanks can get to zero integrity and be destroyed without other warnings due to pressure change. +/// This checks for that case and removes our reference to it. +/obj/machinery/portable_atmospherics/proc/unregister_holding() + SIGNAL_HANDLER + + UnregisterSignal(holding, COMSIG_PARENT_QDELETING) + holding = null + + +/obj/machinery/portable_atmospherics/welder_act(mob/living/user, obj/item/I) + . = ..() + if(user.a_intent == INTENT_HARM) + return FALSE //We're attacking the machine. + + if(atom_integrity < max_integrity) + to_chat(user, span_notice("You begin welding [src] back together...")) + if(I.use_tool(src, user, 3 SECONDS, volume=50)) + update_integrity(max_integrity) + to_chat(user, span_notice("You weld [src] back together.")) + return TRUE + +#undef PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 68ce64d522f1d..d602f38fcc77b 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -1,9 +1,3 @@ -#define PUMP_OUT "out" -#define PUMP_IN "in" -#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25) -#define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10) -#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE) - /obj/machinery/portable_atmospherics/pump name = "portable air pump" desc = "It's a small portable air pump, capable of siphoning or pumping gasses into its surroundings. It has a decent internal gas storage, and a slot for external tanks. It can be wrenched to a connection port to join it into the pipe net." @@ -11,83 +5,22 @@ density = TRUE - + ///Is the machine on? var/on = FALSE + ///What direction is the machine pumping (into pump/port or out to the tank/area)? var/direction = PUMP_OUT + ///Player configurable, sets what's the release pressure var/target_pressure = ONE_ATMOSPHERE - var/obj/machinery/atmospherics/components/binary/pump/pump volume = 1000 -/obj/machinery/portable_atmospherics/pump/Initialize(mapload) +/obj/machinery/portable_atmospherics/pump/ComponentInitialize() . = ..() - pump = new(src, FALSE) - pump.on = TRUE - pump.machine_stat = 0 - SSair.add_to_rebuild_queue(pump) AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/portable_pump)) -/obj/item/circuit_component/portable_pump - display_name = "Pump Controller" - desc = "The interface for communicating with a portable pump." - - var/obj/machinery/portable_atmospherics/pump/attached_pump - - var/datum/port/input/turn_on - - var/datum/port/input/turn_off - - var/datum/port/input/pump_in - - var/datum/port/input/pump_out - - var/datum/port/input/target_pressure - -/obj/item/circuit_component/portable_pump/populate_ports() - turn_on = add_input_port("Turn On", PORT_TYPE_SIGNAL) - turn_off = add_input_port("Turn Off", PORT_TYPE_SIGNAL) - - pump_in = add_input_port("Set pump IN", PORT_TYPE_SIGNAL) - pump_out = add_input_port("Set pump OUT", PORT_TYPE_SIGNAL) - - target_pressure = add_input_port("Target Pressure", PORT_TYPE_NUMBER) - -/obj/item/circuit_component/portable_pump/register_usb_parent(atom/movable/shell) - . = ..() - if(istype(shell, /obj/machinery/portable_atmospherics/pump)) - attached_pump = shell - -/obj/item/circuit_component/portable_pump/unregister_usb_parent(atom/movable/shell) - attached_pump = null - return ..() - -/obj/item/circuit_component/portable_pump/input_received(datum/port/input/port) - . = ..() - if(.) - return - - if(!attached_pump) - return - - if(COMPONENT_TRIGGERED_BY(turn_on, port)) - attached_pump.on = TRUE - if(attached_pump.holding && (attached_pump.direction == PUMP_IN)) - investigate_log("[parent.get_creator()] started a transfer into [attached_pump.holding].", INVESTIGATE_ATMOS) - if(COMPONENT_TRIGGERED_BY(turn_off, port)) - attached_pump.on = FALSE - if(COMPONENT_TRIGGERED_BY(pump_in, port)) - attached_pump.direction = PUMP_IN - if(COMPONENT_TRIGGERED_BY(pump_out, port)) - attached_pump.direction = PUMP_OUT - if(COMPONENT_TRIGGERED_BY(target_pressure, port)) - attached_pump.target_pressure = clamp(round(target_pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE) - investigate_log("a portable pump was set to [attached_pump.target_pressure] kPa by [parent.get_creator()].", INVESTIGATE_ATMOS) - -/obj/machinery/portable_atmospherics/pump/Destroy() - var/turf/T = get_turf(src) - T.assume_air(air_contents) - air_update_turf() - QDEL_NULL(pump) +/obj/machinery/portable_atmospherics/pump/on_deconstruction(disassembled) + var/turf/local_turf = get_turf(src) + local_turf.assume_air(air_contents) return ..() /obj/machinery/portable_atmospherics/pump/update_icon() @@ -100,47 +33,58 @@ add_overlay("siphon-connector") /obj/machinery/portable_atmospherics/pump/process_atmos() - ..() + if(take_atmos_damage()) + excited = TRUE + return ..() + if(!on) - pump.airs[1] = null - pump.airs[2] = null - return + return ..() + + excited = TRUE + + var/turf/local_turf = get_turf(src) - var/turf/T = get_turf(src) - if(direction == PUMP_OUT) // Hook up the internal pump. - pump.airs[1] = holding ? holding.air_contents : air_contents - pump.airs[2] = holding ? air_contents : T.return_air() + var/datum/gas_mixture/sending + var/datum/gas_mixture/receiving + + if (holding) //Work with tank when inserted, otherwise - with area + sending = (direction == PUMP_IN ? holding.return_air() : air_contents) + receiving = (direction == PUMP_IN ? air_contents : holding.return_air()) else - pump.airs[1] = holding ? air_contents : T.return_air() - pump.airs[2] = holding ? holding.air_contents : air_contents + sending = (direction == PUMP_IN ? local_turf.return_air() : air_contents) + receiving = (direction == PUMP_IN ? air_contents : local_turf.return_air()) + + if(sending.pump_gas_to(receiving, target_pressure) && !holding) + air_update_turf(FALSE, FALSE) // Update the environment if needed. + + return ..() - pump.process_atmos() // Pump gas. - if(!holding) - air_update_turf() // Update the environment if needed. /obj/machinery/portable_atmospherics/pump/emp_act(severity) . = ..() if(. & EMP_PROTECT_SELF) return - if(is_operational) - if(prob(50 / severity)) - on = !on - if(prob(100 / severity)) - direction = PUMP_OUT - pump.target_pressure = rand(0, 100 * ONE_ATMOSPHERE) - update_icon() + if(!is_operational) + return + if(prob(50 / severity)) + on = !on + if(on) + SSair.start_processing_machine(src) + if(prob(100 / severity)) + direction = PUMP_OUT + target_pressure = rand(0, 100 * ONE_ATMOSPHERE) + update_icon() /obj/machinery/portable_atmospherics/pump/replace_tank(mob/living/user, close_valve) . = ..() - if(.) - if(close_valve) - if(on) - on = FALSE - update_icon() - else if(on && holding && direction == PUMP_OUT) - user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) - - + if(!.) + return + if(close_valve) + if(on) + on = FALSE + update_appearance() + else if(on && holding && direction == PUMP_OUT) + user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) /obj/machinery/portable_atmospherics/pump/ui_state(mob/user) return GLOB.physical_state @@ -155,10 +99,10 @@ /obj/machinery/portable_atmospherics/pump/ui_data() var/data = list() data["on"] = on - data["direction"] = direction == PUMP_IN ? TRUE : FALSE - data["connected"] = connected_port ? TRUE : FALSE + data["direction"] = direction + data["connected"] = !!connected_port data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) - data["target_pressure"] = round(pump.target_pressure ? pump.target_pressure : 0) + data["target_pressure"] = round(target_pressure ? target_pressure : 0) data["default_pressure"] = round(PUMP_DEFAULT_PRESSURE) data["min_pressure"] = round(PUMP_MIN_PRESSURE) data["max_pressure"] = round(PUMP_MAX_PRESSURE) @@ -166,7 +110,8 @@ if(holding) data["holding"] = list() data["holding"]["name"] = holding.name - data["holding"]["pressure"] = round(holding.air_contents.return_pressure()) + var/datum/gas_mixture/holding_mix = holding.return_air() + data["holding"]["pressure"] = round(holding_mix.return_pressure()) else data["holding"] = null return data @@ -177,9 +122,11 @@ switch(action) if("power") on = !on + if(on) + SSair.start_processing_machine(src) if(on && !holding) - var/plasma = air_contents.get_moles(GAS_PLASMA) - var/n2o = air_contents.get_moles(GAS_NITROUS) + var/plasma = GET_MOLES(/datum/gas/plasma, air_contents) + var/n2o = GET_MOLES(/datum/gas/nitrous_oxide, air_contents) if(n2o || plasma) message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]") log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]") @@ -209,17 +156,72 @@ pressure = text2num(pressure) . = TRUE if(.) - pump.target_pressure = clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE) - investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS) + target_pressure = clamp(pressure, PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE) + investigate_log("was set to [target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS) if("eject") if(holding) replace_tank(usr, FALSE) . = TRUE + update_icon() + +/obj/machinery/portable_atmospherics/pump/unregister_holding() + on = FALSE + return ..() + +//////////////////////////////////////// CIRCUIT STUFFS /////////////////////////////// + +/obj/item/circuit_component/portable_pump + display_name = "Pump Controller" + desc = "The interface for communicating with a portable pump." + + var/obj/machinery/portable_atmospherics/pump/attached_pump + + var/datum/port/input/turn_on + + var/datum/port/input/turn_off + + var/datum/port/input/pump_in + + var/datum/port/input/pump_out + + var/datum/port/input/target_pressure + +/obj/item/circuit_component/portable_pump/populate_ports() + turn_on = add_input_port("Turn On", PORT_TYPE_SIGNAL) + turn_off = add_input_port("Turn Off", PORT_TYPE_SIGNAL) + + pump_in = add_input_port("Set pump IN", PORT_TYPE_SIGNAL) + pump_out = add_input_port("Set pump OUT", PORT_TYPE_SIGNAL) + + target_pressure = add_input_port("Target Pressure", PORT_TYPE_NUMBER) + +/obj/item/circuit_component/portable_pump/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/portable_atmospherics/pump)) + attached_pump = shell + +/obj/item/circuit_component/portable_pump/unregister_usb_parent(atom/movable/shell) + attached_pump = null + return ..() + +/obj/item/circuit_component/portable_pump/input_received(datum/port/input/port) + . = ..() if(.) - update_icon() + return -#undef PUMP_OUT -#undef PUMP_IN -#undef PUMP_MAX_PRESSURE -#undef PUMP_MIN_PRESSURE -#undef PUMP_DEFAULT_PRESSURE + if(!attached_pump) + return + + if(COMPONENT_TRIGGERED_BY(turn_on, port)) + attached_pump.on = TRUE + if(attached_pump.holding && (attached_pump.direction == PUMP_IN)) + investigate_log("[parent.get_creator()] started a transfer into [attached_pump.holding].", INVESTIGATE_ATMOS) + if(COMPONENT_TRIGGERED_BY(turn_off, port)) + attached_pump.on = FALSE + if(COMPONENT_TRIGGERED_BY(pump_in, port)) + attached_pump.direction = PUMP_IN + if(COMPONENT_TRIGGERED_BY(pump_out, port)) + attached_pump.direction = PUMP_OUT + if(COMPONENT_TRIGGERED_BY(target_pressure, port)) + attached_pump.target_pressure = clamp(round(target_pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE) + investigate_log("a portable pump was set to [attached_pump.target_pressure] kPa by [parent.get_creator()].", INVESTIGATE_ATMOS) diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index fdfd77d663e06..7952ab2663ae6 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -5,18 +5,20 @@ density = TRUE - + ///Is the machine on? var/on = FALSE - var/volume_rate = 1000 - var/overpressure_m = 80 - volume = 1000 - - var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O) - -/obj/machinery/portable_atmospherics/scrubber/Destroy() - var/turf/T = get_turf(src) - T.assume_air(air_contents) - air_update_turf() + ///the rate the machine will scrub air + var/volume_rate = 650 + ///Multiplier with ONE_ATMOSPHERE, if the enviroment pressure is higher than that, the scrubber won't work + var/overpressure_m = 100 + ///List of gases that can be scrubbed + var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor) + + volume = 2000 + +/obj/machinery/portable_atmospherics/scrubber/on_deconstruction(disassembled) + var/turf/local_turf = get_turf(src) + local_turf.assume_air(air_contents) return ..() /obj/machinery/portable_atmospherics/scrubber/update_icon() @@ -29,23 +31,65 @@ add_overlay("scrubber-connector") /obj/machinery/portable_atmospherics/scrubber/process_atmos() - ..() + if(take_atmos_damage()) + excited = TRUE + return ..() + if(!on) - return + return ..() - if(holding) - scrub(holding.air_contents) - else - var/turf/T = get_turf(src) - scrub(T.return_air()) + excited = TRUE + + if(!isnull(holding)) + scrub(holding.return_air()) + return ..() + + var/turf/epicentre = get_turf(src) + if(isopenturf(epicentre)) + scrub(epicentre.return_air()) + for(var/turf/open/openturf as anything in epicentre.get_atmos_adjacent_turfs(alldir = TRUE)) + scrub(openturf.return_air()) + return ..() -/obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture) + +/** + * Called in process_atmos(), handles the scrubbing of the given gas_mixture + * Arguments: + * * mixture: the gas mixture to be scrubbed + */ +/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/environment) if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE) return - mixture.scrub_into(air_contents, volume_rate / mixture.return_volume(), scrubbing) - if(!holding) - air_update_turf() + var/list/env_gases = environment.gases + + //contains all of the gas we're sucking out of the tile, gets put into our parent pipenet + var/datum/gas_mixture/filtered_out = new + var/list/filtered_gases = filtered_out.gases + filtered_out.temperature = environment.temperature + + //maximum percentage of the turfs gas we can filter + var/removal_ratio = min(1, volume_rate / environment.volume) + + var/total_moles_to_remove = 0 + for(var/gas in scrubbing & env_gases) + total_moles_to_remove += env_gases[gas][MOLES] + + if(total_moles_to_remove == 0)//sometimes this gets non gc'd values + environment.garbage_collect() + return FALSE + + for(var/gas in scrubbing & env_gases) + filtered_out.add_gas(gas) + var/transferred_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MOLAR_ACCURACY*1000, env_gases[gas][MOLES])) + + filtered_gases[gas][MOLES] = transferred_moles + env_gases[gas][MOLES] -= transferred_moles + + environment.garbage_collect() + + //Remix the resulting gases + air_contents.merge(filtered_out) /obj/machinery/portable_atmospherics/scrubber/emp_act(severity) . = ..() @@ -54,6 +98,8 @@ if(is_operational) if(prob(50 / severity)) on = !on + if(on) + SSair.start_processing_machine(src) update_appearance() @@ -75,13 +121,14 @@ data["id_tag"] = -1 //must be defined in order to reuse code between portable and vent scrubbers data["filter_types"] = list() - for(var/id in GLOB.gas_data.ids) - data["filter_types"] += list(list("gas_id" = id, "gas_name" = GLOB.gas_data.names[id], "enabled" = (id in scrubbing))) + for(var/gas_type in subtypesof(/datum/gas)) + data["filter_types"] += list(list("gas_id" = GLOB.meta_gas_info[gas_type][META_GAS_ID], "gas_name" = GLOB.meta_gas_info[gas_type][META_GAS_NAME], "enabled" = (gas_type in scrubbing))) if(holding) data["holding"] = list() data["holding"]["name"] = holding.name - data["holding"]["pressure"] = round(holding.air_contents.return_pressure()) + var/datum/gas_mixture/holding_mix = holding.return_air() + data["holding"]["pressure"] = round(holding_mix.return_pressure()) else data["holding"] = null return data @@ -102,17 +149,23 @@ switch(action) if("power") on = !on + if(on) + SSair.start_processing_machine(src) . = TRUE if("eject") if(holding) replace_tank(usr, FALSE) . = TRUE if("toggle_filter") - scrubbing ^= params["val"] + scrubbing ^= gas_id2path(params["val"]) . = TRUE if(.) update_appearance() +/obj/machinery/portable_atmospherics/pump/unregister_holding() + on = FALSE + return ..() + /obj/machinery/portable_atmospherics/scrubber/huge name = "huge air scrubber" icon_state = "scrubber:0" @@ -137,18 +190,22 @@ on = FALSE update_icon() use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE + if(!on) - return + return ..() + + excited = TRUE - ..() if(!holding) var/turf/T = get_turf(src) - for(var/turf/AT in T.GetAtmosAdjacentTurfs(alldir = TRUE)) + for(var/turf/AT in T.get_atmos_adjacent_turfs(alldir = TRUE)) scrub(AT.return_air()) -/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user) - if(default_unfasten_wrench(user, W)) + return ..() + +/obj/machinery/portable_atmospherics/scrubber/huge/wrench_act(mob/living/user, obj/item/tool) + if(default_unfasten_wrench(user, tool, 0)) if(!movable) on = FALSE - else - return ..() + return TRUE + return FALSE diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index 2f4902309fa3c..4d28ae30967d5 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -4,23 +4,26 @@ reward = 7500 wanted_types = list(/obj/item/tank) var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact. - var/gas_type = GAS_PLUOXIUM + var/gas_type = /datum/gas/pluoxium /datum/bounty/item/engineering/gas/applies_to(obj/O) if(!..()) return FALSE var/obj/item/tank/T = O - return T.air_contents.get_moles(gas_type) >= moles_required + var/datum/gas_mixture/our_mix = T.return_air() + if(!our_mix.gases[gas_type]) + return FALSE + return our_mix.gases[gas_type][MOLES] >= moles_required /datum/bounty/item/engineering/gas/nitryl_tank name = "Full Tank of Nitryl" description = "The non-human staff of Station 88 has been volunteered to test performance enhancing drugs. Ship them a tank full of Nitryl so they can get started." - gas_type = GAS_NITRYL + gas_type = /datum/gas/nitryl /datum/bounty/item/engineering/gas/tritium_tank name = "Full Tank of Tritium" description = "Station 49 is looking to kickstart their research program. Ship them a tank full of Tritium." - gas_type = GAS_TRITIUM + gas_type = /datum/gas/tritium /datum/bounty/item/engineering/energy_ball name = "Contained Tesla Ball" diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index c5e80f845a7e9..bee7ec962a535 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -56,10 +56,10 @@ export_types = list(/obj/structure/reagent_dispensers/beerkeg) -/datum/export/large/pipedispenser +/datum/export/large/pipe_dispenser cost = 500 unit_name = "pipe dispenser" - export_types = list(/obj/machinery/pipedispenser) + export_types = list(/obj/machinery/pipe_dispenser) /datum/export/large/emitter cost = 550 @@ -122,17 +122,47 @@ unit_name = "security barrier" export_types = list(/obj/item/security_barricade, /obj/structure/barricade/security) + +/** + * Gas canister exports. + * I'm going to put a quick aside here as this has been a pain to balance for several years now, and I'd like to at least break how to keep gas exports tame. + * So: Gasses are sold in canisters below, which have a variable amount of maximum pressure before they start to break. The largest of which is 9.2e13 kPa. + * This means we can determine a theoretical maximum value for gas sale prices using the ideal gas laws, as we know we have a minimum gas temperature of 2.7 kelvin. + * + * Additional note on base value. Gasses are soft capped to limit how much they're worth at large quantities, and time and time again players will find new ways to break your gasses. + * so please, *PLEASE* try not to go too much further past 10. + + * * AUTHORS NOTE: This means the theoretical, insane madman number of moles of a single gas in a can sits at a horrifying 4,098,150,709.4 moles. + * * Use this as you will, and when someone makes a quinquadrillion credits using gas exports, use these metrics as a way to balance the bejesus out of them. + * * For more information, see code\modules\atmospherics\machinery\portable\canister.dm. + */ /datum/export/large/gas_canister cost = 10 //Base cost of canister. You get more for nice gases inside. unit_name = "Gas Canister" export_types = list(/obj/machinery/portable_atmospherics/canister) + k_elasticity = 0.00033 + /datum/export/large/gas_canister/get_cost(obj/O) var/obj/machinery/portable_atmospherics/canister/C = O - var/worth = 10 - - worth += C.air_contents.get_moles(GAS_BZ)*4 - worth += C.air_contents.get_moles(GAS_STIMULUM)*100 - worth += C.air_contents.get_moles(GAS_HYPERNOB)*1000 - worth += C.air_contents.get_moles(GAS_TRITIUM)*5 - worth += C.air_contents.get_moles(GAS_PLUOXIUM)*5 + var/worth = cost + var/datum/gas_mixture/canister_mix = C.return_air() + var/canister_gas = canister_mix.gases + var/list/gases_to_check = list( + /datum/gas/bz, + /datum/gas/nitryl, + /datum/gas/hypernoblium, + /datum/gas/tritium, + /datum/gas/pluoxium, + ) + + for(var/gasID in gases_to_check) + canister_mix.assert_gas(gasID) + if(canister_gas[gasID][MOLES] > 0) + worth += get_gas_value(gasID, canister_gas[gasID][MOLES]) + + canister_mix.garbage_collect() return worth + +/datum/export/large/gas_canister/proc/get_gas_value(datum/gas/gasType, moles) + var/baseValue = initial(gasType.base_value) + return round((baseValue/k_elasticity) * (1 - NUM_E**(-1 * k_elasticity * moles))) diff --git a/code/modules/client/preferences/README.md b/code/modules/client/preferences/README.md index 9c40e105abd35..7e85f03f29f83 100644 --- a/code/modules/client/preferences/README.md +++ b/code/modules/client/preferences/README.md @@ -497,7 +497,7 @@ Middleware can hijack actions by specifying `action_delegations`: ) /datum/preference_middleware/congratulations/proc/congratulate_me(list/params, mob/user) - to_chat(user, span_notice("Wow, you did a great job learning about middleware!")) + to_chat(user, "Wow, you did a great job learning about middleware!") return TRUE ``` diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index 35f4c2a09b928..3041327309b72 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -21,6 +21,7 @@ var/list/modes = list(MODE_NONE = MODE_MESON, MODE_MESON = MODE_TRAY, MODE_TRAY = MODE_RAD, MODE_RAD = MODE_NONE) var/mode = MODE_NONE var/range = 1 + var/list/connection_images = list() /obj/item/clothing/glasses/meson/engine/Initialize(mapload) . = ..() @@ -35,6 +36,8 @@ mode = modes[mode] to_chat(user, "[voluntary ? "You turn the goggles":"The goggles turn"] [mode ? "to [mode] mode":"off"][voluntary ? ".":"!"]") + if(length(connection_images)) + connection_images.Cut() switch(mode) if(MODE_MESON) vision_flags = SEE_TURFS @@ -134,6 +137,11 @@ modes = list(MODE_NONE = MODE_TRAY, MODE_TRAY = MODE_NONE) +/obj/item/clothing/glasses/meson/engine/tray/dropped(mob/user) + . = ..() + if(connection_images.len) + connection_images.Cut() + /obj/item/clothing/glasses/meson/engine/shuttle name = "shuttle region scanner" icon_state = "trayson-shuttle" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index d3269f760b9d3..a16db02ce6b1e 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -224,7 +224,7 @@ REMOVE_TRAIT(user, carrytrait, CLOTHING_TRAIT) /obj/item/clothing/gloves/color/latex/atom_break() - ..() + . = ..() if(ishuman(loc)) REMOVE_TRAIT(loc, carrytrait, CLOTHING_TRAIT) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 04e3b800011d0..436f4a5486ed5 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -234,6 +234,17 @@ atmos_spawn_air("plasma=20;TEMP=[exposed_temperature]") visible_message(span_danger(" \The [src] bursts into flame!"),span_userdanger("Your [src] bursts into flame!")) qdel(src) +/obj/item/clothing/accessory/medal/plasma/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + +/obj/item/clothing/accessory/medal/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/item/clothing/accessory/medal/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + atmos_spawn_air("plasma=20;TEMP=[exposed_temperature]") + visible_message("\The [src] bursts into flame!", "Your [src] bursts into flame!") + qdel(src) /obj/item/clothing/accessory/medal/plasma/nobel_science name = "nobel sciences award" diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 16ddd69d6fa23..8dbd92f0e5c32 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -50,12 +50,12 @@ if(QDELETED(temp_vent)) continue if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] + var/datum/pipenet/temp_vent_parent = temp_vent.parents[1] if(!temp_vent_parent) continue//no parent vent //Stops Aliens getting stuck in small networks. //See: Security, Virology - if(temp_vent_parent.other_atmosmch.len > 20) + if(temp_vent_parent.other_atmos_machines.len > 20) vents += temp_vent if(!vents.len) diff --git a/code/modules/events/diona_infestation.dm b/code/modules/events/diona_infestation.dm index ef2d878e128df..9c0a9c639d524 100644 --- a/code/modules/events/diona_infestation.dm +++ b/code/modules/events/diona_infestation.dm @@ -17,11 +17,11 @@ if(QDELETED(temp_vent)) continue if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] + var/datum/pipenet/temp_vent_parent = temp_vent.parents[1] if(!temp_vent_parent) continue//no parent vent //Stops nymphs getting stuck in small networks. - if(temp_vent_parent.other_atmosmch.len > 20) + if(temp_vent_parent.other_atmos_machines.len > 20) vents += temp_vent if(!vents.len) message_admins("An event attempted to spawn nymphs but no suitable vents were found. Shutting down.") diff --git a/code/modules/events/mimite_infestation.dm b/code/modules/events/mimite_infestation.dm index dd99e6047d6c0..5c22355a2d5c2 100644 --- a/code/modules/events/mimite_infestation.dm +++ b/code/modules/events/mimite_infestation.dm @@ -31,11 +31,11 @@ if(QDELETED(temp_vent)) continue if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] + var/datum/pipenet/temp_vent_parent = temp_vent.parents[1] if(!temp_vent_parent) continue//no parent vent //Stops mimites getting stuck in small networks. - if(temp_vent_parent.other_atmosmch.len > 20) + if(temp_vent_parent.other_atmos_machines.len > 20) vents += temp_vent if(!vents.len) message_admins("An event attempted to spawn mimites but no suitable vents were found. Shutting down.") diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 596e15182438a..217f994182764 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -213,7 +213,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(GAS_O2, max(GM.get_moles(GAS_O2) - severity * holder.energy, 0)) + SET_MOLES(/datum/gas/oxygen, GM, max(GET_MOLES(/datum/gas/oxygen, GM) - severity * holder.energy, 0)) /datum/spacevine_mutation/nitro_eater name = "nitrogen consuming" @@ -225,7 +225,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(GAS_N2, max(GM.get_moles(GAS_N2) - severity * holder.energy, 0)) + SET_MOLES(/datum/gas/nitrogen, GM, max(GET_MOLES(/datum/gas/nitrogen, GM) - severity * holder.energy, 0)) /datum/spacevine_mutation/carbondioxide_eater name = "CO2 consuming" @@ -237,7 +237,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(GAS_CO2, max(GM.get_moles(GAS_CO2) - severity * holder.energy, 0)) + REMOVE_MOLES(/datum/gas/carbon_dioxide, GM, severity * holder.energy - GET_MOLES(/datum/gas/carbon_dioxide, GM)) /datum/spacevine_mutation/plasma_eater name = "toxins consuming" @@ -249,7 +249,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(GAS_PLASMA, max(GM.get_moles(GAS_PLASMA) - severity * holder.energy, 0)) + SET_MOLES(/datum/gas/plasma, GM, max(GET_MOLES(/datum/gas/plasma, GM) - severity * holder.energy, 0)) /datum/spacevine_mutation/thorns name = "thorny" @@ -569,12 +569,15 @@ if(!i && prob(100/severity)) qdel(src) -/obj/structure/spacevine/temperature_expose(null, temp, volume) - var/override = 0 +/obj/structure/spacevine/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD //if you're cold you're safe + +/obj/structure/spacevine/atmos_expose(datum/gas_mixture/air, exposed_temperature) + var/volume = air.return_volume() for(var/datum/spacevine_mutation/SM in mutations) - override += SM.process_temperature(src, temp, volume) - if(!override) - qdel(src) + if(SM.process_temperature(src, exposed_temperature, volume)) //If it's ever true we're safe + return + qdel(src) /obj/structure/spacevine/CanAllowThrough(atom/movable/mover, border_dir) . = ..() diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index a2715faac6365..59b3bc673cd3a 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -26,11 +26,11 @@ if(QDELETED(temp_vent)) continue if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - var/datum/pipeline/temp_vent_parent = temp_vent.parents[1] + var/datum/pipenet/temp_vent_parent = temp_vent.parents[1] if(!temp_vent_parent) continue// no parent vent - if(length(temp_vent_parent.other_atmosmch) > 20) + if(length(temp_vent_parent.other_atmos_machines) > 20) vents += temp_vent // Makes sure the vent network's big enough if(!length(vents)) diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm index 0b1335ea5a3e5..3a1f888d8a7c6 100644 --- a/code/modules/events/supermatter_surge.dm +++ b/code/modules/events/supermatter_surge.dm @@ -42,12 +42,14 @@ // primarily so the supermatter doesn't tesla the instant these happen supermatter.matter_power += power * power_proportion var/datum/gas_mixture/gas_puff = new - var/selected_gas = pick(4;GAS_CO2, 4;GAS_H2O, 1;GAS_BZ) - gas_puff.set_moles(selected_gas, 500) - gas_puff.set_temperature(500) + var/selected_gas = pick(4;/datum/gas/carbon_dioxide, 4;/datum/gas/water_vapor, 1;/datum/gas/bz) + ADD_MOLES(selected_gas, gas_puff, 500) + + gas_puff.temperature = (500) var/energy_ratio = (power * 500 * (1-power_proportion)) / gas_puff.thermal_energy() if(energy_ratio < 1) // energy output we want is lower than current energy, reduce the amount of gas we puff out - gas_puff.set_moles(GAS_H2O, energy_ratio * 500) + SET_MOLES(/datum/gas/water_vapor, gas_puff, energy_ratio * 500) + else // energy output we want is higher than current energy, increase its actual heat - gas_puff.set_temperature(energy_ratio * 500) + gas_puff.temperature = (energy_ratio * 500) supermatter.assume_air(gas_puff) diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index 631d64185c887..380d23eb28bcb 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -51,7 +51,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/portal/wormhole) -/obj/effect/portal/wormhole/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) +/obj/effect/portal/wormhole/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override) . = ..() GLOB.all_wormholes += src diff --git a/code/modules/hallucination/plasma_flood.dm b/code/modules/hallucination/plasma_flood.dm index 0dfbb32423e61..dcb6d1656cdc3 100644 --- a/code/modules/hallucination/plasma_flood.dm +++ b/code/modules/hallucination/plasma_flood.dm @@ -55,18 +55,18 @@ /datum/hallucination/fake_flood/proc/Expand() for(var/image/I in flood_images) I.alpha = min(I.alpha + 50, 255) - for(var/turf/FT in flood_turfs) + for(var/turf/flood_turf in flood_turfs) for(var/dir in GLOB.cardinals) - var/turf/T = get_step(FT, dir) - if((T in flood_turfs) || !FT.CanAtmosPass(T)) + var/turf/nearby_turf = get_step(flood_turf, dir) + if((nearby_turf in flood_turfs) || !TURFS_CAN_SHARE(nearby_turf, flood_turf) || isspaceturf(nearby_turf)) continue - var/obj/effect/plasma_image_holder/pih = new(T) + var/obj/effect/plasma_image_holder/pih = new(nearby_turf) var/image/new_plasma = image(image_icon, pih, image_state, FLY_LAYER) new_plasma.alpha = 50 new_plasma.plane = GAME_PLANE flood_images += new_plasma flood_image_holders += pih - flood_turfs += T + flood_turfs += nearby_turf if(target.client) target.client.images |= flood_images diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index a80e470ddd88b..399126f99401a 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -142,6 +142,6 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( if(toupdate.len) for(var/turf/T1 in toupdate) - CALCULATE_ADJACENT_TURFS(T1) + CALCULATE_ADJACENT_TURFS(T1, KILL_EXCITED) return copiedobjs diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index c136791e98066..6c5b06c9e46db 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -66,7 +66,7 @@ var/datum/effect_system/spark_spread/s = new s.set_up(3, 1, T) s.start() - T.set_temperature(5000) + T.temperature = (5000) T.hotspot_expose(50000,50000,1) /obj/effect/holodeck_effect/random_book diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 10215bcef431e..87094ac892df0 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -246,7 +246,7 @@ if(isopenturf(loc)) var/turf/open/O = loc if(O.air) - if(O.air.get_moles(GAS_O2) > 13) + if(GET_MOLES(/datum/gas/oxygen, O.air) > 13) return TRUE return FALSE diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index bfa5630a41907..7893ee80af102 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -114,10 +114,8 @@ if(. != directional_opacity && (. == ALL_CARDINALS || directional_opacity == ALL_CARDINALS)) reconsider_lights() //The lighting system only cares whether the tile is fully concealed from all directions or not. -/turf/proc/change_area(var/area/old_area, var/area/new_area) - old_area.turfs_to_uncontain += src - new_area.contents += src - new_area.contained_turfs += src +///Transfer the lighting of one area to another +/turf/proc/transfer_area_lighting(area/old_area, area/new_area) if(SSlighting.initialized) if (new_area.dynamic_lighting != old_area.dynamic_lighting) if (new_area.dynamic_lighting) diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index f7719b3c233ba..b74763d0a362d 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -106,7 +106,7 @@ ) ) for(var/turf/affected_turf as anything in template_and_bordering_turfs) - affected_turf.air_update_turf(TRUE) + affected_turf.air_update_turf(TRUE, TRUE) affected_turf.levelupdate() /datum/map_template/proc/load_new_z(orbital_body_type, list/level_traits = list(ZTRAIT_AWAY = TRUE)) @@ -148,9 +148,15 @@ var/list/border = block(locate(max(T.x, 1), max(T.y, 1), T.z), locate(min(T.x+width, world.maxx), min(T.y+height, world.maxy), T.z)) - for(var/L in border) - var/turf/turf_to_disable = L - turf_to_disable.ImmediateDisableAdjacency() + // Cache for sonic speed + var/list/to_rebuild = SSair.adjacent_rebuild + // iterate over turfs in the border and clear them from active atmos processing + for(var/turf/border_turf as anything in border) + SSair.remove_from_active(border_turf) + to_rebuild -= border_turf + for(var/turf/sub_turf as anything in border_turf.atmos_adjacent_turfs) + sub_turf.atmos_adjacent_turfs?.Remove(border_turf) + border_turf.atmos_adjacent_turfs?.Cut() // Accept cached maps, but don't save them automatically - we don't want // ruins clogging up memory for the whole round. diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 3872f1759cee5..76b262fca71c5 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -165,6 +165,169 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/mapping_helpers) else airlock.abandoned = TRUE +//air alarm helpers +/obj/effect/mapping_helpers/airalarm + desc = "You shouldn't see this. Report it please." + layer = ABOVE_OBJ_LAYER + late = TRUE + +/obj/effect/mapping_helpers/airalarm/Initialize(mapload) + . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return INITIALIZE_HINT_QDEL + + var/obj/machinery/airalarm/target = locate(/obj/machinery/airalarm) in loc + if(isnull(target)) + var/area/target_area = get_area(target) + log_mapping("[src] failed to find an air alarm at [AREACOORD(src)] ([target_area.type]).") + else + payload(target) + + return INITIALIZE_HINT_LATELOAD + +/obj/effect/mapping_helpers/airalarm/LateInitialize() + . = ..() + var/obj/machinery/airalarm/target = locate(/obj/machinery/airalarm) in loc + + if(isnull(target)) + qdel(src) + return + if(target.unlocked) + target.unlock() + + if(target.tlv_cold_room) + target.set_tlv_cold_room() + if(target.tlv_no_checks) + target.set_tlv_no_checks() + if(target.tlv_no_checks && target.tlv_cold_room) + CRASH("Tried to apply incompatible air alarm threshold helpers!") + + if(target.syndicate_access) + target.give_syndicate_access() + if(target.away_general_access) + target.give_away_general_access() + if(target.engine_access) + target.give_engine_access() + if(target.mixingchamber_access) + target.give_mixingchamber_access() + if(target.all_access) + target.give_all_access() + if(target.syndicate_access + target.away_general_access + target.engine_access + target.mixingchamber_access + target.all_access > 1) + CRASH("Tried to combine incompatible air alarm access helpers!") + + if(target.air_sensor_chamber_id) + target.setup_chamber_link() + + target.update_icon() + qdel(src) + +/obj/effect/mapping_helpers/airalarm/proc/payload(obj/machinery/airalarm/target) + return + +/obj/effect/mapping_helpers/airalarm/unlocked + name = "airalarm unlocked interface helper" + icon_state = "airalarm_unlocked_interface_helper" + +/obj/effect/mapping_helpers/airalarm/unlocked/payload(obj/machinery/airalarm/target) + if(target.unlocked) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to unlock the [target] but it's already unlocked!") + target.unlocked = TRUE + +/obj/effect/mapping_helpers/airalarm/syndicate_access + name = "airalarm syndicate access helper" + icon_state = "airalarm_syndicate_access_helper" + +/obj/effect/mapping_helpers/airalarm/syndicate_access/payload(obj/machinery/airalarm/target) + if(target.syndicate_access) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to syndicate but it's already changed!") + target.syndicate_access = TRUE + +/obj/effect/mapping_helpers/airalarm/away_general_access + name = "airalarm away access helper" + icon_state = "airalarm_away_general_access_helper" + +/obj/effect/mapping_helpers/airalarm/away_general_access/payload(obj/machinery/airalarm/target) + if(target.away_general_access) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to away_general but it's already changed!") + target.away_general_access = TRUE + +/obj/effect/mapping_helpers/airalarm/engine_access + name = "airalarm engine access helper" + icon_state = "airalarm_engine_access_helper" + +/obj/effect/mapping_helpers/airalarm/engine_access/payload(obj/machinery/airalarm/target) + if(target.engine_access) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to engine_access but it's already changed!") + target.engine_access = TRUE + +/obj/effect/mapping_helpers/airalarm/mixingchamber_access + name = "airalarm mixingchamber access helper" + icon_state = "airalarm_mixingchamber_access_helper" + +/obj/effect/mapping_helpers/airalarm/mixingchamber_access/payload(obj/machinery/airalarm/target) + if(target.mixingchamber_access) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to mixingchamber_access but it's already changed!") + target.mixingchamber_access = TRUE + +/obj/effect/mapping_helpers/airalarm/all_access + name = "airalarm all access helper" + icon_state = "airalarm_all_access_helper" + +/obj/effect/mapping_helpers/airalarm/all_access/payload(obj/machinery/airalarm/target) + if(target.all_access) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s access to all_access but it's already changed!") + target.all_access = TRUE + +/obj/effect/mapping_helpers/airalarm/tlv_cold_room + name = "airalarm cold room tlv helper" + icon_state = "airalarm_tlv_cold_room_helper" + +/obj/effect/mapping_helpers/airalarm/tlv_cold_room/payload(obj/machinery/airalarm/target) + if(target.tlv_cold_room) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s tlv to cold_room but it's already changed!") + target.tlv_cold_room = TRUE + +/obj/effect/mapping_helpers/airalarm/tlv_no_checks + name = "airalarm no checks tlv helper" + icon_state = "airalarm_tlv_no_checks_helper" + +/obj/effect/mapping_helpers/airalarm/tlv_no_checks/payload(obj/machinery/airalarm/target) + if(target.tlv_no_checks) + var/area/area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(area.type)] tried to adjust [target]'s tlv to no_checks but it's already changed!") + target.tlv_no_checks = TRUE + +/obj/effect/mapping_helpers/airalarm/link + name = "airalarm link helper" + icon_state = "airalarm_link_helper" + late = TRUE + var/chamber_id = "" + var/allow_link_change = FALSE + +/obj/effect/mapping_helpers/airalarm/link/Initialize(mapload) + . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return INITIALIZE_HINT_QDEL + +/obj/effect/mapping_helpers/airalarm/link/LateInitialize(mapload) + var/obj/machinery/airalarm/alarm = locate(/obj/machinery/airalarm) in loc + if(!isnull(alarm)) + alarm.air_sensor_chamber_id = chamber_id + alarm.allow_link_change = allow_link_change + alarm.setup_chamber_link() + else + log_mapping("[src] failed to find air alarm at [AREACOORD(src)].") + qdel(src) + //APC helpers /obj/effect/mapping_helpers/apc @@ -323,134 +486,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) organ.organ_flags |= ORGAN_FROZEN container.update_icon() -/obj/effect/mapping_helpers/simple_pipes - name = "Simple Pipes" - late = TRUE - icon_state = "pipe-3" - alpha = 175 - layer = GAS_PIPE_VISIBLE_LAYER - var/piping_layer = 3 - var/pipe_color = "" - var/hide = FALSE - - FASTDMM_PROP(\ - pipe_type = PIPE_TYPE_AUTO,\ - pipe_interference_group = "atmos-[piping_layer]"\ - ) - - var/list/pipe_types = list( - /obj/machinery/atmospherics/pipe/simple/general/visible, - /obj/machinery/atmospherics/pipe/simple/general/visible, - /obj/machinery/atmospherics/pipe/manifold/general/visible, - /obj/machinery/atmospherics/pipe/manifold4w/general/visible - ) - -/obj/effect/mapping_helpers/simple_pipes/Initialize(mapload) - preform_layer(piping_layer, pipe_color) - qdel(src) - -/obj/effect/mapping_helpers/simple_pipes/proc/preform_layer(override_layer, override_color, override_name = null) - var/list/connections = list( dir2text(NORTH) = FALSE, dir2text(SOUTH) = FALSE , dir2text(EAST) = FALSE , dir2text(WEST) = FALSE) - var/list/valid_connectors = typecacheof(/obj/machinery/atmospherics) - var/connection_num = 0 - for(var/direction in connections) - var/turf/T = get_step(src, text2dir(direction)) - for(var/thing in T.contents) - // If it is a mapping helper - if(istype(thing, /obj/effect/mapping_helpers/simple_pipes)) - var/obj/effect/mapping_helpers/simple_pipes/found = thing - - // If it is a supply_scrubber mapping helper - if(istype(found, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber)) - if(override_layer != 2 && override_layer != 4 && !istype(src, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber)) - continue // We allow it if we're also a supply_scrubber helper, otherwise we gotta be on layers 2 or 4. - - // If it is a regular mapping helper - else - if(found.piping_layer != override_layer) - continue // We have to have the same layer to allow it. - - connections[direction] = TRUE - connection_num++ - break - - if(!is_type_in_typecache(thing, valid_connectors)) - continue - - var/obj/machinery/atmospherics/AM = thing - if(AM.piping_layer != override_layer && !istype(AM, /obj/machinery/atmospherics/pipe/layer_manifold)) - continue - - if(angle2dir(dir2angle(text2dir(direction))+180) & AM.initialize_directions) - connections[direction] = TRUE - connection_num++ - break - - switch(connection_num) - if(1) - for(var/direction in connections) - if(connections[direction] != TRUE) - continue - spawn_pipe(direction, connection_num, override_layer, override_color, override_name) - return - if(2) - for(var/direction in connections) - if(connections[direction] != TRUE) - continue - //Detects straight pipes connected from east to west , north to south etc. - if(connections[dir2text(angle2dir(dir2angle(text2dir(direction))+180))] == TRUE) - spawn_pipe(direction, connection_num, override_layer, override_color, override_name) - return - - for(var/direction2 in (connections - direction)) - if(connections[direction2] != TRUE) - continue - spawn_pipe(dir2text(text2dir(direction)+text2dir(direction2)), connection_num, override_layer, override_color, override_name) - return - if(3) - for(var/direction in connections) - if(connections[direction] == FALSE) - spawn_pipe(direction, connection_num, override_layer, override_color, override_name) - return - if(4) - spawn_pipe(dir2text(NORTH), connection_num, override_layer, override_color, override_name) - return - -/// Spawn the pipe on the layer we specify -/obj/effect/mapping_helpers/simple_pipes/proc/spawn_pipe(direction, connection_num, override_layer, override_color, override_name = null) - var/T = pipe_types[connection_num] - var/obj/machinery/atmospherics/pipe/pipe = new T(get_turf(src), TRUE, text2dir(direction)) - - if(!isnull(override_name)) - pipe.name = override_name - pipe.piping_layer = override_layer - pipe.update_layer() - pipe.paint(override_color) - // prevents duplicates on the station blueprints mode since the effect is on - pipe.obj_flags &= ~ON_BLUEPRINTS - -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber - name = "Simple Supply/Scrubber Pipes" - icon_state = "pipe-2-4" - color = rgb(128, 0, 128) // purple in-between pipe - -// Instead of using our current layer, we use -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/Initialize(mapload) - preform_layer(2, rgb(0, 0, 255), override_name = "air supply pipe") - preform_layer(4, rgb(255, 0, 0), override_name = "scrubbers pipe") - - qdel(src) - -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden - name = "Hidden Simple Supply/Scrubber Pipes" - hide = TRUE - pipe_types = list( - /obj/machinery/atmospherics/pipe/simple/general/hidden, - /obj/machinery/atmospherics/pipe/simple/general/hidden, - /obj/machinery/atmospherics/pipe/manifold/general/hidden, - /obj/machinery/atmospherics/pipe/manifold4w/general/hidden - ) - //Color correction helper - only use of these per area, it will convert the entire area /obj/effect/mapping_helpers/color_correction name = "color correction helper" @@ -520,10 +555,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) /obj/effect/mapping_helpers/atmos_auto_connect/LateInitialize() . = ..() - var/obj/machinery/portable_atmospherics/PortAtmos = locate(/obj/machinery/portable_atmospherics) in loc - var/obj/machinery/atmospherics/components/unary/portables_connector/Connector = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in loc - if(PortAtmos && Connector) - Connector.connect_to = PortAtmos + var/obj/machinery/portable_atmospherics/port_atmos = locate(/obj/machinery/portable_atmospherics) in loc + var/obj/machinery/atmospherics/components/unary/portables_connector/connector = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in loc + if(port_atmos && connector) + port_atmos.connect(connector) qdel(src) return CRASH("Failed to find a portable atmospherics or a portables connector at [AREACOORD(src)]") @@ -544,7 +579,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) /** internal code variables - not for mappers **/ /// used to skip a direction on a turf var/skip_direction - /// there are a few stuff that "CanAtmosPass()" is not reliable + /// there are a few stuff that "can_atmos_pass()" is not reliable var/static/list/unliable_atmos_blockers @@ -568,7 +603,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) if(isspaceturf(each_turf) || isopenspace(each_turf)) continue - if(!each_turf.CanAtmosPass(my_turf)) + if(!each_turf.can_atmos_pass(my_turf)) for(var/atom/movable/movable_content as anything in each_turf.contents) if(is_type_in_typecache(movable_content, unliable_atmos_blockers)) unliable_atmos_blocking = TRUE @@ -605,7 +640,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) // puts a directional window for each direction. for(var/turf/each_turf in nearby_turfs) - if(!each_turf.CanAtmosPass(my_turf) || isspaceturf(each_turf) || isopenspace(each_turf)) + if(!each_turf.can_atmos_pass(my_turf) || isspaceturf(each_turf) || isopenspace(each_turf)) continue var/obj/d_glass = new window_type(each_turf) diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm index b07d90b26c48e..2619027780ed5 100644 --- a/code/modules/mapping/space_management/space_reservation.dm +++ b/code/modules/mapping/space_management/space_reservation.dm @@ -19,6 +19,10 @@ reserved_turfs = list() for(var/turf/reserved_turf as anything in reserved_copy) SEND_SIGNAL(reserved_turf, COMSIG_TURF_RESERVATION_RELEASED, src) + + // immediately disconnect from atmos + reserved_turf.blocks_air = TRUE + CALCULATE_ADJACENT_TURFS(reserved_turf, KILL_EXCITED) // Makes the linter happy, even tho we don't await this INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/proc/reserve_turfs, reserved_copy) diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 5e53866c78a0d..4f462fda63626 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -119,9 +119,11 @@ /obj/item/coin/plasma custom_materials = list(/datum/material/plasma = 400) -/obj/item/coin/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - plasma_ignition(0) +/obj/item/coin/plasma/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 300 + +/obj/item/coin/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature) + plasma_ignition(0) /obj/item/coin/plasma/bullet_act(obj/projectile/Proj) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 279454e6a6aa9..6351767d96fbc 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -28,6 +28,7 @@ /obj/item/survivalcapsule/Destroy() template = null // without this, capsules would be one use. per round. + air_update_turf(TRUE, FALSE) . = ..() /obj/item/survivalcapsule/examine(mob/user) @@ -296,7 +297,7 @@ density = TRUE var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 5 - CanAtmosPass = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO /obj/structure/fans/deconstruct() if(!(flags_1 & NODECONSTRUCT_1)) @@ -324,7 +325,7 @@ /obj/structure/fans/Initialize(mapload) . = ..() - air_update_turf(1) + air_update_turf(TRUE, TRUE) //Inivisible, indestructible fans /obj/structure/fans/tiny/invisible diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index ede9e50ccb3c2..4e59b1a018543 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -13,46 +13,29 @@ var/toxins_used = 0 var/tox_detect_threshold = 0.02 var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.return_temperature())/BREATH_VOLUME + var/list/breath_gases = breath.gases //Partial pressure of the toxins in our breath - var/toxins_pp = (breath.get_moles(GAS_PLASMA)/breath.total_moles())*breath_pressure + var/toxins_pp = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure if(toxins_pp > tox_detect_threshold) // Detect toxins in air - adjustPlasma(breath.get_moles(GAS_PLASMA)*250) + adjustPlasma(breath_gases[/datum/gas/plasma][MOLES]*250) throw_alert("alien_tox", /atom/movable/screen/alert/alien_tox) - toxins_used = breath.get_moles(GAS_PLASMA) + toxins_used = breath_gases[/datum/gas/plasma][MOLES] else clear_alert("alien_tox") //Breathe in toxins and out oxygen - breath.adjust_moles(GAS_PLASMA, -toxins_used) - breath.adjust_moles(GAS_O2, toxins_used) + breath_gases[/datum/gas/plasma][MOLES] += -toxins_used + breath_gases[/datum/gas/oxygen][MOLES] += toxins_used + + breath.garbage_collect() //BREATH TEMPERATURE handle_breath_temperature(breath) -/mob/living/carbon/alien/breathe() -//Environment Gas Mix - var/datum/gas_mixture/environment - if(loc) - environment = loc.return_air() - -//Breath Gas Mix derived from Environment - var/datum/gas_mixture/breath - - if(isturf(loc)) //Get amount of gas breathed - var/breath_ratio = 0 - if(environment) - breath_ratio = BREATH_VOLUME/environment.return_volume() - //Remove it from the atmosphere - breath = loc.remove_air_ratio(breath_ratio) - - if(breath) - breath.set_volume(BREATH_VOLUME) - check_breath(breath) - /mob/living/carbon/alien/handle_status_effects(delta_time) ..() //natural reduction of movement delay due to stun. diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 97754b6c83592..72552f2b1c0ee 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -28,6 +28,10 @@ var/strength = 5 var/attached = 0 +/obj/item/clothing/mask/facehugger/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + /obj/item/clothing/mask/facehugger/Initialize(mapload) . = ..() var/static/list/loc_connections = list( @@ -95,9 +99,12 @@ . += span_boldannounce("It looks like the proboscis has been removed.") -/obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - Die() +/obj/item/clothing/mask/facehugger/atmos_expose(datum/gas_mixture/air, exposed_temperature) + Die() + + +/obj/item/clothing/mask/facehugger/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > 300) /obj/item/clothing/mask/facehugger/equipped(mob/M) . = ..() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index f0f6c59903032..ac113bf93469b 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -764,10 +764,6 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon) else hud_used.stamina.icon_state = "stamina_full" -/mob/living/carbon/proc/update_internals_hud_icon(internal_state = 0) - if(hud_used?.internals) - hud_used.internals.icon_state = "internal[internal_state]" - /mob/living/carbon/proc/update_spacesuit_hud_icon(cell_state = "empty") if(hud_used?.spacesuit) hud_used.spacesuit.icon_state = "spacesuit_[cell_state]" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a7b2b1f68f345..72cf811575bb2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -115,8 +115,9 @@ var/list/tab_data = ..() var/obj/item/tank/target_tank = internal || external if(target_tank) + var/datum/gas_mixture/target_tank_air = target_tank.return_air() tab_data["Internal Atmosphere Info"] = GENERATE_STAT_TEXT("[target_tank.name]") - tab_data["Tank Pressure"] = GENERATE_STAT_TEXT("[target_tank.air_contents.return_pressure()]") + tab_data["Tank Pressure"] = GENERATE_STAT_TEXT("[target_tank_air.return_pressure()]") tab_data["Distribution Pressure"] = GENERATE_STAT_TEXT("[target_tank.distribute_pressure]") if(istype(wear_suit, /obj/item/clothing/suit/space)) var/obj/item/clothing/suit/space/S = wear_suit diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 62976ba8409e8..0bd8dcad70dda 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -104,14 +104,14 @@ if(P.starting) var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) - var/turf/curloc = get_turf(src) + var/turf/current_location = get_turf(src) // redirect the projectile P.original = locate(new_x, new_y, P.z) - P.starting = curloc + P.starting = current_location P.firer = src - P.yo = new_y - curloc.y - P.xo = new_x - curloc.x + P.yo = new_y - current_location.y + P.xo = new_x - current_location.x var/new_angle_s = P.Angle + rand(120,240) while(new_angle_s > 180) // Translate to regular projectile degrees new_angle_s -= 360 diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index 7f3f9a09415e4..9142ad3ca6703 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -238,8 +238,6 @@ GLOBAL_LIST_INIT(strippable_human_layout, list( if (carbon_source.internal == item) carbon_source.close_internals() - // This isn't meant to be FALSE, it correlates to the icon's name. - carbon_source.update_internals_hud_icon(0) else if(!QDELETED(item)) if(!carbon_source.try_open_internals(item)) return diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index a0818cedcff98..6e299f98bea33 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -282,7 +282,6 @@ update_hair() // Close internal air tank if mask was the only breathing apparatus. if(invalid_internals()) - update_internals_hud_icon(0) cutoff_internals() if(I.flags_inv & HIDEEYES) update_inv_glasses() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 71bb4a23a6177..94b3d032361ef 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -94,7 +94,7 @@ var/datum/species/S = dna.species - if(S.breathid == "o2") + if(S.breathid == GAS_O2) throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) else if(S.breathid == "tox") throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox) @@ -112,7 +112,7 @@ /// Environment handlers for species /mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) // If we are in a cryo bed do not process life functions - if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) + if(istype(loc, /obj/machinery/cryo_cell)) return dna.species.handle_environment(environment, src) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e8a52a2e22036..cf1b3f57e4779 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/sound/miss_sound = 'sound/weapons/punchmiss.ogg' //Breathing! Most changes are in mutantlungs, though - var/breathid = "o2" + var/breathid = GAS_O2 //Blank list. As it runs through regenerate_organs, organs that are missing are added in sequential order to the list //List is called in health analyzer and displays all missing organs @@ -1964,7 +1964,7 @@ GLOBAL_LIST_EMPTY(features_by_species) */ /datum/species/proc/handle_body_temperature(mob/living/carbon/human/humi) //when in a cryo unit we suspend all natural body regulation - if(istype(humi.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) + if(istype(humi.loc, /obj/machinery/cryo_cell)) return //Only stabilise core temp when alive and not in statis @@ -2008,7 +2008,7 @@ GLOBAL_LIST_EMPTY(features_by_species) humi.adjust_coretemperature(skin_core_change) // get the enviroment details of where the mob is standing - var/datum/gas_mixture/environment = humi.loc.return_air() + var/datum/gas_mixture/environment = humi.loc?.return_air() if(!environment) // if there is no environment (nullspace) drop out here. return diff --git a/code/modules/mob/living/carbon/human/species_types/oozelings.dm b/code/modules/mob/living/carbon/human/species_types/oozelings.dm index 7854d2e5ae8e6..7e3f4eb90b25c 100644 --- a/code/modules/mob/living/carbon/human/species_types/oozelings.dm +++ b/code/modules/mob/living/carbon/human/species_types/oozelings.dm @@ -88,11 +88,11 @@ if(!atmos_sealed) var/datum/gas_mixture/environment = H.loc.return_air() if(environment?.total_moles()) - if(environment.get_moles(GAS_H2O) >= 1) + if(GET_MOLES(/datum/gas/water_vapor, environment) >= 1) H.blood_volume -= 15 if(prob(50)) to_chat(H, span_danger("Your ooze melts away rapidly in the water vapor!")) - if(H.blood_volume <= 672 && environment.get_moles(GAS_PLASMA) >= 1) + if(H.blood_volume <= 672 && GET_MOLES(/datum/gas/plasma, environment) >= 1) H.blood_volume += 15 if(H.blood_volume < BLOOD_VOLUME_OKAY && prob(5)) to_chat(H, span_danger("You feel drained!")) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index dab7c77e64063..71e0a3588edc4 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -54,7 +54,7 @@ var/datum/gas_mixture/environment = H.loc.return_air() if(environment) if(environment.total_moles()) - if(environment.get_moles(GAS_O2) >= 1) //Same threshold that extinguishes fire + if(GET_MOLES(/datum/gas/oxygen, environment) >= 1) //Same threshold that extinguishes fire H.adjust_fire_stacks(0.5) if(!H.on_fire && H.fire_stacks > 0) H.visible_message(span_danger("[H]'s body reacts with the atmosphere and bursts into flames!"),span_userdanger("Your body reacts with the atmosphere and bursts into flame!")) diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index d9c9da300f941..bdd8e723086a6 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -206,10 +206,8 @@ /mob/living/carbon/proc/close_all_airtanks() if(external) close_externals() - update_internals_hud_icon(0) if(internal) close_internals() - update_internals_hud_icon(0) /** diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 32db4dc404d12..13f024afa6290 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -94,8 +94,6 @@ var/obj/item/organ/lungs = getorganslot(ORGAN_SLOT_LUNGS) if(reagents.has_reagent(/datum/reagent/toxin/lexorin, needs_metabolizing = TRUE)) return - if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) - return var/datum/gas_mixture/environment if(loc) @@ -129,23 +127,22 @@ breath = loc_as_obj.handle_internal_lifeform(src, BREATH_VOLUME) else if(isturf(loc)) //Breathe from loc as turf - var/breath_ratio = 0 + var/breath_moles = 0 if(environment) - breath_ratio = BREATH_VOLUME/environment.return_volume() + breath_moles = environment.total_moles()*BREATH_PERCENTAGE - breath = loc.remove_air_ratio(breath_ratio) + breath = loc.remove_air(breath_moles) else //Breathe from loc as obj again - if(istype(loc, /obj/)) + if(isobj(loc)) var/obj/loc_as_obj = loc loc_as_obj.handle_internal_lifeform(src,0) if(breath) - breath.set_volume(BREATH_VOLUME) + breath.volume = BREATH_VOLUME check_breath(breath) if(breath) loc.assume_air(breath) - air_update_turf() /mob/living/carbon/proc/has_smoke_protection() if(HAS_TRAIT(src, TRAIT_NOBREATH)) @@ -182,9 +179,9 @@ var/oxygen_used = 0 var/moles = breath.total_moles() var/breath_pressure = (moles*R_IDEAL_GAS_EQUATION*breath.return_temperature())/BREATH_VOLUME - var/O2_partialpressure = ((breath.get_moles(GAS_O2)/moles)*breath_pressure) + (((breath.get_moles(GAS_PLUOXIUM)*8)/moles)*breath_pressure) - var/Toxins_partialpressure = (breath.get_moles(GAS_PLASMA)/moles)*breath_pressure - var/CO2_partialpressure = (breath.get_moles(GAS_CO2)/moles)*breath_pressure + var/O2_partialpressure = ((GET_MOLES(/datum/gas/oxygen, breath)/moles)*breath_pressure) + (((GET_MOLES(/datum/gas/pluoxium, breath)*8)/moles)*breath_pressure) + var/Toxins_partialpressure = (GET_MOLES(/datum/gas/plasma, breath)/moles)*breath_pressure + var/CO2_partialpressure = (GET_MOLES(/datum/gas/carbon_dioxide, breath)/moles)*breath_pressure //OXYGEN @@ -195,7 +192,7 @@ var/ratio = 1 - O2_partialpressure/safe_oxy_min adjustOxyLoss(min(5*ratio, 3)) failed_last_breath = 1 - oxygen_used = breath.get_moles(GAS_O2)*ratio + oxygen_used = GET_MOLES(/datum/gas/oxygen, breath)*ratio else adjustOxyLoss(3) failed_last_breath = 1 @@ -205,11 +202,11 @@ failed_last_breath = 0 if(health >= crit_threshold) adjustOxyLoss(-5) - oxygen_used = breath.get_moles(GAS_O2) + oxygen_used = GET_MOLES(/datum/gas/oxygen, breath) clear_alert("not_enough_oxy") - breath.adjust_moles(GAS_O2, -oxygen_used) - breath.adjust_moles(GAS_CO2, oxygen_used) + ADD_MOLES(/datum/gas/carbon_dioxide, breath, oxygen_used) + REMOVE_MOLES(/datum/gas/oxygen, breath, oxygen_used) //CARBON DIOXIDE if(CO2_partialpressure > safe_co2_max) @@ -228,15 +225,15 @@ //TOXINS/PLASMA if(Toxins_partialpressure > safe_tox_max) - var/ratio = (breath.get_moles(GAS_PLASMA)/safe_tox_max) * 10 + var/ratio = (GET_MOLES(/datum/gas/plasma, breath)/safe_tox_max) * 10 adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE)) throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox) else clear_alert("too_much_tox") //NITROUS OXIDE - if(breath.get_moles(GAS_NITROUS)) - var/SA_partialpressure = (breath.get_moles(GAS_NITROUS)/breath.total_moles())*breath_pressure + if(GET_MOLES(/datum/gas/nitrous_oxide, breath)) + var/SA_partialpressure = (GET_MOLES(/datum/gas/nitrous_oxide, breath)/breath.total_moles())*breath_pressure if(SA_partialpressure > SA_para_min) Unconscious(60) if(SA_partialpressure > SA_sleep_min) @@ -249,32 +246,34 @@ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "chemical_euphoria") //BZ (Facepunch port of their Agent B) - if(breath.get_moles(GAS_BZ)) - var/bz_partialpressure = (breath.get_moles(GAS_BZ)/breath.total_moles())*breath_pressure + if(GET_MOLES(/datum/gas/bz, breath)) + var/bz_partialpressure = (GET_MOLES(/datum/gas/bz, breath)/breath.total_moles())*breath_pressure if(bz_partialpressure > 1) hallucination += 10 else if(bz_partialpressure > 0.01) hallucination += 5 //TRITIUM - if(breath.get_moles(GAS_TRITIUM)) - var/tritium_partialpressure = (breath.get_moles(GAS_TRITIUM)/breath.total_moles())*breath_pressure + if(GET_MOLES(/datum/gas/tritium, breath)) + var/tritium_partialpressure = (GET_MOLES(/datum/gas/tritium, breath)/breath.total_moles())*breath_pressure radiation += tritium_partialpressure/10 //NITRYL - if(breath.get_moles(GAS_NITRYL)) - var/nitryl_partialpressure = (breath.get_moles(GAS_NITRYL)/breath.total_moles())*breath_pressure + if(GET_MOLES(/datum/gas/nitryl, breath)) + var/nitryl_partialpressure = (GET_MOLES(/datum/gas/nitryl, breath)/breath.total_moles())*breath_pressure adjustFireLoss(nitryl_partialpressure/4) //BREATH TEMPERATURE handle_breath_temperature(breath) - return 1 + breath.garbage_collect() + + return TRUE //Fourth and final link in a breath chain /mob/living/carbon/proc/handle_breath_temperature(datum/gas_mixture/breath) // The air you breathe out should match your body temperature - breath.set_temperature(bodytemperature) + breath.temperature = bodytemperature /// Attempts to take a breath from the external or internal air tank. /mob/living/carbon/proc/get_breath_from_internal(volume_needed) @@ -284,10 +283,8 @@ return if(external) . = external.remove_air_volume(volume_needed) - update_internals_hud_icon(1) else if(internal) . = internal.remove_air_volume(volume_needed) - update_internals_hud_icon(1) else // Return without taking a breath if there is no air tank. return diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 29a86ed378991..de27492a3c66b 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -71,7 +71,7 @@ apply_damage(HEAT_DAMAGE_LEVEL_2, BURN) else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTCOLD)) - if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) + if(!istype(loc, /obj/machinery/cryo_cell)) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - bodytemperature) / COLD_SLOWDOWN_FACTOR)) switch(bodytemperature) if(200 to BODYTEMP_COLD_DAMAGE_LIMIT) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 0be85eaa01ca3..3ac77fdbd3a7a 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -86,7 +86,7 @@ ExtinguishMob() return TRUE //mob was put out, on_fire = FALSE via ExtinguishMob(), no need to update everything down the chain. var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment - if(G.get_moles(GAS_O2) < 1) + if(GET_MOLES(/datum/gas/oxygen, G) < 1) ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire return TRUE var/turf/location = get_turf(src) diff --git a/code/modules/mob/living/simple_animal/bot/atmosbot.dm b/code/modules/mob/living/simple_animal/bot/atmosbot.dm index fc26e149bf2b9..546191190e341 100644 --- a/code/modules/mob/living/simple_animal/bot/atmosbot.dm +++ b/code/modules/mob/living/simple_animal/bot/atmosbot.dm @@ -52,16 +52,16 @@ var/last_barrier_tick //Gasses var/list/gasses = list( - GAS_BZ = 1, - GAS_CO2 = 1, - GAS_HYPERNOB = 1, - GAS_NITROUS = 1, - GAS_NITRYL = 1, - GAS_PLASMA = 1, - GAS_PLUOXIUM = 0, - GAS_STIMULUM = 0, - GAS_TRITIUM = 1, - GAS_H2O = 0, + /datum/gas/bz = 1, + /datum/gas/carbon_dioxide = 1, + /datum/gas/hypernoblium = 1, + /datum/gas/nitrous_oxide = 1, + /datum/gas/nitryl = 1, + /datum/gas/plasma = 1, + /datum/gas/pluoxium = 0, + /datum/gas/stimulum = 0, + /datum/gas/tritium = 1, + /datum/gas/water_vapor = 0, ) // Have we spoken our alert yet? var/has_spoken = FALSE @@ -200,7 +200,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) /mob/living/simple_animal/bot/atmosbot/proc/change_temperature() var/turf/T = get_turf(src) var/datum/gas_mixture/environment = T.return_air() - environment.set_temperature(ideal_temperature) + environment.temperature = (ideal_temperature) /mob/living/simple_animal/bot/atmosbot/proc/vent_air() //Just start pumping out air @@ -216,11 +216,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) if(pressure_delta > 0) var/transfer_moles = pressure_delta*environment.return_volume()/(T20C * R_IDEAL_GAS_EQUATION) if(emagged == 2) - environment.adjust_moles(GAS_CO2, transfer_moles) + environment.gases[/datum/gas/carbon_dioxide][MOLES] += transfer_moles else - environment.adjust_moles(GAS_N2, transfer_moles * 0.7885) - environment.adjust_moles(GAS_O2, transfer_moles * 0.2115) - air_update_turf() + environment.gases[/datum/gas/nitrogen][MOLES] += transfer_moles * 0.7885 + environment.gases[/datum/gas/oxygen][MOLES] += transfer_moles * 0.2115 + air_update_turf(FALSE, FALSE) new /obj/effect/temp_visual/vent_wind(get_turf(src)) /mob/living/simple_animal/bot/atmosbot/proc/scrub_toxins() @@ -231,8 +231,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) var/datum/gas_mixture/environment = T.return_air() for(var/G in gasses) if(gasses[G]) - var/moles_in_atmos = environment.get_moles(G) - environment.adjust_moles(G, -min(moles_in_atmos, ATMOSBOT_MAX_SCRUB_CHANGE)) + var/moles_in_atmos = GET_MOLES(G, environment) + REMOVE_MOLES(G, environment, min(moles_in_atmos, ATMOSBOT_MAX_SCRUB_CHANGE)) /mob/living/simple_animal/bot/atmosbot/proc/deploy_holobarrier() if(deployed_holobarrier) @@ -249,11 +249,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) //Toxins in the air if(emagged != 2) for(var/G in gasses) - if(gasses[G] && gas_mix.get_moles(G) > 0.2) + if(gasses[G] && GET_MOLES(G, gas_mix) > 0.2) return ATMOSBOT_HIGH_TOXINS //Too little oxygen or too little pressure var/partial_pressure = R_IDEAL_GAS_EQUATION * gas_mix.return_temperature() / gas_mix.return_volume() - var/oxygen_moles = gas_mix.get_moles(GAS_O2) * partial_pressure + var/oxygen_moles = GET_MOLES(/datum/gas/oxygen, gas_mix) * partial_pressure if(oxygen_moles < 20 || gas_mix.return_pressure() < WARNING_LOW_PRESSURE) return ATMOSBOT_LOW_OXYGEN //Check temperature @@ -267,7 +267,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) for(var/obj/structure/holosign/barrier/atmos/A in target_turf) blocked = TRUE break - if(!target_turf.CanAtmosPass(target_turf) || blocked) + if(!target_turf.can_atmos_pass(target_turf) || blocked) //Pressumable from being inside a holobarrier, move somewhere nearby var/turf/open/floor/floor_turf = pick(view(3, src)) if(floor_turf && istype(floor_turf)) @@ -278,7 +278,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) /mob/living/simple_animal/bot/atmosbot/proc/return_nearest_breach() var/turf/origin = get_turf(src) - if(isclosedturf(origin)) + if(origin.blocks_air) return null var/room_limit = ATMOSBOT_MAX_AREA_SCAN @@ -294,7 +294,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) for(var/obj/structure/holosign/barrier/atmos/A in checking_turf) blocked = TRUE break - if(blocked || !checking_turf.CanAtmosPass(checking_turf)) + if(blocked || !checking_turf.can_atmos_pass(checking_turf)) continue var/datum/gas_mixture/current_air = checking_turf.return_air() if (!current_air) @@ -303,7 +303,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/bot/atmosbot) //Add adjacent turfs for(var/direction in list(NORTH, SOUTH, EAST, WEST)) var/turf/adjacent_turf = get_step(checking_turf, direction) - if((adjacent_turf in checked_turfs) || !adjacent_turf.CanAtmosPass(adjacent_turf)) + if((adjacent_turf in checked_turfs) || !(adjacent_turf.can_atmos_pass(adjacent_turf))) continue var/datum/gas_mixture/checking_air = checking_turf.return_air() if (!checking_air) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 5fa45196e7f7c..a35968636ae07 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -466,7 +466,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r var/turf/T = get_turf(src) if(!T) return - var/list/adjacent = T.GetAtmosAdjacentTurfs(1) + var/list/adjacent = T.get_atmos_adjacent_turfs(1) var/atom/final_result var/static/list/turf_typecache = typecacheof(/turf) if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index 640629cfcdebf..e841523d6659b 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -33,7 +33,7 @@ var/speech_cooldown = 0 var/detected_cooldown = 0 - var/foam_cooldown = 0 + COOLDOWN_DECLARE(foam_cooldown) var/extinguish_people = TRUE var/extinguish_fires = TRUE @@ -49,6 +49,12 @@ create_extinguisher() +/mob/living/simple_animal/bot/firebot/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + + + /mob/living/simple_animal/bot/firebot/bot_reset() create_extinguisher() @@ -262,11 +268,13 @@ return result -/mob/living/simple_animal/bot/firebot/temperature_expose(datum/gas_mixture/air, temperature, volume) - if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && foam_cooldown + FOAM_INTERVAL < world.time) +/mob/living/simple_animal/bot/firebot/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > T0C + 200 || exposed_temperature < BODYTEMP_COLD_DAMAGE_LIMIT) + +/mob/living/simple_animal/bot/firebot/atmos_expose(datum/gas_mixture/air, exposed_temperature) + if(COOLDOWN_FINISHED(src, foam_cooldown)) new /obj/effect/particle_effect/foam/firefighting(loc) - foam_cooldown = world.time - ..() + COOLDOWN_START(src, foam_cooldown, FOAM_INTERVAL) /mob/living/simple_animal/bot/firebot/proc/spray_water(atom/target, mob/user) if(stationary_mode) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 22eda95c10617..dc65a92b87cf6 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -836,12 +836,6 @@ /mob/living/simple_animal/bot/mulebot/remove_air(amount) //To prevent riders suffocating return loc ? loc.remove_air(amount) : null -/mob/living/simple_animal/bot/mulebot/remove_air_ratio(ratio) - if(loc) - return loc.remove_air_ratio(ratio) - else - return null - /mob/living/simple_animal/bot/mulebot/resist() ..() if(load) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 1bf72bb017fef..42e63aa5eaa3a 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -180,14 +180,14 @@ if(P.starting) var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3) var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3) - var/turf/curloc = get_turf(src) + var/turf/current_location = get_turf(src) // redirect the projectile P.original = locate(new_x, new_y, P.z) - P.starting = curloc + P.starting = current_location P.firer = src - P.yo = new_y - curloc.y - P.xo = new_x - curloc.x + P.yo = new_y - current_location.y + P.xo = new_x - current_location.x var/new_angle_s = P.Angle + rand(120,240) while(new_angle_s > 180) // Translate to regular projectile degrees new_angle_s -= 360 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 3e5e69e976d2f..7df917a318104 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -453,7 +453,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/lava_warning) anchored = TRUE opacity = FALSE density = TRUE - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY duration = 82 color = COLOR_DARK_ORANGE diff --git a/code/modules/mob/living/simple_animal/hostile/mimite.dm b/code/modules/mob/living/simple_animal/hostile/mimite.dm index 5bcf501fc6fad..f22746cdf0133 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimite.dm @@ -252,8 +252,8 @@ else if(entry_vent) if(get_dist(src, entry_vent) <= 3) var/list/vents = list() - var/datum/pipeline/entry_vent_parent = entry_vent.parents[1] - for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmosmch) + var/datum/pipenet/entry_vent_parent = entry_vent.parents[1] + for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in entry_vent_parent.other_atmos_machines) vents.Add(temp_vent) if(!vents.len) entry_vent = null diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 0b13bc997eed7..03b0f298116fa 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -58,7 +58,7 @@ . = ..() if(banana_time && banana_time < world.time) var/turf/T = get_turf(src) - var/list/adjacent = T.GetAtmosAdjacentTurfs(1) + var/list/adjacent = T.get_atmos_adjacent_turfs(1) new banana_type(pick(adjacent)) banana_time = world.time + rand(30,60) diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 69bf4b5e26a05..abb27269a512a 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -49,12 +49,12 @@ if(isopenturf(loc)) var/turf/open/T = src.loc if(T.air) - var/co2 = T.air.get_moles(GAS_CO2) + var/co2 = GET_MOLES(/datum/gas/carbon_dioxide, T.air) if(co2 > 0) if(prob(25)) var/amt = min(co2, 9) - T.air.adjust_moles(GAS_CO2, -amt) - T.atmos_spawn_air("o2=[amt];TEMP=293.15") + T.air.gases[/datum/gas/carbon_dioxide][MOLES] += -amt + T.atmos_spawn_air("[GAS_O2]=[amt];[TURF_TEMPERATURE(T20C)]") /mob/living/simple_animal/hostile/tree/festivus name = "festivus pole" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 22dde6a9bb795..2eb087aa46f87 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -279,10 +279,10 @@ if(isturf(loc) && isopenturf(loc)) var/turf/open/ST = loc if(ST.air) - var/tox = ST.air.get_moles(GAS_PLASMA) - var/oxy = ST.air.get_moles(GAS_O2) - var/n2 = ST.air.get_moles(GAS_N2) - var/co2 = ST.air.get_moles(GAS_CO2) + var/tox = GET_MOLES(/datum/gas/plasma, ST.air) + var/oxy = GET_MOLES(/datum/gas/oxygen, ST.air) + var/n2 = GET_MOLES(/datum/gas/nitrogen, ST.air) + var/co2 = GET_MOLES(/datum/gas/carbon_dioxide, ST.air) if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"]) . = FALSE diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 1b24d5a69da4a..9b97fa61dd987 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -95,13 +95,13 @@ adjustBruteLoss(round(sqrt(bodytemperature)) * 2) if(stat != DEAD) - var/bz_percentage = environment.total_moles() ? (environment.get_moles(GAS_BZ) / environment.total_moles()) : 0 + var/bz_percentage = environment.total_moles() ? (GET_MOLES(/datum/gas/bz, environment) / environment.total_moles()) : 0 var/stasis = (bz_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis if(transformeffects & SLIME_EFFECT_DARK_PURPLE) var/amt = is_adult ? 30 : 15 - var/plas_amt = min(amt,environment.get_moles(GAS_PLASMA)) - environment.adjust_moles(GAS_PLASMA, -plas_amt) - environment.adjust_moles(GAS_O2, plas_amt) + var/plas_amt = min(amt,GET_MOLES(/datum/gas/plasma, environment)) + REMOVE_MOLES(/datum/gas/plasma, environment, plas_amt) + ADD_MOLES(/datum/gas/oxygen, environment, plas_amt) adjustBruteLoss(plas_amt ? -2 : 0) switch(stat) diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index dd145d8c10327..07371fbcbe978 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -47,8 +47,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( if(vent_found) - var/datum/pipeline/vent_found_parent = vent_found.parents[1] - if(vent_found_parent && (vent_found_parent.members.len || vent_found_parent.other_atmosmch)) + var/datum/pipenet/vent_found_parent = vent_found.parents[1] + if(vent_found_parent && (vent_found_parent.members.len || vent_found_parent.other_atmos_machines)) visible_message(span_notice("[src] begins climbing into the ventilation system.") ,span_notice("You begin climbing into the ventilation system.")) if(!do_after(src, 25, target = vent_found)) @@ -86,9 +86,9 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( return var/list/totalMembers = list() - for(var/datum/pipeline/P in starting_machine.returnPipenets()) + for(var/datum/pipenet/P in starting_machine.return_pipenets()) totalMembers += P.members - totalMembers += P.other_atmosmch + totalMembers += P.other_atmos_machines if(!totalMembers.len) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 78dbcb1b1cc60..416e63c4c64a7 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -137,9 +137,9 @@ var/t = span_notice("Coordinates: [x],[y] \n") t += span_danger("Temperature: [environment.return_temperature()] \n") - for(var/id in environment.get_gases()) - if(environment.get_moles(id)) - t+=span_notice("[GLOB.gas_data.names[id]]: [environment.get_moles(id)] \n") + for(var/id in environment.gases) + if(environment.gases[id][MOLES]) + t+=span_notice("[GLOB.meta_gas_info[id][META_GAS_NAME]]: [environment.gases[id][MOLES]] \n") to_chat(usr, t) diff --git a/code/modules/modular_computers/file_system/programs/atmosscan.dm b/code/modules/modular_computers/file_system/programs/atmosscan.dm index d2bafd7c7a063..ea275ef5fbf5d 100644 --- a/code/modules/modular_computers/file_system/programs/atmosscan.dm +++ b/code/modules/modular_computers/file_system/programs/atmosscan.dm @@ -30,10 +30,10 @@ data["AirTempC"] = round(environment.return_temperature() - T0C) data["AirTempK"] = round(environment.return_temperature()) if (total_moles) - for(var/id in environment.get_gases()) - var/gas_level = environment.get_moles(id)/total_moles + for(var/id in environment.gases) + var/gas_level = GET_MOLES(id, environment)/total_moles if(gas_level > 0) - airlist += list(list("name" = "[GLOB.gas_data.names[id]]", "percentage" = round(gas_level*100, 0.01))) + airlist += list(list("name" = "[GLOB.meta_gas_info[id][META_GAS_NAME]]", "percentage" = round(gas_level*100, 0.01))) data["AirData"] = airlist else data["AirPressure"] = 0 diff --git a/code/modules/modular_computers/file_system/programs/phys_scanner.dm b/code/modules/modular_computers/file_system/programs/phys_scanner.dm index 3b97e121483ef..8dfe03b0198c9 100644 --- a/code/modules/modular_computers/file_system/programs/phys_scanner.dm +++ b/code/modules/modular_computers/file_system/programs/phys_scanner.dm @@ -79,7 +79,7 @@ /datum/computer_file/program/phys_scanner/attack_atom(obj/target, mob/living/user) switch(current_mode) if(DISK_ATMOS) - var/scan_result = atmosanalyzer_scan(user, target, silent = TRUE, to_chat = FALSE) + var/scan_result = atmos_scan(user, target, FALSE) if(scan_result) user.visible_message("[user] analyzes [icon2html(target, viewers(user))] [target]'s gas contents.", span_notice("You analyze [icon2html(target, user)] [target]'s gas contents.")) last_record = scan_result diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 24655cd28d86e..53a198e252794 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -183,12 +183,7 @@ if(malfai && operating) malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000) - if(area) - area.power_light = FALSE - area.power_equip = FALSE - area.power_environ = FALSE - area.power_change() - area.apc = null + disconnect_from_area() QDEL_NULL(alarm_manager) if(occupier) malfvacate(TRUE) @@ -198,8 +193,50 @@ QDEL_NULL(cell) if(terminal) disconnect_terminal() + return ..() + +/obj/machinery/power/apc/proc/assign_to_area(area/target_area = get_area(src)) + if(area == target_area) + return + + disconnect_from_area() + area = target_area + area.power_light = TRUE + area.power_equip = TRUE + area.power_environ = TRUE + area.power_change() + area.apc = src + auto_name = TRUE + + update_name() + +/obj/machinery/power/apc/update_name(updates) + . = ..() + if(auto_name) + name = "\improper [get_area_name(area, TRUE)] APC" + +/obj/machinery/power/apc/proc/disconnect_from_area() + if(isnull(area)) + return + + area.power_light = FALSE + area.power_equip = FALSE + area.power_environ = FALSE + area.power_change() + area.apc = null + area = null +/obj/machinery/power/apc/ComponentInitialize() . = ..() + AddElement(/datum/element/atmos_sensitive) + +/obj/machinery/power/apc/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return (exposed_temperature > 2000) + +/obj/machinery/power/apc/atmos_expose(datum/gas_mixture/air, exposed_temperature) + take_damage(min(exposed_temperature/100, 10), BURN) + + /obj/machinery/power/apc/handle_atom_del(atom/A) if(A == cell) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 456414d16ebc4..d2955aa132d75 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -80,8 +80,8 @@ var/heat = energy_transfer*(1-efficiency) lastgen += energy_transfer*efficiency - hot_air.set_temperature(hot_air.return_temperature() - energy_transfer/hot_air_heat_capacity) - cold_air.set_temperature(cold_air.return_temperature() + heat/cold_air_heat_capacity) + hot_air.temperature = (hot_air.return_temperature() - energy_transfer/hot_air_heat_capacity) + cold_air.temperature = (cold_air.return_temperature() + heat/cold_air_heat_capacity) //add_avail(lastgen) This is done in process now // update icon overlays only if displayed level has changed diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 6e7c33edd2aee..adad7fdbf54e9 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -14,6 +14,7 @@ idle_power_usage = 2 active_power_usage = 20 power_channel = AREA_USAGE_LIGHT //Lights are calc'd via area so they dont need to be in the machine list + always_area_sensitive = TRUE var/on = FALSE // 1 if on, 0 if off var/on_gs = FALSE var/static_power_used = 0 @@ -127,6 +128,10 @@ if(nightshift_enabled) update(FALSE, TRUE, TRUE) +/obj/machinery/light/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + /obj/machinery/light/Destroy() var/area/A = get_area(src) if(A) @@ -173,6 +178,28 @@ return . += mutable_appearance(overlayicon, base_state) +// Area sensitivity is traditionally tied directly to power use, as an optimization +// But since we want it for fire reacting, we disregard that +/obj/machinery/light/setup_area_power_relationship() + . = ..() + if(!.) + return + var/area/our_area = get_area(src) + RegisterSignal(our_area, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) + +/obj/machinery/light/on_enter_area(datum/source, area/area_to_register) + ..() + RegisterSignal(area_to_register, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) + handle_fire(area_to_register, area_to_register.fire) + +/obj/machinery/light/on_exit_area(datum/source, area/area_to_unregister) + ..() + UnregisterSignal(area_to_unregister, COMSIG_AREA_FIRE_CHANGED) + +/obj/machinery/light/proc/handle_fire(area/source, new_fire) + SIGNAL_HANDLER + update() + // update the icon_state and luminosity of the light depending on its state /obj/machinery/light/proc/update(trigger = TRUE, quiet = FALSE, instant = FALSE) switch(status) @@ -632,7 +659,10 @@ // called when on fire -/obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/machinery/light/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature > 673 + +/obj/machinery/light/atmos_expose(datum/gas_mixture/air, exposed_temperature) if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C break_light_tube() diff --git a/code/modules/power/rbmk/rbmk_core.dm b/code/modules/power/rbmk/rbmk_core.dm index b4cbf996bb61f..069d210f6314c 100644 --- a/code/modules/power/rbmk/rbmk_core.dm +++ b/code/modules/power/rbmk/rbmk_core.dm @@ -222,7 +222,8 @@ Remember kids. If the reactor itself is not physically powered by an APC, it can if(linked_moderator) QDEL_NULL(linked_moderator) if(linked_interface) - QDEL_NULL(linked_interface) + linked_interface.reactor = null + linked_interface = null grilled_item = null QDEL_NULL(grill_loop) QDEL_NULL(radio) diff --git a/code/modules/power/rbmk/rbmk_main_processes.dm b/code/modules/power/rbmk/rbmk_main_processes.dm index 0634b6f73598d..76d8af265c348 100644 --- a/code/modules/power/rbmk/rbmk_main_processes.dm +++ b/code/modules/power/rbmk/rbmk_main_processes.dm @@ -37,19 +37,18 @@ last_heat_delta = heat_delta temperature += heat_delta coolant_output.merge(coolant_input) //And now, shove the input into the output. - coolant_input.clear() //Clear out anything left in the input gate. no_coolant_ticks = max(0, no_coolant_ticks-2) //Needs half as much time to recover the ticks than to acquire them else if(has_fuel()) no_coolant_ticks++ if(no_coolant_ticks > RBMK_NO_COOLANT_TOLERANCE) temperature += temperature / 500 //This isn't really harmful early game, but when your reactor is up to full power, this can get out of hand quite quickly. - critical_threshold_proximity += temperature / 200 //Think fast loser. + critical_threshold_proximity += ((temperature / 200) * delta_time) //Think fast loser. check_alert() playsound(src, 'sound/weapons/smash.ogg', 50, 1) //Just for the sound effect, to let you know you've fucked up. //Now, heat up the output and set our pressure. - coolant_output.set_temperature(temperature+273.15) //Heat the coolant output gas that we just had pass through us. + coolant_output.temperature = temperature + 273.15 //Heat the coolant output gas that we just had pass through us. last_output_temperature = coolant_output.return_temperature()-273.15 pressure = coolant_output.return_pressure() power = (temperature / RBMK_TEMPERATURE_CRITICAL) * 100 @@ -60,34 +59,35 @@ gas_absorption_effectiveness = gas_absorption_constant last_power_produced = 0 //Next up, handle moderators! - if(moderator_input.total_moles() >= minimum_coolant_level) - var/total_fuel_moles = moderator_input.get_moles(GAS_PLASMA) + (moderator_input.get_moles(GAS_NITROUS)*2)+ (moderator_input.get_moles(GAS_TRITIUM)*10) //n2o is 50% more efficient as fuel than plasma, but is harder to produce - var/power_modifier = max((moderator_input.get_moles(GAS_O2) / moderator_input.total_moles() * 10), 1) //You can never have negative IPM. For now. + var/moderator_input_total_mols = moderator_input.total_moles() + if(moderator_input_total_mols >= minimum_coolant_level) + var/total_fuel_moles = GET_MOLES(/datum/gas/plasma, moderator_input) + (GET_MOLES(/datum/gas/nitrous_oxide, moderator_input)*2) + (GET_MOLES(/datum/gas/tritium, moderator_input)*10) //n2o is 50% more efficient as fuel than plasma, but is harder to produce + var/power_modifier = max(GET_MOLES(/datum/gas/oxygen, moderator_input) / moderator_input_total_mols * 10, 1) //You can never have negative IPM. For now. if(total_fuel_moles >= minimum_coolant_level) //You at least need SOME fuel. - var/power_produced = max((total_fuel_moles / moderator_input.total_moles() * 10), 1) - last_power_produced = max(0,((power_produced*power_modifier)*moderator_input.total_moles())) + var/power_produced = max((total_fuel_moles / moderator_input_total_mols * 10), 1) + last_power_produced = max(0,((power_produced*power_modifier)*moderator_input_total_mols)) last_power_produced *= (max(0,power)/100) //Aaaand here comes the cap. Hotter reactor => more power. last_power_produced *= base_power_modifier //Finally, we turn it into actual usable numbers. - radioactivity_spice_multiplier += moderator_input.get_moles(GAS_TRITIUM) / 5 //Chernobyl 2. + radioactivity_spice_multiplier += GET_MOLES(/datum/gas/tritium, moderator_input) / 5 //Chernobyl 2. if(power >= 20) - coolant_output.adjust_moles(GAS_TRITIUM, total_fuel_moles/20) //Shove out tritium into the air when it's fuelled. You need to filter this off, or you're gonna have a bad time. + ADD_MOLES(/datum/gas/tritium, coolant_output, total_fuel_moles/20) //Shove out tritium into the air when it's fuelled. You need to filter this off, or you're gonna have a bad time. - var/total_control_moles = moderator_input.get_moles(GAS_N2) + (moderator_input.get_moles(GAS_CO2)*4) + (moderator_input.get_moles(GAS_PLUOXIUM)*8) //N2 helps you control the reaction at the cost of making it absolutely blast you with rads. Pluoxium has the same effect but without the rads! + var/total_control_moles = GET_MOLES(/datum/gas/nitrogen, moderator_input) + (GET_MOLES(/datum/gas/carbon_dioxide, moderator_input)*4) + (GET_MOLES(/datum/gas/pluoxium, moderator_input)*8) //N2 helps you control the reaction at the cost of making it absolutely blast you with rads. Pluoxium has the same effect but without the rads! if(total_control_moles >= minimum_coolant_level) var/control_bonus = total_control_moles / 250 //1 mol of n2 -> 0.002 bonus control rod effectiveness, if you want a super controlled reaction, you'll have to sacrifice some power. control_rod_effectiveness = initial(control_rod_effectiveness) + control_bonus - radioactivity_spice_multiplier += moderator_input.get_moles(GAS_N2) / 25 //An example setup of 50 moles of n2 (for dealing with spent fuel) leaves us with a radioactivity spice multiplier of 3. - radioactivity_spice_multiplier += moderator_input.get_moles(GAS_CO2) / 12.5 - var/total_permeability_moles = moderator_input.get_moles(GAS_BZ) + (moderator_input.get_moles(GAS_H2O)*2) + (moderator_input.get_moles(GAS_HYPERNOB)*10) + radioactivity_spice_multiplier += GET_MOLES(/datum/gas/nitrogen, moderator_input) / 25 //An example setup of 50 moles of n2 (for dealing with spent fuel) leaves us with a radioactivity spice multiplier of 3. + radioactivity_spice_multiplier += GET_MOLES(/datum/gas/carbon_dioxide, moderator_input) / 12.5 + var/total_permeability_moles = GET_MOLES(/datum/gas/bz, moderator_input) + (GET_MOLES(/datum/gas/water_vapor, moderator_input)*2) + (GET_MOLES(/datum/gas/hypernoblium, moderator_input)*10) if(total_permeability_moles >= minimum_coolant_level) var/permeability_bonus = total_permeability_moles / 500 gas_absorption_effectiveness = gas_absorption_constant + permeability_bonus - var/total_degradation_moles = moderator_input.get_moles(GAS_NITRYL) //Because it's quite hard to get. + var/total_degradation_moles = GET_MOLES(/datum/gas/nitryl, moderator_input) //Because it's quite hard to get. if(total_degradation_moles >= minimum_coolant_level*0.5) //I'll be nice. depletion_modifier += total_degradation_moles / 15 //Oops! All depletion. This causes your fuel rods to get SPICY. playsound(src, pick('sound/machines/sm/accent/normal/1.ogg','sound/machines/sm/accent/normal/2.ogg','sound/machines/sm/accent/normal/3.ogg','sound/machines/sm/accent/normal/4.ogg','sound/machines/sm/accent/normal/5.ogg'), 100, TRUE) //From this point onwards, we clear out the remaining gasses. - moderator_input.clear() //Woosh. And the soul is gone. + moderator_input.remove_ratio(moderator_input_total_mols) //Woosh. And the soul is gone. rate_of_reaction += total_fuel_moles / 1000 var/fuel_power = 0 //So that you can't magically generate rate_of_reaction with your control rods. if(!has_fuel()) //Reactor must be fuelled and ready to go before we can heat it up boys. diff --git a/code/modules/power/rbmk/rbmk_parts.dm b/code/modules/power/rbmk/rbmk_parts.dm index 54cc39f6ea3e4..c951b9bfe3f2f 100644 --- a/code/modules/power/rbmk/rbmk_parts.dm +++ b/code/modules/power/rbmk/rbmk_parts.dm @@ -240,18 +240,18 @@ if(box.box_type == "coolant_input") var/obj/machinery/atmospherics/components/unary/rbmk/coolant_input/coolant_input_machine = new/obj/machinery/atmospherics/components/unary/rbmk/coolant_input(box.loc, TRUE) coolant_input_machine.dir = box.dir - coolant_input_machine.SetInitDirections() - coolant_input_machine.build_network() + coolant_input_machine.set_init_directions() + coolant_input_machine.rebuild_pipes() else if(box.box_type == "moderator_input") var/obj/machinery/atmospherics/components/unary/rbmk/moderator_input/moderator_input_machine = new/obj/machinery/atmospherics/components/unary/rbmk/moderator_input(box.loc, TRUE) moderator_input_machine.dir = box.dir - moderator_input_machine.SetInitDirections() - moderator_input_machine.build_network() + moderator_input_machine.set_init_directions() + moderator_input_machine.rebuild_pipes() else if(box.box_type == "waste_output") var/obj/machinery/atmospherics/components/unary/rbmk/waste_output/waste_output_machine = new/obj/machinery/atmospherics/components/unary/rbmk/waste_output(box.loc, TRUE) waste_output_machine.dir = box.dir - waste_output_machine.SetInitDirections() - waste_output_machine.build_network() + waste_output_machine.set_init_directions() + waste_output_machine.rebuild_pipes() new /obj/machinery/atmospherics/components/unary/rbmk/core(loc, TRUE) for(var/obj/item/RBMK_box/box in parts) qdel(box) diff --git a/code/modules/power/rbmk/rbmk_procs.dm b/code/modules/power/rbmk/rbmk_procs.dm index 6f0c1517d2385..16f0b630baa78 100644 --- a/code/modules/power/rbmk/rbmk_procs.dm +++ b/code/modules/power/rbmk/rbmk_procs.dm @@ -380,7 +380,7 @@ Arguments: var/turf/core_turf = get_turf(src) if(temperature >= RBMK_TEMPERATURE_CRITICAL) var/damagevalue = (temperature - 900)/250 - critical_threshold_proximity += damagevalue + critical_threshold_proximity += (damagevalue * delta_time) warning_damage_flags |= RBMK_TEMPERATURE_DAMAGE check_alert() if(critical_threshold_proximity >= melting_point) @@ -391,9 +391,10 @@ Arguments: if (pressure >= RBMK_PRESSURE_CRITICAL) playsound(src, 'sound/machines/clockcult/steam_whoosh.ogg', 100, TRUE) core_turf.atmos_spawn_air("water_vapor=[pressure/100];TEMP=[temperature+273.15]") + core_turf.air_update_turf(TRUE, FALSE) // Warning: Pressure reaching critical thresholds! var/damagevalue = (pressure-10100)/1500 - critical_threshold_proximity += damagevalue + critical_threshold_proximity += (damagevalue * delta_time) warning_damage_flags |= RBMK_PRESSURE_DAMAGE check_alert() if(critical_threshold_proximity >= melting_point) @@ -510,9 +511,9 @@ Arguments: var/datum/gas_mixture/coolant_input = linked_input.airs[1] var/datum/gas_mixture/moderator_input = linked_moderator.airs[1] var/datum/gas_mixture/coolant_output = linked_output.airs[1] - coolant_input.set_temperature((temperature+273.15)*2) - moderator_input.set_temperature((temperature+273.15)*2) - coolant_output.set_temperature((temperature+273.15)*2) + coolant_input.temperature = ((temperature+273.15)*2) + moderator_input.temperature = ((temperature+273.15)*2) + coolant_output.temperature = ((temperature+273.15)*2) reactor_turf.assume_air(coolant_input) reactor_turf.assume_air(moderator_input) reactor_turf.assume_air(coolant_output) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 9bef8fd280a59..c475a5bf75113 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -49,29 +49,30 @@ /obj/machinery/power/rad_collector/process(delta_time) if(!loaded_tank) return + var/datum/gas_mixture/loaded_tank_air = loaded_tank.return_air() if(!bitcoinmining) - if(loaded_tank.air_contents.get_moles(GAS_PLASMA) < 0.0001) + if(GET_MOLES(/datum/gas/plasma, loaded_tank.air_contents) < 0.0001) investigate_log("out of fuel.", INVESTIGATE_ENGINES) playsound(src, 'sound/machines/ding.ogg', 50, 1) var/msg = "Plasma depleted, recommend replacing tank." radio.talk_into(src, msg, RADIO_CHANNEL_ENGINEERING) eject() else - var/gasdrained = min(powerproduction_drain*drainratio*delta_time,loaded_tank.air_contents.get_moles(GAS_PLASMA)) - loaded_tank.air_contents.adjust_moles(GAS_PLASMA, -gasdrained) - loaded_tank.air_contents.adjust_moles(GAS_TRITIUM, gasdrained) + var/gasdrained = min(powerproduction_drain*drainratio*delta_time,GET_MOLES(/datum/gas/plasma, loaded_tank.air_contents)) + REMOVE_MOLES(/datum/gas/plasma, loaded_tank.air_contents, gasdrained) + ADD_MOLES(/datum/gas/tritium, loaded_tank.air_contents, gasdrained) var/power_produced = RAD_COLLECTOR_OUTPUT add_avail(power_produced) stored_energy-=power_produced else if(is_station_level(z) && SSresearch.science_tech) - if(!loaded_tank.air_contents.get_moles(GAS_TRITIUM) || !loaded_tank.air_contents.get_moles(GAS_O2)) + if(!GET_MOLES(/datum/gas/tritium, loaded_tank.air_contents) || !GET_MOLES(/datum/gas/oxygen, loaded_tank.air_contents)) playsound(src, 'sound/machines/ding.ogg', 50, 1) eject() else var/gasdrained = bitcoinproduction_drain*drainratio*delta_time - loaded_tank.air_contents.adjust_moles(GAS_TRITIUM, -gasdrained) - loaded_tank.air_contents.adjust_moles(GAS_O2, -gasdrained) - loaded_tank.air_contents.adjust_moles(GAS_CO2, gasdrained*2) + loaded_tank_air.gases[/datum/gas/tritium][MOLES] += -gasdrained + loaded_tank_air.gases[/datum/gas/oxygen][MOLES] += -gasdrained + loaded_tank_air.gases[/datum/gas/carbon_dioxide][MOLES] += gasdrained*2 var/bitcoins_mined = RAD_COLLECTOR_OUTPUT var/datum/bank_account/D = SSeconomy.get_budget_account(ACCOUNT_ENG_ID) if(D) @@ -86,7 +87,9 @@ toggle_power() user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \ span_notice("You turn the [src.name] [active? "on":"off"].")) - var/fuel = loaded_tank?.air_contents.get_moles(GAS_PLASMA) + var/fuel = 0 + if(loaded_tank) + fuel = GET_MOLES(/datum/gas/plasma, loaded_tank.air_contents) investigate_log("turned [active?"on":"off"] by [key_name(user)]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_ENGINES) return else diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 0088f93491e7b..fff8a2cb5ab7b 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -28,6 +28,7 @@ /obj/machinery/field/containment/Destroy() FG1?.fields -= src FG2?.fields -= src + air_update_turf(TRUE, FALSE) return ..() /obj/machinery/field/containment/proc/block_singularity() diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index be9966d7b7bba..17f96e9c98a8e 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -191,6 +191,8 @@ field_generator power level display /obj/machinery/field/generator/proc/turn_off() active = FG_OFFLINE + air_update_turf(TRUE, FALSE) + can_atmos_pass = ATMOS_PASS_YES spawn(1) cleanup() while (warming_up>0 && !active) @@ -260,8 +262,8 @@ field_generator power level display turn_off() return move_resist = INFINITY - CanAtmosPass = ATMOS_PASS_NO - air_update_turf(TRUE) + can_atmos_pass = ATMOS_PASS_NO + air_update_turf(TRUE, TRUE) addtimer(CALLBACK(src, PROC_REF(setup_field), 1), 1) addtimer(CALLBACK(src, PROC_REF(setup_field), 2), 2) addtimer(CALLBACK(src, PROC_REF(setup_field), 4), 3) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index d51f6d6a7f3d7..fa254092a2ca5 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -220,17 +220,20 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) data["SM_bad_moles_amount"] = MOLE_PENALTY_THRESHOLD / gasefficency data["SM_moles"] = 0 var/list/gasdata = list() + if(air.total_moles()) data["SM_moles"] = air.total_moles() - for(var/gasid in air.get_gases()) + for(var/gasid in air.gases) gasdata.Add(list(list( - "name"= GLOB.gas_data.names[gasid], - "amount" = round(100*air.get_moles(gasid)/air.total_moles(),0.01)))) + "name"= air.gases[gasid][GAS_META][META_GAS_NAME], + "amount" = round(100*air.gases[gasid][MOLES]/air.total_moles(),0.01)))) + else - for(var/gasid in air.get_gases()) + for(var/gasid in air.gases) gasdata.Add(list(list( - "name"= GLOB.gas_data.names[gasid], - "amount" = 0))) + "name"= air.gases[gasid][GAS_META][META_GAS_NAME], + "amount" = 0, + "id" = air.gases[gasid][GAS_META]))) data["gases"] = gasdata return data @@ -453,19 +456,17 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //This is more error prevention, according to all known laws of atmos, gas_mix.remove() should never make negative mol values. //But this is tg - //Lets get the proportions of the gasses in the mix and then slowly move our comp to that value - //Can cause an overestimation of mol count, should stabalize things though. - //Prevents huge bursts of gas/heat when a large amount of something is introduced + //Lets get the proportions of the gasses in the mix for scaling stuff later //They range between 0 and 1 - plasmacomp += clamp(max(removed.get_moles(GAS_PLASMA)/combined_gas, 0) - plasmacomp, -1, gas_change_rate) - o2comp += clamp(max(removed.get_moles(GAS_O2)/combined_gas, 0) - o2comp, -1, gas_change_rate) - co2comp += clamp(max(removed.get_moles(GAS_CO2)/combined_gas, 0) - co2comp, -1, gas_change_rate) - pluoxiumcomp += clamp(max(removed.get_moles(GAS_PLUOXIUM)/combined_gas, 0) - pluoxiumcomp, -1, gas_change_rate) - tritiumcomp += clamp(max(removed.get_moles(GAS_TRITIUM)/combined_gas, 0) - tritiumcomp, -1, gas_change_rate) - bzcomp += clamp(max(removed.get_moles(GAS_BZ)/combined_gas, 0) - bzcomp, -1, gas_change_rate) + plasmacomp += clamp(max(GET_MOLES(/datum/gas/plasma, removed)/combined_gas, 0) - plasmacomp, -1, gas_change_rate) + o2comp += clamp(max(GET_MOLES(/datum/gas/oxygen, removed)/combined_gas, 0) - o2comp, -1, gas_change_rate) + co2comp += clamp(max(GET_MOLES(/datum/gas/carbon_dioxide, removed)/combined_gas, 0) - co2comp, -1, gas_change_rate) + pluoxiumcomp += clamp(max(GET_MOLES(/datum/gas/pluoxium, removed)/combined_gas, 0) - pluoxiumcomp, -1, gas_change_rate) + tritiumcomp += clamp(max(GET_MOLES(/datum/gas/tritium, removed)/combined_gas, 0) - tritiumcomp, -1, gas_change_rate) + bzcomp += clamp(max(GET_MOLES(/datum/gas/bz, removed)/combined_gas, 0) - bzcomp, -1, gas_change_rate) - n2ocomp += clamp(max(removed.get_moles(GAS_NITROUS)/combined_gas, 0) - n2ocomp, -1, gas_change_rate) - n2comp += clamp(max(removed.get_moles(GAS_N2)/combined_gas, 0) - n2comp, -1, gas_change_rate) + n2ocomp += clamp(max(GET_MOLES(/datum/gas/nitrous_oxide, removed)/combined_gas, 0) - n2ocomp, -1, gas_change_rate) + n2comp += clamp(max(GET_MOLES(/datum/gas/nitrogen, removed)/combined_gas, 0) - n2comp, -1, gas_change_rate) gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp + tritiumcomp + bzcomp - pluoxiumcomp - n2comp, 0), 1) @@ -474,6 +475,16 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) power_transmission_bonus = 1 + max((plasmacomp * PLASMA_TRANSMIT_MODIFIER) + (o2comp * OXYGEN_TRANSMIT_MODIFIER), 0) + //Let's say that the CO2 touches the SM surface and the radiation turns it into Pluoxium. + if(co2comp && o2comp) + var/carbon_dioxide_pp = env.return_pressure() * co2comp + var/consumed_carbon_dioxide = clamp(((carbon_dioxide_pp - CO2_CONSUMPTION_PP) / (carbon_dioxide_pp + CO2_PRESSURE_SCALING)), CO2_CONSUMPTION_RATIO_MIN, CO2_CONSUMPTION_RATIO_MAX) + consumed_carbon_dioxide = min(consumed_carbon_dioxide * co2comp * combined_gas, removed.gases[/datum/gas/carbon_dioxide][MOLES] * INVERSE(0.5), removed.gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5)) + if(consumed_carbon_dioxide) + REMOVE_MOLES(/datum/gas/carbon_dioxide, removed, consumed_carbon_dioxide * 0.5) + REMOVE_MOLES(/datum/gas/oxygen, removed, consumed_carbon_dioxide * 0.5) + ADD_MOLES(/datum/gas/pluoxium, removed, consumed_carbon_dioxide * 0.25) + //more moles of gases are harder to heat than fewer, so let's scale heat damage around them mole_heat_penalty = max(combined_gas / MOLE_HEAT_PENALTY, 0.25) @@ -501,7 +512,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) power = clamp((removed.return_temperature() * temp_factor / T0C) * gasmix_power_ratio + power, 0, SUPERMATTER_MAXIMUM_ENERGY) //Total laser power plus an overload if(prob(50)) - last_rads = power * max(0, power_transmission_bonus * (1 + (tritiumcomp * TRITIUM_RADIOACTIVITY_MODIFIER) + (pluoxiumcomp * PLUOXIUM_RADIOACTIVITY_MODIFIER) + (bzcomp * BZ_RADIOACTIVITY_MODIFIER))) // Rad Modifiers BZ(500%), Tritium(300%), and Pluoxium(-200%) + last_rads = power * max(0, power_transmission_bonus * (1 + (tritiumcomp * TRITIUM_RADIOACTIVITY_MODIFIER) + (pluoxiumcomp * PLUOXIUM_RADIOACTIVITY_MODIFIER) + (bzcomp * BZ_RADIOACTIVITY_MODIFIER))) radiation_pulse(src, last_rads) if(bzcomp >= 0.4 && prob(30 * bzcomp)) src.fire_nuclear_particle() // Start to emit radballs at a maximum of 30% chance per tick @@ -516,18 +527,20 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock //is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall. - removed.set_temperature(removed.return_temperature() + ((device_energy * dynamic_heat_modifier) / THERMAL_RELEASE_MODIFIER)) + removed.temperature = (removed.return_temperature() + ((device_energy * dynamic_heat_modifier) / THERMAL_RELEASE_MODIFIER)) - removed.set_temperature(max(0, min(removed.return_temperature(), 2500 * dynamic_heat_modifier))) + removed.temperature = (max(0, min(removed.return_temperature(), 2500 * dynamic_heat_modifier))) //Calculate how much gas to release - removed.adjust_moles(GAS_PLASMA, max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)) + ADD_MOLES(/datum/gas/plasma, removed, max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)) + + ADD_MOLES(/datum/gas/oxygen, removed, max(((device_energy + removed.return_temperature() * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) - removed.adjust_moles(GAS_O2, max(((device_energy + removed.return_temperature() * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) + removed.garbage_collect() if(produces_gas) env.merge(removed) - air_update_turf() + air_update_turf(FALSE, FALSE) for(var/mob/living/carbon/human/l in viewers(HALLUCINATION_RANGE(power), src)) // If they can see it without mesons on. Bad on them. if(HAS_TRAIT(l, TRAIT_MADNESS_IMMUNE) || (l.mind && HAS_TRAIT(l.mind, TRAIT_MADNESS_IMMUNE))) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 4b41e959658f0..4121ce60053e2 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -48,7 +48,7 @@ if(in_range(user, src) || isobserver(user)) . += span_notice("The status display reads: Power generation at [input_power_multiplier*100]%.
    Shock interval at [zap_cooldown*0.1] seconds.") -/obj/machinery/power/tesla_coil/on_construction() +/obj/machinery/power/tesla_coil/on_construction(mob/user) if(anchored) connect_to_network() @@ -152,7 +152,7 @@ return return ..() -/obj/machinery/power/tesla_coil/research/on_construction() +/obj/machinery/power/tesla_coil/research/on_construction(mob/user) if(anchored) connect_to_network() diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 3625396c6a961..dc240cecd8139 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -29,7 +29,7 @@ icon_state = "compressor" density = TRUE resistance_flags = FIRE_PROOF - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY circuit = /obj/item/circuitboard/machine/power_compressor var/obj/machinery/power/turbine/turbine var/datum/gas_mixture/gas_contained @@ -54,7 +54,7 @@ icon_state = "turbine" density = TRUE resistance_flags = FIRE_PROOF - CanAtmosPass = ATMOS_PASS_DENSITY + can_atmos_pass = ATMOS_PASS_DENSITY circuit = /obj/item/circuitboard/machine/power_turbine @@ -134,12 +134,17 @@ return cut_overlays() - rpm = 0.9* rpm + 0.1 * rpmtarget + if(istype(inturf, /turf/open)) + rpm = 0.9 * rpm + 0.1 * rpmtarget + var/datum/gas_mixture/environment = inturf.return_air() // It's a simplified version taking only 1/10 of the moles from the turf nearby. It should be later changed into a better version - // above todo 7 years and counting - inturf.transfer_air_ratio(gas_contained, 0.1) + var/transfer_moles = environment.total_moles()/10 + var/datum/gas_mixture/removed = inturf.remove_air(transfer_moles) + gas_contained.merge(removed) + else + rpm = 0.9 * rpm // rpmtarget is basically 0, the intake is completely blocked with no airflow // RPM function to include compression friction - be advised that too low/high of a compfriction value can make things screwy @@ -217,7 +222,7 @@ // Weird function but it works. Should be something else... - var/newrpm = ((compressor.gas_contained.return_temperature()) * compressor.gas_contained.total_moles())/4 + var/newrpm = ((compressor.gas_contained.temperature) * compressor.gas_contained.total_moles())/4 newrpm = max(0, newrpm) @@ -226,10 +231,8 @@ if(compressor.gas_contained.total_moles()>0) var/oamount = min(compressor.gas_contained.total_moles(), (compressor.rpm+100)/35000*compressor.capacity) - if(destroy_output) - compressor.gas_contained.remove(oamount) - else - outturf.assume_air_moles(compressor.gas_contained, oamount) + var/datum/gas_mixture/removed = compressor.gas_contained.remove(oamount) + outturf.assume_air(removed) // If it works, put an overlay that it works! @@ -274,7 +277,7 @@ data["online"] = compressor?.starter data["power"] = display_power(compressor?.turbine?.lastgen) data["rpm"] = compressor?.rpm - data["temp"] = compressor?.gas_contained.return_temperature() + data["temp"] = compressor?.gas_contained.temperature return data /obj/machinery/power/turbine/ui_act(action, params) @@ -340,7 +343,7 @@ data["online"] = compressor?.starter data["power"] = display_power(compressor?.turbine?.lastgen) data["rpm"] = compressor?.rpm - data["temp"] = compressor?.gas_contained.return_temperature() + data["temp"] = compressor?.gas_contained.temperature return data /obj/machinery/computer/turbine_computer/ui_act(action, params) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm index 18607b919aba4..64279d6ddccc4 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm @@ -12,11 +12,8 @@ var/list/map = mother.map for(var/turf/open/T in map) if(T.air) - if(T.initial_gas_mix) - T.air.parse_gas_string(T.initial_gas_mix) - T.set_temperature(T.air.return_temperature()) - else - T.air.copy_from_turf(T) + T.air = T.create_gas_mixture() + SSair.add_to_active(T, TRUE) /datum/mapGeneratorModule/bottomLayer/massdelete spawnableAtoms = list() diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm index c1151228ad583..906b79ff30580 100644 --- a/code/modules/projectiles/ammunition/_firing.dm +++ b/code/modules/projectiles/ammunition/_firing.dm @@ -41,8 +41,8 @@ qdel(reagents) /obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread) - var/turf/curloc = get_turf(user) - if (!istype(targloc) || !istype(curloc) || !BB) + var/turf/current_location = get_turf(user) + if (!istype(targloc) || !istype(current_location) || !BB) return FALSE var/firing_dir @@ -52,7 +52,7 @@ new firing_effect_type(get_turf(src), firing_dir) var/direct_target - if(targloc == curloc) + if(targloc == current_location) if(target) //if the target is right on our location we'll skip the travelling code in the proj's fire() direct_target = target if(!direct_target) diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm index a0677303a6613..35adcf1cb8d61 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -190,12 +190,12 @@ P.color = rgb(255 * percent,255 * ((100 - percent) / 100),0) else P.color = rgb(0, 255, 0) - var/turf/curloc = get_turf(src) + var/turf/current_location = get_turf(src) var/turf/targloc = get_turf(aiming_target) if(!istype(targloc)) - if(!istype(curloc)) + if(!istype(current_location)) return - targloc = get_turf_in_angle(lastangle, curloc, 10) + targloc = get_turf_in_angle(lastangle, current_location, 10) P.preparePixelProjectile(targloc, current_user, aiming_params, 0) P.fire(lastangle) @@ -380,12 +380,12 @@ HS_BB.gun = host /obj/item/ammo_casing/energy/beam_rifle/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread) - var/turf/curloc = get_turf(user) - if(!istype(curloc) || !BB) + var/turf/current_location = get_turf(user) + if(!istype(current_location) || !BB) return FALSE var/obj/item/gun/energy/beam_rifle/gun = loc if(!targloc && gun) - targloc = get_turf_in_angle(gun.lastangle, curloc, 10) + targloc = get_turf_in_angle(gun.lastangle, current_location, 10) else if(!targloc) return FALSE var/firing_dir diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 0733df0caaa56..f26c796eade8a 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -842,7 +842,7 @@ //Spread is FORCED! /obj/projectile/proc/preparePixelProjectile(atom/target, atom/source, params, spread = 0) - var/turf/curloc = get_turf(source) + var/turf/current_location = get_turf(source) var/turf/targloc = get_turf(target) trajectory_ignore_forcemove = TRUE forceMove(get_turf(source)) @@ -850,8 +850,8 @@ starting = get_turf(source) original = target if(targloc || !params) - yo = targloc.y - curloc.y - xo = targloc.x - curloc.x + yo = targloc.y - current_location.y + xo = targloc.x - current_location.x set_angle(get_angle(src, targloc) + spread) if(isliving(source) && params) @@ -861,8 +861,8 @@ set_angle(calculated[1] + spread) else if(targloc) - yo = targloc.y - curloc.y - xo = targloc.x - curloc.x + yo = targloc.y - current_location.y + xo = targloc.x - current_location.x set_angle(get_angle(src, targloc) + spread) else stack_trace("WARNING: Projectile [type] fired without either mouse parameters, or a target atom to aim at!") diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index c3c2a92a09074..cf927fa2144ff 100644 --- a/code/modules/reagents/chem_splash.dm +++ b/code/modules/reagents/chem_splash.dm @@ -45,7 +45,7 @@ for(var/turf/T as() in turflist) if(accessible[T]) continue - for(var/thing in T.GetAtmosAdjacentTurfs(alldir = TRUE)) + for(var/thing in T.get_atmos_adjacent_turfs(alldir = TRUE)) var/turf/NT = thing if(!(NT in accessible)) continue diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 48be03a9ba9c0..f80440b7f595f 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -275,6 +275,8 @@ color = "#8BA6E9" // rgb: 139, 166, 233 chem_flags = CHEMICAL_RNG_FUN | CHEMICAL_GOAL_BOTANIST_HARVEST taste_description = "mint" + ///40 joules per unit. + specific_heat = 40 /datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M) var/cooling = 0 @@ -306,13 +308,15 @@ /datum/reagent/consumable/frostoil/expose_turf(turf/T, reac_volume) if(reac_volume >= 5) - for(var/mob/living/simple_animal/slime/M in T) - M.adjustToxLoss(rand(15,30)) + for(var/mob/living/simple_animal/slime/slime_animal in T) + slime_animal.adjustToxLoss(rand(15,30)) if(reac_volume >= 1) // Make Freezy Foam and anti-fire grenades! if(isopenturf(T)) - var/turf/open/OT = T - OT.MakeSlippery(wet_setting=TURF_WET_ICE, min_wet_time=100, wet_time_to_add=reac_volume SECONDS) // Is less effective in high pressure/high heat capacity environments. More effective in low pressure. - OT.air.set_temperature(OT.air.return_temperature() - MOLES_CELLSTANDARD*100*reac_volume/OT.air.heat_capacity()) // reduces environment temperature by 5K per unit. + var/turf/open/exposed_open_turf = T + exposed_open_turf.MakeSlippery(wet_setting=TURF_WET_ICE, min_wet_time=100, wet_time_to_add=reac_volume SECONDS) // Is less effective in high pressure/high heat capacity environments. More effective in low pressure. + var/temperature = exposed_open_turf.air.temperature + var/heat_capacity = exposed_open_turf.air.heat_capacity() + exposed_open_turf.air.temperature = max(exposed_open_turf.air.temperature - ((temperature - TCMB) * (heat_capacity * reac_volume * specific_heat) / (heat_capacity + reac_volume * specific_heat)) / heat_capacity, TCMB) // Exchanges environment temperature with reagent. Reagent is at 2.7K with a heat capacity of 40J per unit. /datum/reagent/consumable/condensedcapsaicin name = "Condensed Capsaicin" diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index deb1ac00dcda6..9995f11f1a038 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -187,7 +187,7 @@ if(hotspot && !isspaceturf(T)) if(T.air) var/datum/gas_mixture/G = T.air - G.set_temperature(max(min(G.return_temperature()-(CT*1000),G.return_temperature()/CT),TCMB)) + G.temperature = (max(min(G.return_temperature()-(CT*1000),G.return_temperature()/CT),TCMB)) G.react(src) qdel(hotspot) var/obj/effect/acid/A = (locate(/obj/effect/acid) in T) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index b7105cef549f3..3e3537c7e57e6 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -322,7 +322,7 @@ if(T.air) var/datum/gas_mixture/G = T.air if(G.return_temperature() > T20C) - G.set_temperature(max(G.return_temperature()/2,T20C)) + G.temperature = (max(G.return_temperature()/2,T20C)) G.react(src) qdel(hotspot) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b348a16230842..3d37c3dbe68e7 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -181,8 +181,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers) reagents.expose_temperature(1000) return ..() -/obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - reagents.expose_temperature(exposed_temperature) +/obj/item/reagent_containers/fire_act(temperature, volume) + reagents.expose_temperature(temperature) /obj/item/reagent_containers/on_reagent_change(changetype) update_icon() diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 0e4c8099d6340..ae18e0ef1cdca 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -70,6 +70,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/disposal) trunk.linked = null return ..() +/obj/machinery/disposal/return_air() + if(!flushing) + return loc?.return_air() + return air_contents + /obj/machinery/disposal/singularity_pull(S, current_size) ..() if(current_size >= STAGE_FIVE) @@ -406,16 +411,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/disposal) var/atom/L = loc //recharging from loc turf var/datum/gas_mixture/env = L.return_air() + if(!env.temperature) + return var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.return_pressure() - if(env.return_temperature() > 0) - var/transfer_moles = 0.05 * delta_time * pressure_delta * air_contents.return_volume() / (env.return_temperature() * R_IDEAL_GAS_EQUATION) - - //Actually transfer the gas - var/datum/gas_mixture/removed = env.remove(transfer_moles) - air_contents.merge(removed) - air_update_turf() + var/transfer_moles = 0.05 * delta_time * (pressure_delta*air_contents.volume)/(env.temperature * R_IDEAL_GAS_EQUATION) + //Actually transfer the gas + var/datum/gas_mixture/removed = env.remove(transfer_moles) + air_contents.merge(removed) + air_update_turf(FALSE, FALSE) //if full enough, switch to ready mode if(air_contents.return_pressure() >= SEND_PRESSURE) diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index b4482be6b3bb2..e965b13f4e397 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -95,16 +95,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/disposalconstruct) /obj/structure/disposalconstruct/ComponentInitialize() . = ..() - AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)), CALLBACK(src, PROC_REF(after_rot))) + AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)), CALLBACK(src, PROC_REF(post_rotation))) -/obj/structure/disposalconstruct/proc/after_rot(mob/user,rotation_type) - if(rotation_type == ROTATION_FLIP) +/obj/structure/disposalconstruct/proc/post_rotation(mob/user, degrees) + if(degrees == ROTATION_FLIP) var/obj/structure/disposalpipe/temp = pipe_type if(initial(temp.flip_type)) - if(dir in GLOB.diagonals) // Fix RPD-induced diagonal turning + if(ISDIAGONALDIR(dir)) // Fix RPD-induced diagonal turning setDir(turn(dir, 45)) pipe_type = initial(temp.flip_type) - update_icon() + update_appearance() /obj/structure/disposalconstruct/proc/can_be_rotated(mob/user,rotation_type) if(anchored) diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 3f03a8aee8502..83c8c60fd976f 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -19,7 +19,6 @@ var/unsorted = TRUE // have we been sorted yet? /obj/structure/disposalholder/Destroy() - QDEL_NULL(gas) active = FALSE last_pipe = null current_pipe = null @@ -29,7 +28,7 @@ /obj/structure/disposalholder/proc/init(obj/machinery/disposal/D) if(!istype(D)) return //Why check for things that don't exist? - gas = D.air_contents// transfer gas resv. into holder object + gas = D.return_air()// transfer gas resv. into holder object //Check for any living mobs trigger hasmob. //hasmob effects whether the package goes to cargo or its tagged destination. @@ -147,8 +146,12 @@ // called to vent all gas in holder to a location /obj/structure/disposalholder/proc/vent_gas(turf/T) - T.assume_air(gas) - T.air_update_turf() + var/datum/gas_mixture/removed = gas.remove(gas.total_moles()) + //Removed can be null if there is no atmosphere in gas variable + if(!removed) + return + + T.assume_air(removed) /obj/structure/disposalholder/AllowDrop() return TRUE diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index b68a4c3ea6e94..20db9e64d9543 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -164,6 +164,21 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/disposalpipe) deconstruct() +/obj/structure/disposalpipe/rotator + icon_state = "pipe-r1" + initialize_dirs = DISP_DIR_LEFT | DISP_DIR_RIGHT | DISP_DIR_FLIP + flip_type = /obj/structure/disposalpipe/rotator/flip + /// In what direction the atom travels. + var/direction_angle = -90 + +/obj/structure/disposalpipe/rotator/nextdir(obj/structure/disposalholder/holder) + return turn(holder.dir, direction_angle) + +/obj/structure/disposalpipe/rotator/flip + icon_state = "pipe-r2" + flip_type = /obj/structure/disposalpipe/rotator + direction_angle = 90 + // Straight/bent pipe segment /obj/structure/disposalpipe/segment icon_state = "pipe" diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index fed0d9be41574..1112d11653f21 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -205,15 +205,6 @@ category = list("initial", "Electronics") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING -/datum/design/aac_electronics - name = "Airlock Controller Electronics" - id = "aac_electronics" - build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/iron = 50, /datum/material/glass = 50) - build_path = /obj/item/electronics/advanced_airlock_controller - category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - /datum/design/firealarm_electronics name = "Fire Alarm Electronics" id = "firealarm_electronics" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 6c0e232ad9890..4e845d57e87c3 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -105,6 +105,8 @@ build_path = /obj/item/circuitboard/machine/thermomachine category = list ("Engineering Machinery") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + research_icon = 'icons/obj/atmospherics/components/thermomachine.dmi' + research_icon_state = "thermo_base" /datum/design/board/portable_thermomachine name = "Machine Design (Portable Thermomachine Board)" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 7ce97d30f8532..f1f5dde0eefed 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -391,7 +391,6 @@ description = "A refresher course on modern engineering technology." prereq_ids = list("base") design_ids = list( - "aac_electronics", "adv_capacitor", "adv_matter_bin", "adv_scanning", diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index 9768724133e54..5f5e630fa812f 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -129,7 +129,7 @@ Slimecrossing Items desc = "A mass of solidified slime gel - completely impenetrable, but it's melting away!" icon = 'icons/obj/slimecrossing.dmi' icon_state = "slimebarrier_thick" - CanAtmosPass = ATMOS_PASS_NO + can_atmos_pass = ATMOS_PASS_NO opacity = TRUE timeleft = 100 diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm index 1c36c14537905..0d4b9d3ccf548 100644 --- a/code/modules/research/xenobiology/crossbreeding/_structures.dm +++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm @@ -149,8 +149,8 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) if(!istype(T)) return var/datum/gas_mixture/gas = T.return_air() - gas.set_temperature(T0C + 200) - T.air_update_turf() + gas.temperature = (T0C + 200) + T.air_update_turf(FALSE, FALSE) /obj/structure/slime_crystal/purple colour = "purple" @@ -189,9 +189,14 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) for(var/turf/open/T in view(2, src)) if(isspaceturf(T)) continue - var/datum/gas_mixture/gas = T.return_air() - gas.parse_gas_string(OPENTURF_DEFAULT_ATMOS) - T.air_update_turf() + + var/datum/gas_mixture/air = T.return_air() + var/moles_to_remove = air.total_moles() + T.remove_air(moles_to_remove) + + var/datum/gas_mixture/base_mix = SSair.parse_gas_string(OPENTURF_DEFAULT_ATMOS) + T.assume_air(base_mix) + T.air_update_turf(FALSE, FALSE) /obj/structure/slime_crystal/metal colour = "metal" @@ -236,8 +241,8 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) var/turf/open/open_turf = T var/datum/gas_mixture/air = open_turf.return_air() - if(air.get_moles(GAS_PLASMA) > 15) - air.adjust_moles(GAS_PLASMA, -15) + if(GET_MOLES(/datum/gas/plasma, air) > 15) + REMOVE_MOLES(/datum/gas/plasma, air, 15) new /obj/item/stack/sheet/mineral/plasma(open_turf) /obj/structure/slime_crystal/darkpurple/Destroy() diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm index c7c26b596d8c4..6cee2da1d794f 100644 --- a/code/modules/research/xenobiology/crossbreeding/chilling.dm +++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm @@ -106,9 +106,11 @@ Chilling extracts: for(var/turf/open/T in A) var/datum/gas_mixture/G = T.air if(istype(G)) - G.set_moles(GAS_PLASMA, 0) + G.assert_gas(/datum/gas/plasma) + G.gases[/datum/gas/plasma][MOLES] = 0 filtered = TRUE - T.air_update_turf() + G.garbage_collect() + T.air_update_turf(FALSE, FALSE) if(filtered) user.visible_message(span_notice("Cracks spread throughout [src], and some air is sucked in!")) else diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index ab92f007fb644..627fe94f6f540 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -601,7 +601,7 @@ if(SLIME_ACTIVATE_MAJOR) var/turf/open/T = get_turf(user) if(istype(T)) - T.atmos_spawn_air("o2=11;n2=41;TEMP=293.15") + T.atmos_spawn_air("[GAS_O2]=11;[GAS_N2]=41;[TURF_TEMPERATURE(T20C)]") to_chat(user, span_warning("You activate [src], and fresh air bursts out of your skin!")) return 60 SECONDS diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm index ad99d0470124c..06a2182fc1365 100644 --- a/code/modules/shuttle/docking.dm +++ b/code/modules/shuttle/docking.dm @@ -259,4 +259,4 @@ for(var/i in 1 to length(turfs)) var/turf/open/T = turfs[i] if(istype(T)) - T.air.copy_from_turf(T) + T.air.copy_from(T.air.copy()) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 140475d070ab0..86165298cbfcc 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -71,15 +71,13 @@ All ShuttleMove procs go here sanity.Insert(inject_index, /turf/baseturf_skipover/shuttle) newT.baseturfs = baseturfs_string_list(sanity, newT) - if(isopenturf(src)) - var/turf/open/after_src_terf = src - update_air_ref(isspaceturf(src) ? 0 : (after_src_terf.planetary_atmos ? 1 : 2)) - else - update_air_ref(-1) - - //Air stuff - newT.air_update_turf(TRUE) - air_update_turf(TRUE) + newT.blocks_air = TRUE + newT.air_update_turf(TRUE, FALSE) + blocks_air = TRUE + air_update_turf(TRUE, TRUE) + if(isopenturf(newT)) + var/turf/open/new_open = newT + new_open.copy_air_with_tile(src) return TRUE @@ -119,8 +117,10 @@ All ShuttleMove procs go here return TRUE /turf/proc/lateShuttleMove(turf/oldT) - air_update_turf(TRUE) - oldT.air_update_turf(TRUE) + blocks_air = initial(blocks_air) + air_update_turf(TRUE, blocks_air) + oldT.blocks_air = initial(oldT.blocks_air) + oldT.air_update_turf(TRUE, oldT.blocks_air) ///////////////////////////////////////////////////////////////////////////////////// @@ -210,14 +210,39 @@ All ShuttleMove procs go here /obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() - update_aac_docked(oldT) - update_aac_docked() var/current_area = get_area(src) - for(var/obj/machinery/door/airlock/A in orange(1, src)) // does not include src - if(get_area(A) != current_area) // does not include double-wide airlocks unless actually docked + var/turf/local_turf + var/tile_air_pressure + for(var/obj/machinery/door/airlock/other_airlock in orange(2, src)) // does not include src, extended because some escape pods have 1 plating turf exposed to space + if(get_area(other_airlock) != current_area) // does not include double-wide airlocks unless actually docked // Cycle linking is only disabled if we are actually adjacent to another airlock shuttledocked = TRUE - A.shuttledocked = TRUE + other_airlock.shuttledocked = TRUE + if (other_airlock.cycle_pump) + local_turf = get_step(src, REVERSE_DIR(other_airlock.cycle_pump.dir)) + tile_air_pressure = 0 + if (local_turf) + tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + INVOKE_ASYNC(other_airlock.cycle_pump, TYPE_PROC_REF(/obj/machinery/atmospherics/components/unary/airlock_pump, on_dock_request), tile_air_pressure) + // Save external airlocks turf in case our own docking purpouses + local_turf = get_turf(other_airlock) + + if (cycle_pump) + tile_air_pressure = 0 + if (local_turf) + local_turf = get_step(local_turf, REVERSE_DIR(cycle_pump.dir)) + if (local_turf) + tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + INVOKE_ASYNC(cycle_pump, TYPE_PROC_REF(/obj/machinery/atmospherics/components/unary/airlock_pump, on_dock_request), tile_air_pressure) + else + // In case, somebody decides to build an airlock on evac shuttle, we count CentComs blastdoors as valid docking airlock + local_turf = get_step(src, REVERSE_DIR(cycle_pump.dir)) + if (local_turf) + for(var/obj/machinery/door/poddoor/shuttledock/centcom_airlock in local_turf) + // For some reason on docking moment those tiles are vacuum, and pump denies safe_dock attempt + // To fix this we're lying, that external pressure is nominal + INVOKE_ASYNC(cycle_pump, TYPE_PROC_REF(/obj/machinery/atmospherics/components/unary/airlock_pump, on_dock_request), ONE_ATMOSPHERE) + break /obj/machinery/camera/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) . = ..() @@ -233,11 +258,6 @@ All ShuttleMove procs go here . = ..() recharging_turf = get_step(loc, dir) -/obj/machinery/atmospherics/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) - . = ..() - if(pipe_vision_img) - pipe_vision_img.loc = loc - /obj/machinery/computer/auxillary_base/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() if(is_mining_level(z)) //Avoids double logging and landing on other Z-levels due to badminnery @@ -245,6 +265,8 @@ All ShuttleMove procs go here /obj/machinery/atmospherics/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() + if(pipe_vision_img) + pipe_vision_img.loc = loc var/missing_nodes = FALSE for(var/i in 1 to device_type) if(nodes[i]) @@ -256,20 +278,20 @@ All ShuttleMove procs go here break if(!connected) - nullifyNode(i) + nullify_node(i) if(!nodes[i]) missing_nodes = TRUE if(missing_nodes) - atmosinit() - for(var/obj/machinery/atmospherics/A in pipeline_expansion()) - A.atmosinit() - if(A.returnPipenet()) - A.addMember(src) + atmos_init() + for(var/obj/machinery/atmospherics/A in pipenet_expansion()) + A.atmos_init() + if(A.return_pipenet()) + A.add_member(src) SSair.add_to_rebuild_queue(src) else - // atmosinit() calls update_icon(), so we don't need to call it + // atmos_init() calls update_icon(), so we don't need to call it update_icon() /obj/machinery/navbeacon/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm index e150408b9cdf1..5e08950f1f297 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm @@ -268,7 +268,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He firedoors |= oldArea.firedoors for(var/door in firedoors) var/obj/machinery/door/firedoor/FD = door - FD.CalculateAffectingAreas() + FD.calculate_affecting_areas() port.movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) port.initiate_docking(stationary_port) @@ -379,7 +379,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He firedoors |= oldArea.firedoors for(var/door in firedoors) var/obj/machinery/door/firedoor/FD = door - FD.CalculateAffectingAreas() + FD.calculate_affecting_areas() //Redraw highlights reset_saved_area(FALSE) diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm index dcfbdaf5794fe..d08e9340ddfc0 100644 --- a/code/modules/shuttle/shuttle_rotate.dm +++ b/code/modules/shuttle/shuttle_rotate.dm @@ -81,17 +81,25 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate /************************************Machine rotate procs************************************/ /obj/machinery/atmospherics/shuttleRotate(rotation, params) - var/list/real_node_connect = getNodeConnects() + var/list/real_node_connect = get_node_connects() for(var/i in 1 to device_type) - real_node_connect[i] = angle2dir(rotation+dir2angle(real_node_connect[i])) + var/node_dir = real_node_connect[i] + if(isnull(node_dir)) + continue + + real_node_connect[i] = turn(node_dir, -rotation) . = ..() - SetInitDirections() - var/list/supposed_node_connect = getNodeConnects() + set_init_directions() + var/list/supposed_node_connect = get_node_connects() var/list/nodes_copy = nodes.Copy() for(var/i in 1 to device_type) - var/new_pos = supposed_node_connect.Find(real_node_connect[i]) + var/node_dir = real_node_connect[i] + if(isnull(node_dir)) + continue + + var/new_pos = supposed_node_connect.Find(node_dir) nodes[new_pos] = nodes_copy[i] //prevents shuttles attempting to rotate this since it messes up sprites diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/alien_artifact.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/alien_artifact.dm index ddcfaad05a9ea..21c59a1de3681 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/alien_artifact.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/loot/alien_artifact.dm @@ -200,7 +200,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/proximity_monitor_holder) /datum/artifact_effect/airfreeze/Initialize(atom/source) . = ..() - source.CanAtmosPass = ATMOS_PASS_NO + source.can_atmos_pass = ATMOS_PASS_NO /datum/artifact_effect/airfreeze/register_signals(source) RegisterSignal(source, COMSIG_MOVABLE_MOVED, PROC_REF(updateAir)) @@ -208,10 +208,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/proximity_monitor_holder) /datum/artifact_effect/airfreeze/proc/updateAir(atom/source, atom/oldLoc) if(isturf(oldLoc)) var/turf/oldTurf = oldLoc - oldTurf.air_update_turf(TRUE) + oldTurf.air_update_turf(TRUE, TRUE) if(isturf(source.loc)) var/turf/newTurf = source.loc - newTurf.air_update_turf(TRUE) + newTurf.air_update_turf(TRUE, TRUE) //=================== // Atmos Stabilizer @@ -223,8 +223,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/proximity_monitor_holder) /datum/artifact_effect/atmosfix/process(delta_time) var/turf/T = get_turf(source_object) - var/datum/gas_mixture/air = T.return_air() - air.parse_gas_string(T.initial_gas_mix) + var/datum/gas_mixture/base_mix = SSair.parse_gas_string(OPENTURF_DEFAULT_ATMOS) + T.assume_air(base_mix) //=================== // Gravity Well @@ -418,10 +418,10 @@ GLOBAL_LIST_EMPTY(destabliization_exits) var/datum/gas_mixture/air = T.return_air() var/input_id = initial(input.id) var/output_id = initial(output.id) - var/moles = min(air.get_moles(input_id), 5) + var/moles = min(GET_MOLES(input_id, air), 5) if(moles) - air.adjust_moles(input_id, -moles) - air.adjust_moles(output_id, moles) + air.gases[input_id][MOLES] += -moles + air.gases[output_id][MOLES] += moles //=================== // Recharger diff --git a/code/modules/shuttle/super_cruise/shuttle_components/plasma_refiner.dm b/code/modules/shuttle/super_cruise/shuttle_components/plasma_refiner.dm index 96603f6d019e0..eb65deea4bfcf 100644 --- a/code/modules/shuttle/super_cruise/shuttle_components/plasma_refiner.dm +++ b/code/modules/shuttle/super_cruise/shuttle_components/plasma_refiner.dm @@ -9,7 +9,7 @@ /obj/machinery/atmospherics/components/unary/plasma_refiner/process_atmos() update_parents() -/obj/machinery/atmospherics/components/unary/plasma_refiner/on_construction() +/obj/machinery/atmospherics/components/unary/plasma_refiner/on_construction(mob/user) ..(dir, dir) /obj/machinery/atmospherics/components/unary/plasma_refiner/attackby(obj/item/W, mob/user, params) @@ -20,7 +20,7 @@ if(!air_contents) return qdel(stack) - air_contents.adjust_moles(GAS_PLASMA, moles_created) + air_contents.gases[/datum/gas/plasma][MOLES] += moles_created say("[moles_created] moles of plasma refined.") return @@ -35,12 +35,12 @@ /obj/machinery/atmospherics/components/unary/plasma_refiner/AltClick(mob/living/user) var/datum/gas_mixture/air_contents = airs[1] - var/plasmoles = air_contents.get_moles(GAS_PLASMA) + var/plasmoles = GET_MOLES(/datum/gas/plasma, air_contents) if(!air_contents) return if(plasmoles >= 100) var/obj/item/stack/sheet/mineral/plasma/P = new(src.loc, 1) - air_contents.adjust_moles(GAS_PLASMA, -100) + air_contents.gases[/datum/gas/plasma][MOLES] += -100 say("100 moles of plasma consumed. A sheet of [P.name] has been created.") else say("Insufficient plasma. At least 100 moles of plasma are required. There are currently [plasmoles] moles of plasma.") @@ -56,16 +56,16 @@ /obj/machinery/atmospherics/components/unary/plasma_refiner/default_change_direction_wrench(mob/user, obj/item/I) . = ..() if(.) - SetInitDirections() + set_init_directions() var/obj/machinery/atmospherics/node = nodes[1] if(node) node.disconnect(src) nodes[1] = null if(parents[1]) - nullifyPipenet(parents[1]) - atmosinit() + nullify_pipenet(parents[1]) + atmos_init() node = nodes[1] if(node) - node.atmosinit() - node.addMember(src) + node.atmos_init() + node.add_member(src) SSair.add_to_rebuild_queue(src) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index fde712718b794..912f09f06dc9a 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -263,7 +263,7 @@ to_chat(H, span_notice("You feel resistant to airborne toxins.")) if(locate(/obj/item/organ/lungs) in H.internal_organs) var/obj/item/organ/lungs/L = H.internal_organs_slot[ORGAN_SLOT_LUNGS] - L.gas_max -= GAS_PLASMA + L.gas_max -= /datum/gas/plasma ADD_TRAIT(H, TRAIT_VIRUSIMMUNE, "dna_vault") if(VAULT_NOBREATH) to_chat(H, span_notice("Your lungs feel great.")) diff --git a/code/modules/surgery/anesthetic_machine.dm b/code/modules/surgery/anesthetic_machine.dm index 3d1788cb8a997..d51e3c5380b0c 100644 --- a/code/modules/surgery/anesthetic_machine.dm +++ b/code/modules/surgery/anesthetic_machine.dm @@ -83,7 +83,6 @@ target.external = attached_tank mask_out = TRUE START_PROCESSING(SSmachines, src) - target.update_internals_hud_icon(1) update_icon() else to_chat(usr, span_warning("[mask_out ? "The machine is already in use!" : "The machine has no attached tank!"]")) diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 0c5f5105f874e..80fd619af9619 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -197,9 +197,12 @@ return 1 // Priority 3: use internals tank. - var/obj/item/tank/I = owner.internal - if(I && I.air_contents && I.air_contents.total_moles() >= num && use_fuel) - T.assume_air_moles(I.air_contents, num) + var/datum/gas_mixture/internal_mix = owner.internal.return_air() + if(internal_mix && internal_mix.total_moles() > num) + var/datum/gas_mixture/removed = internal_mix.remove(num) + if(removed.total_moles() > 0.005) + T.assume_air(removed) + ion_trail.generate_effect() toggle(silent = TRUE) return 0 diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index edbd9600d1a1f..3f5aea55fd728 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -24,6 +24,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/salbutamol = 5) //Breath damage + //These thresholds are checked against what amounts to total_mix_pressure * (gas_type_mols/total_mols) var/breathing_class = BREATH_OXY // can be a gas instead of a breathing class var/safe_breath_min = 16 @@ -33,8 +34,8 @@ var/safe_damage_type = OXY var/list/gas_min = list() var/list/gas_max = list( - GAS_CO2 = 30, // Yes it's an arbitrary value who cares? - GAS_PLASMA = MOLES_GAS_VISIBLE + /datum/gas/carbon_dioxide = 30, // Yes it's an arbitrary value who cares? + /datum/breathing_class/plasma = MOLES_GAS_VISIBLE ) var/list/gas_damage = list( "default" = list( @@ -42,7 +43,7 @@ max = MAX_TOXIC_GAS_DAMAGE, damage_type = OXY ), - GAS_PLASMA = list( + /datum/gas/plasma = list( min = MIN_TOXIC_GAS_DAMAGE, max = MAX_TOXIC_GAS_DAMAGE, damage_type = TOX @@ -147,13 +148,12 @@ var/alert_category var/alert_type if(ispath(breathing_class)) - var/datum/breathing_class/class = GLOB.gas_data.breathing_classes[breathing_class] + var/datum/breathing_class/class = GLOB.breathing_class_info[breathing_class] alert_category = class.low_alert_category alert_type = class.low_alert_datum else - var/list/breath_alert_info = GLOB.gas_data.breath_alert_info - if(breathing_class in breath_alert_info) - var/list/alert = breath_alert_info[breathing_class]["not_enough_alert"] + var/list/alert = GLOB.meta_gas_info[breathing_class][META_GAS_BREATH_ALERT_INFO]?["not_enough_alert"] + if(alert) alert_category = alert["alert_category"] alert_type = alert["alert_type"] throw_alert_for(H, alert_category, alert_type) @@ -161,15 +161,13 @@ #define PP_MOLES(X) ((X / total_moles) * pressure) - #define PP(air, gas) PP_MOLES(air.get_moles(gas)) + #define PP(air, gas) PP_MOLES(GET_MOLES(gas, air)) var/gas_breathed = 0 var/pressure = breath.return_pressure() var/total_moles = breath.total_moles() - var/list/breath_alert_info = GLOB.gas_data.breath_alert_info - var/list/breath_results = GLOB.gas_data.breath_results - var/list/breathing_classes = GLOB.gas_data.breathing_classes + var/list/breathing_classes = GLOB.breathing_class_info var/list/mole_adjustments = list() for(var/entry in gas_min) var/required_pp = 0 @@ -177,14 +175,16 @@ var/safe_min = gas_min[entry] var/alert_category = null var/alert_type = null - if(ispath(entry)) - var/datum/breathing_class/class = breathing_classes[entry] + var/datum/breathing_class/class = breathing_classes[entry] + if(class) var/list/gases = class.gases var/list/products = class.products alert_category = class.low_alert_category alert_type = class.low_alert_datum for(var/gas in gases) - var/moles = breath.get_moles(gas) + if (!(gas in breath.gases)) + continue + var/moles = breath.gases[gas][MOLES] var/multiplier = gases[gas] mole_adjustments[gas] = (gas in mole_adjustments) ? mole_adjustments[gas] - moles : -moles required_pp += PP_MOLES(moles) * multiplier @@ -194,14 +194,14 @@ for(var/product in products) mole_adjustments[product] = (product in mole_adjustments) ? mole_adjustments[product] + to_add : to_add else - required_moles = breath.get_moles(entry) + required_moles = GET_MOLES(entry, breath) required_pp = PP_MOLES(required_moles) - if(entry in breath_alert_info) - var/list/alert = breath_alert_info[entry]["not_enough_alert"] + var/list/alert = GLOB.meta_gas_info[entry][META_GAS_BREATH_ALERT_INFO]?["not_enough_alert"] + if(alert) alert_category = alert["alert_category"] alert_type = alert["alert_type"] mole_adjustments[entry] = -required_moles - mole_adjustments[breath_results[entry]] = required_moles + mole_adjustments[GLOB.meta_gas_info[entry][META_GAS_BREATH_RESULTS]] = required_moles if(required_pp < safe_min) var/multiplier = handle_too_little_breath(H, required_pp, safe_min, required_moles) if(required_moles > 0) @@ -214,28 +214,26 @@ if(H.health >= H.crit_threshold) H.adjustOxyLoss(-breathModifier) clear_alert_for(H, alert_category) - var/list/danger_reagents = GLOB.gas_data.breath_reagents_dangerous for(var/entry in gas_max) var/found_pp = 0 - var/datum/breathing_class/breathing_class = entry + var/datum/breathing_class/breathing_class = breathing_classes[entry] var/datum/reagent/danger_reagent = null var/alert_category = null var/alert_type = null - if(ispath(breathing_class)) - breathing_class = breathing_classes[breathing_class] + if(breathing_class) alert_category = breathing_class.high_alert_category alert_type = breathing_class.high_alert_datum danger_reagent = breathing_class.danger_reagent found_pp = breathing_class.get_effective_pp(breath) else - danger_reagent = danger_reagents[entry] - if(entry in breath_alert_info) - var/list/alert = breath_alert_info[entry]["too_much_alert"] + danger_reagent = GLOB.meta_gas_info[entry][META_GAS_BREATH_REAGENT_DANGEROUS] + var/list/alert = GLOB.meta_gas_info[entry][META_GAS_BREATH_ALERT_INFO]?["too_much_alert"] + if(alert) alert_category = alert["alert_category"] alert_type = alert["alert_type"] found_pp = PP(breath, entry) if(found_pp > gas_max[entry]) - if(istype(danger_reagent)) + if(danger_reagent && istype(danger_reagent)) H.reagents.add_reagent(danger_reagent,1) var/list/damage_info = (entry in gas_damage) ? gas_damage[entry] : gas_damage["default"] var/dam = found_pp / gas_max[entry] * 10 @@ -243,22 +241,21 @@ throw_alert_for(H, alert_category, alert_type) else clear_alert_for(H, alert_category) - var/list/breath_reagents = GLOB.gas_data.breath_reagents - for(var/gas in breath.get_gases()) - if(gas in breath_reagents) - var/datum/reagent/R = breath_reagents[gas] - //H.reagents.add_reagent(R, breath.get_moles(gas) * R.molarity) // See next line - H.reagents.add_reagent(R, breath.get_moles(gas) * 2) // 2 represents molarity of O2, we don't have citadel molarity - mole_adjustments[gas] = (gas in mole_adjustments) ? mole_adjustments[gas] - breath.get_moles(gas) : -breath.get_moles(gas) + for(var/gas in breath.gases) + var/datum/reagent/R = GLOB.meta_gas_info[gas][META_GAS_BREATH_REAGENT] + if(R) + //H.reagents.add_reagent(R, breath.gases[gas][MOLES] * R.molarity) // See next line + H.reagents.add_reagent(R, breath.gases[gas][MOLES] * 2) // 2 represents molarity of O2, we don't have citadel molarity + mole_adjustments[gas] = (gas in mole_adjustments) ? mole_adjustments[gas] - breath.gases[gas][MOLES] : -breath.gases[gas][MOLES] for(var/gas in mole_adjustments) - breath.adjust_moles(gas, mole_adjustments[gas]) + ADJUST_MOLES(gas, breath, mole_adjustments[gas]) if(breath) // If there's some other shit in the air lets deal with it here. // N2O - var/SA_pp = PP(breath, GAS_NITROUS) + var/SA_pp = PP(breath, /datum/gas/nitrous_oxide) if(SA_pp > SA_para_min) // Enough to make us stunned for a bit H.Unconscious(60) // 60 gives them one second to wake up and run away a bit! if(SA_pp > SA_sleep_min) // Enough to make us sleep as well @@ -272,7 +269,7 @@ // BZ - var/bz_pp = PP(breath, GAS_BZ) + var/bz_pp = PP(breath, /datum/gas/bz) if(bz_pp > BZ_brain_damage_min) H.hallucination += 10 H.reagents.add_reagent(/datum/reagent/metabolite/bz,5) @@ -284,7 +281,7 @@ H.reagents.add_reagent(/datum/reagent/metabolite/bz,1) // Nitryl - var/nitryl_pp = PP(breath,GAS_NITRYL) + var/nitryl_pp = PP(breath,/datum/gas/nitryl) if (prob(nitryl_pp)) to_chat(H, span_alert("Your mouth feels like it's burning!")) if (nitryl_pp >40) @@ -295,18 +292,18 @@ H.silent = max(H.silent, 3) else H.adjustFireLoss(nitryl_pp/4) - gas_breathed = PP(breath,GAS_NITRYL) + gas_breathed = PP(breath,/datum/gas/nitryl) if (gas_breathed > gas_stimulation_min) H.reagents.add_reagent(/datum/reagent/nitryl,1) - breath.adjust_moles(GAS_NITRYL, -gas_breathed) + REMOVE_MOLES(/datum/gas/nitryl, breath, gas_breathed) // Stimulum - gas_breathed = PP(breath,GAS_STIMULUM) + gas_breathed = PP(breath,/datum/gas/stimulum) if (gas_breathed > gas_stimulation_min) var/existing = H.reagents.get_reagent_amount(/datum/reagent/stimulum) H.reagents.add_reagent(/datum/reagent/stimulum, max(0, 5 - existing)) - breath.adjust_moles(GAS_STIMULUM, -gas_breathed) + REMOVE_MOLES(/datum/gas/stimulum, breath, gas_breathed) handle_breath_temperature(breath, H) return TRUE @@ -355,7 +352,7 @@ to_chat(H, span_warning("You feel [hot_message] in your [name]!")) // The air you breathe out should match your body temperature - breath.set_temperature(H.bodytemperature) + breath.temperature = H.bodytemperature /obj/item/organ/lungs/on_life() ..() @@ -379,7 +376,7 @@ /obj/item/organ/lungs/plasmaman/populate_gas_info() ..() - gas_max -= GAS_PLASMA + gas_max -= /datum/breathing_class/plasma /obj/item/organ/lungs/slime name = "vacuole" @@ -409,8 +406,8 @@ safe_breath_min = 4 safe_breath_max = 250 gas_max = list( - GAS_PLASMA = 30, - GAS_CO2 = 30 + /datum/gas/plasma = 30, + /datum/gas/carbon_dioxide = 30 ) maxHealth = 2 * STANDARD_ORGAN_THRESHOLD @@ -431,8 +428,8 @@ safe_breath_min = 4 safe_breath_max = 20 gas_max = list( - GAS_CO2 = 45, - GAS_PLASMA = MOLES_GAS_VISIBLE + /datum/gas/carbon_dioxide = 45, + /datum/gas/plasma = MOLES_GAS_VISIBLE ) /obj/item/organ/lungs/diona diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 0d82d540382ca..57e98ff2b820a 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -18,6 +18,7 @@ #include "async.dm" #include "autowiki.dm" #include "bloody_footprints.dm" +#include "breath.dm" #include "check_adjustable_clothing.dm" #include "closets.dm" #include "component_tests.dm" @@ -37,6 +38,7 @@ #include "food_edibility_check.dm" #include "gamemode_sanity.dm" +#include "gas_transfer.dm" #include "greyscale_config.dm" #include "handcuff_tests.dm" #include "heretic_knowledge.dm" @@ -48,6 +50,7 @@ #include "metabolizing.dm" #include "missing_icons.dm" #include "ntnetwork_tests.dm" +#include "orphaned_genturf.dm" #include "outfit_sanity.dm" #include "preference_species.dm" #include "preferences.dm" diff --git a/code/modules/unit_tests/breath.dm b/code/modules/unit_tests/breath.dm new file mode 100644 index 0000000000000..a583ffd20f986 --- /dev/null +++ b/code/modules/unit_tests/breath.dm @@ -0,0 +1,34 @@ +/// Tests to make sure humans can breath in normal situations +/// Built to prevent regression on an issue surrounding QUANTIZE() and BREATH_VOLUME +/// See the comment on BREATH_VOLUME for more details +/datum/unit_test/breath_sanity + +/datum/unit_test/breath_sanity/Run() + var/mob/living/carbon/human/consistent/lab_rat = allocate(/mob/living/carbon/human/consistent) + var/obj/item/clothing/mask/breath/tube = allocate(/obj/item/clothing/mask/breath) + var/obj/item/tank/internals/emergency_oxygen/source = allocate(/obj/item/tank/internals/emergency_oxygen) + + lab_rat.equip_to_slot_if_possible(tube, ITEM_SLOT_MASK) + lab_rat.equip_to_slot_if_possible(source, ITEM_SLOT_HANDS) + source.toggle_internals(lab_rat) + + lab_rat.breathe() + + TEST_ASSERT(!lab_rat.has_alert("not_enough_oxy"), "Humans can't get a full breath from standard o2 tanks") + lab_rat.clear_alert("not_enough_oxy") + + //Prep the mob + lab_rat.forceMove(run_loc_floor_bottom_left) + source.toggle_internals(lab_rat) + TEST_ASSERT(!lab_rat.internal, "toggle_internals() failed to toggle internals") + + var/turf/open/to_fill = run_loc_floor_bottom_left + to_fill.initial_gas_mix = OPENTURF_DEFAULT_ATMOS + to_fill.air = to_fill.create_gas_mixture() + + lab_rat.breathe() + + TEST_ASSERT(!lab_rat.has_alert("not_enough_oxy"), "Humans can't get a full breath from the standard initial_gas_mix on a turf") + + + diff --git a/code/modules/unit_tests/gas_transfer.dm b/code/modules/unit_tests/gas_transfer.dm new file mode 100644 index 0000000000000..2b174ad8c6259 --- /dev/null +++ b/code/modules/unit_tests/gas_transfer.dm @@ -0,0 +1,52 @@ +/// Test to make sure the pressure pumping proc used by things like portable pumps, pressure pumps, etc actually work. +/datum/unit_test/atmospheric_gas_transfer + +/datum/unit_test/atmospheric_gas_transfer/Run() + for (var/hot_test in list(1e4, 1e6, 1e8, 1e10, 1e12)) + nob_to_trit(hot_test, hot_test, 50, T20C, max(2500, hot_test/100)) + for (var/cold_test in list(1, 1e-2, MOLAR_ACCURACY)) + nob_to_trit(5000, T20C, cold_test, cold_test) + nob_to_trit(5000, T20C, 100, T20C, 1) + +/** + * Proc to transfer x moles of x temp nob to x moles of x temp trit. + * + * Arguments: + * * nob_moles: Moles for the nob (origin) + * * nob_temp: Temp for the nob (origin) + * * trit_moles: Moles for the trit (target) + * * nob_temp: Temp for the nob (target) + * * additional_pressure: Optional proc, if unfilled transfer will be 10% of pressure. + */ +/datum/unit_test/atmospheric_gas_transfer/proc/nob_to_trit(nob_moles, nob_temp, trit_moles, trit_temp, additional_pressure) + var/datum/gas_mixture/first_mix = allocate(/datum/gas_mixture) + var/datum/gas_mixture/second_mix = allocate(/datum/gas_mixture) + + first_mix.volume = 200 + second_mix.volume = 200 + + ASSERT_GAS(/datum/gas/hypernoblium, first_mix) + ASSERT_GAS(/datum/gas/tritium, second_mix) + + first_mix.gases[/datum/gas/hypernoblium][MOLES] = nob_moles + first_mix.temperature = nob_temp + + second_mix.gases[/datum/gas/tritium][MOLES] = trit_moles + second_mix.temperature = trit_temp + + var/initial_pressure = second_mix.return_pressure() + // A fixed number would mean transfer is too small for high temps. So we make it scaled. + + if(isnull(additional_pressure)) + additional_pressure = first_mix.return_pressure() / 10 + + /* ERROR MARGIN CALCULATION + * We calculate how much would the pressure change if MOLAR_ACCURACY amount of hothotgas is imparted on the cold mix. + * This number gets really big for very high temperatures so it's somewhat meaningless, but our main goal is to ensure the code doesn't break. + */ + var/error_margin = first_mix.gas_pressure_minimum_transfer(second_mix) - initial_pressure + + first_mix.pump_gas_to(second_mix, (initial_pressure + additional_pressure)) + var/margin = abs(second_mix.return_pressure() - (initial_pressure+additional_pressure)) + + TEST_ASSERT(margin <= error_margin, "Failed to pump [nob_moles] moles of [nob_temp] K Nob to [trit_moles] moles of [trit_temp] K Trit, . Expected pressure = [initial_pressure+additional_pressure] +/- [error_margin]. Got [second_mix.return_pressure()].") diff --git a/code/modules/unit_tests/orphaned_genturf.dm b/code/modules/unit_tests/orphaned_genturf.dm new file mode 100644 index 0000000000000..289b883d2def4 --- /dev/null +++ b/code/modules/unit_tests/orphaned_genturf.dm @@ -0,0 +1,7 @@ +/// Ensures we do not leave genturfs sitting around post work +/// They serve as notice to the mapper and have no functionality, but it's good to make note of it here +/datum/unit_test/orphaned_genturf + +/datum/unit_test/orphaned_genturf/Run() + for(var/turf/open/genturf/orphaned in ALL_TURFS()) + TEST_FAIL("Floating genturf ([orphaned.type]) detected at ([orphaned.x], [orphaned.y], [orphaned.z]) : [orphaned.loc.type]. Why was it not replaced?") diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 522af25200e41..a5cbceee2ee2e 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -117,7 +117,10 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) var/area/working_area = run_loc_floor_bottom_left.loc var/list/turf/to_restore = working_area.get_contained_turfs() for(var/turf/open/restore in to_restore) - restore.Initalize_Atmos() + var/datum/gas_mixture/GM = SSair.parse_gas_string(restore.initial_gas_mix, /datum/gas_mixture/turf) + restore.copy_air(GM) + restore.temperature = initial(restore.temperature) + restore.air_update_turf(update = FALSE, remove = FALSE) /datum/unit_test/proc/test_screenshot(name, icon/icon) if (!istype(icon)) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 8e1cc0ecf4756..627dbb9bf94bb 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -206,10 +206,10 @@ radio.name = "[src] radio" cabin_air = new - cabin_air.set_temperature(T20C) - cabin_air.set_volume(200) - cabin_air.set_moles(GAS_O2, O2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) - cabin_air.set_moles(GAS_N2, N2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) + cabin_air.temperature = T20C + cabin_air.volume = 200 + SET_MOLES(/datum/gas/oxygen, cabin_air, O2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) + SET_MOLES(/datum/gas/nitrogen, cabin_air, N2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) add_cell() add_scanmod() @@ -228,6 +228,10 @@ become_hearing_sensitive(trait_source = ROUNDSTART_TRAIT) +/obj/mecha/ComponentInitialize() + . = ..() + AddElement(/datum/element/atmos_sensitive) + //separate proc so that the ejection mechanism can be easily triggered by other things, such as admins /obj/vehicle/sealed/mecha/proc/Eject() for(var/mob/living/occupant as anything in occupants) @@ -266,7 +270,6 @@ /obj/vehicle/sealed/mecha/atom_destruction() loc.assume_air(cabin_air) - air_update_turf(FALSE, FALSE) Eject() return ..() @@ -406,15 +409,20 @@ if(int_tank_air.return_pressure() > internal_tank.maximum_pressure && !(internal_damage & MECHA_INT_TANK_BREACH)) set_internal_damage(MECHA_INT_TANK_BREACH) if(int_tank_air && int_tank_air.return_volume() > 0) //heat the air_contents - int_tank_air.set_temperature(min(6000+T0C, int_tank_air.return_temperature()+rand(5,7.5)*delta_time)) + int_tank_air.temperature = (min(6000+T0C, int_tank_air.return_temperature()+rand(10,15))) if(cabin_air && cabin_air.return_volume()>0) - cabin_air.set_temperature(min(6000+T0C, cabin_air.return_temperature()+rand(5,7.5)*delta_time)) + cabin_air.temperature = (min(6000+T0C, cabin_air.return_temperature()+rand(10,15))) if(cabin_air.return_temperature() > max_temperature/2) take_damage(delta_time*2/round(max_temperature/cabin_air.return_temperature(),0.1), BURN, 0, 0) if(internal_damage & MECHA_INT_TANK_BREACH) //remove some air from internal tank if(internal_tank) - assume_air_ratio(internal_tank.return_air(), DT_PROB_RATE(0.05, delta_time)) + var/datum/gas_mixture/int_tank_air = internal_tank.return_air() + var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(DT_PROB_RATE(0.05, delta_time)) + if(loc) + loc.assume_air(leaked_gas) + else + qdel(leaked_gas) if(internal_damage & MECHA_INT_SHORT_CIRCUIT) if(get_charge()) @@ -425,28 +433,7 @@ if(!(internal_damage & MECHA_INT_TEMP_CONTROL)) if(cabin_air && cabin_air.return_volume() > 0) var/delta = cabin_air.return_temperature() - T20C - cabin_air.set_temperature(cabin_air.return_temperature() - clamp(round(delta / 8, 0.1), -5, 5) * delta_time) - - if(internal_tank) - var/datum/gas_mixture/tank_air = internal_tank.return_air() - - var/release_pressure = internal_tank_valve - var/cabin_pressure = cabin_air.return_pressure() - var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.return_pressure() - cabin_pressure)/2) - var/transfer_moles = 0 - if(pressure_delta > 0) //cabin pressure lower than release pressure - if(tank_air.return_temperature() > 0) - transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) - tank_air.transfer_to(cabin_air,transfer_moles) - else if(pressure_delta < 0) //cabin pressure higher than release pressure - var/datum/gas_mixture/t_air = return_air() - pressure_delta = cabin_pressure - release_pressure - if(t_air) - pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta) - if(pressure_delta > 0) //if location pressure is lower than cabin pressure - transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) - cabin_air.transfer_to(t_air, transfer_moles) - + cabin_air.temperature = (cabin_air.return_temperature() - clamp(round(delta / 8, 0.1), -5, 5) * delta_time) for(var/mob/living/occupant as anything in occupants) if(!enclosed && occupant?.incapacitated()) //no sides mean it's easy to just sorta fall out if you're incapacitated. @@ -1139,11 +1126,6 @@ return cabin_air.remove(amount) return ..() -/obj/vehicle/sealed/mecha/remove_air_ratio(ratio) - if(use_internal_tank) - return cabin_air.remove_ratio(ratio) - return ..() - /obj/vehicle/sealed/mecha/return_air() if(use_internal_tank) return cabin_air @@ -1164,9 +1146,6 @@ return t_air.return_temperature() return -/obj/vehicle/sealed/mecha/portableConnectorReturnAir() - return internal_tank.return_air() - /////////////////////// ////// Ammo stuff ///// /////////////////////// diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm index d8b50258ba350..4127489089acc 100644 --- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm @@ -551,9 +551,9 @@ return FALSE var/moles = chassis.internal_tank.air_contents.total_moles() if(moles < move_cost) - chassis.internal_tank.air_contents.remove(moles) + chassis.internal_tank.remove_air(moles) return FALSE - chassis.internal_tank.air_contents.remove(move_cost) + chassis.internal_tank.remove_air(move_cost) generate_effect(movement_dir) return TRUE diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index 132df3595ef53..ba4f63c5e240a 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -176,10 +176,13 @@ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/vehicle/sealed/mecha, restore_equipment)), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) equipment_disabled = 1 -/obj/vehicle/sealed/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature>max_temperature) - log_message("Exposed to dangerous temperature.", LOG_MECHA, color="red") - take_damage(5, BURN, 0, 1) +/obj/vehicle/sealed/mecha/should_atmos_process(datum/gas_mixture/air, exposed_temperature) + return exposed_temperature>max_temperature + +/obj/vehicle/sealed/mecha/atmos_expose(datum/gas_mixture/air, exposed_temperature) + log_message("Exposed to dangerous temperature.", LOG_MECHA, color="red") + take_damage(5, BURN, 0, 1) + /obj/vehicle/sealed/mecha/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index 477e716e1bf15..ba11e519b07e2 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -13,7 +13,6 @@ /obj/item/electronics/airlock = 10, /obj/item/electronics/apc = 10, /obj/item/electronics/airalarm = 10, - /obj/item/electronics/advanced_airlock_controller = 10, /obj/item/electronics/firealarm = 10, /obj/item/electronics/firelock = 10, /obj/item/storage/bag/construction = 3) diff --git a/code/modules/xenoarchaeology/traits/xenoartifact_majors.dm b/code/modules/xenoarchaeology/traits/xenoartifact_majors.dm index e029020d6e34c..685d2717b2715 100644 --- a/code/modules/xenoarchaeology/traits/xenoartifact_majors.dm +++ b/code/modules/xenoarchaeology/traits/xenoartifact_majors.dm @@ -448,10 +448,10 @@ var/datum/gas_mixture/air = T.return_air() var/input_id = initial(input.id) var/output_id = initial(output.id) - var/moles = min(air.get_moles(input_id), 5) + var/moles = min(GET_MOLES(input_id, air), 5) if(moles) - air.adjust_moles(input_id, -moles) - air.adjust_moles(output_id, moles) + air.gases[input_id][MOLES] += -moles + air.gases[output_id][MOLES] += moles ///============ /// Destabilizing, teleports the victim to that weird place from the exploration meme. diff --git a/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm b/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm index fabba18534d41..ebfd14e23c40e 100644 --- a/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm +++ b/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm @@ -233,7 +233,7 @@ ///What gasses we've S U C K E D var/datum/gas_mixture/air_contents ///Gasses we can suck. Currently everything but, it's here if we need to blacklist in the future - var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O, GAS_O2, GAS_N2, GAS_STIMULUM, GAS_PLUOXIUM) + var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor, /datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/stimulum, /datum/gas/pluoxium) ///Adjust for balance - I'm sure this will have no ramifications var/volume = 1000000 var/volume_rate = 200000 @@ -242,22 +242,22 @@ /datum/xenoartifact_trait/malfunction/absorbant/on_init(obj/item/xenoartifact/X) air_contents = new(volume) - air_contents.set_temperature(T20C) + air_contents.temperature = (T20C) parent = X /datum/xenoartifact_trait/malfunction/absorbant/activate(obj/item/xenoartifact/X, atom/target, atom/user, setup) X.visible_message("[X] begins to vacuum nearby gasses!    ") var/turf/T = get_turf(X) var/datum/gas_mixture/mixture = T.return_air() - mixture.scrub_into(air_contents, volume_rate / mixture.return_volume(), scrubbing) - X.air_update_turf() + mixture.merge(air_contents) + X.air_update_turf(FALSE, FALSE) //Throw sucked gas into our tile when we die /datum/xenoartifact_trait/malfunction/absorbant/Destroy() . = ..() var/turf/T = get_turf(parent) T.assume_air(air_contents) - parent.air_update_turf() + parent.air_update_turf(FALSE, FALSE) //============ // Hallucination, shows a random hallucination to the target once diff --git a/dependencies.sh b/dependencies.sh index e55e8c7eb78e2..37b98e20e9ac9 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -20,9 +20,6 @@ export NODE_VERSION_PRECISE=18.14.2 # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.7.1 -#auxmos version -export AUXMOS_VERSION=2.2.2 - # Python version for mapmerge and other tools export PYTHON_VERSION=3.11.2 diff --git a/goon/sound/machinery/FireAlarm.ogg b/goon/sound/machinery/FireAlarm.ogg deleted file mode 100644 index f1a6723265511..0000000000000 Binary files a/goon/sound/machinery/FireAlarm.ogg and /dev/null differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 27b73165e759f..03c69503e6548 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 9a6c0cc115b70..7bbf36ca43dd3 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ diff --git a/icons/obj/atmospherics/canisters.dmi b/icons/obj/atmospherics/canisters.dmi index 2d4c9d6e9b0b3..88be31fb48978 100644 Binary files a/icons/obj/atmospherics/canisters.dmi and b/icons/obj/atmospherics/canisters.dmi differ diff --git a/icons/obj/atmospherics/components/binary_devices.dmi b/icons/obj/atmospherics/components/binary_devices.dmi index 6f58dcf61847d..ea376123ed082 100644 Binary files a/icons/obj/atmospherics/components/binary_devices.dmi and b/icons/obj/atmospherics/components/binary_devices.dmi differ diff --git a/icons/obj/atmospherics/components/thermomachine.dmi b/icons/obj/atmospherics/components/thermomachine.dmi index 9b11fa266ff07..bcc36f4242f15 100644 Binary files a/icons/obj/atmospherics/components/thermomachine.dmi and b/icons/obj/atmospherics/components/thermomachine.dmi differ diff --git a/icons/obj/atmospherics/components/unary_devices.dmi b/icons/obj/atmospherics/components/unary_devices.dmi index 2d692273ce4d2..40eee56788eb3 100644 Binary files a/icons/obj/atmospherics/components/unary_devices.dmi and b/icons/obj/atmospherics/components/unary_devices.dmi differ diff --git a/icons/obj/atmospherics/pipes/bridge_pipe.dmi b/icons/obj/atmospherics/pipes/bridge_pipe.dmi new file mode 100644 index 0000000000000..f42cbfd0fcd35 Binary files /dev/null and b/icons/obj/atmospherics/pipes/bridge_pipe.dmi differ diff --git a/icons/obj/atmospherics/pipes/color_adapter.dmi b/icons/obj/atmospherics/pipes/color_adapter.dmi new file mode 100644 index 0000000000000..9133a33bc38a7 Binary files /dev/null and b/icons/obj/atmospherics/pipes/color_adapter.dmi differ diff --git a/icons/obj/atmospherics/pipes/disposal.dmi b/icons/obj/atmospherics/pipes/disposal.dmi index 1b19d44fa6709..5e7c497a4314d 100644 Binary files a/icons/obj/atmospherics/pipes/disposal.dmi and b/icons/obj/atmospherics/pipes/disposal.dmi differ diff --git a/icons/obj/atmospherics/pipes/layer_manifold_underlays.dmi b/icons/obj/atmospherics/pipes/layer_manifold_underlays.dmi new file mode 100644 index 0000000000000..6fe47e5019a03 Binary files /dev/null and b/icons/obj/atmospherics/pipes/layer_manifold_underlays.dmi differ diff --git a/icons/obj/atmospherics/pipes/manifold.dmi b/icons/obj/atmospherics/pipes/manifold.dmi index f96874dc059f1..fadec95c1852e 100644 Binary files a/icons/obj/atmospherics/pipes/manifold.dmi and b/icons/obj/atmospherics/pipes/manifold.dmi differ diff --git a/icons/obj/atmospherics/pipes/meter.dmi b/icons/obj/atmospherics/pipes/meter.dmi index fe495bbe28ecb..2aed35e065f49 100644 Binary files a/icons/obj/atmospherics/pipes/meter.dmi and b/icons/obj/atmospherics/pipes/meter.dmi differ diff --git a/icons/obj/atmospherics/pipes/pipe_item.dmi b/icons/obj/atmospherics/pipes/pipe_item.dmi index cfb9c0f9d1bd7..54dac81793975 100644 Binary files a/icons/obj/atmospherics/pipes/pipe_item.dmi and b/icons/obj/atmospherics/pipes/pipe_item.dmi differ diff --git a/icons/obj/atmospherics/pipes/pipe_underlays.dmi b/icons/obj/atmospherics/pipes/pipe_underlays.dmi new file mode 100644 index 0000000000000..1a74cc3740190 Binary files /dev/null and b/icons/obj/atmospherics/pipes/pipe_underlays.dmi differ diff --git a/icons/obj/atmospherics/pipes/pipes_bitmask.dmi b/icons/obj/atmospherics/pipes/pipes_bitmask.dmi new file mode 100644 index 0000000000000..7a382fb55c5e4 Binary files /dev/null and b/icons/obj/atmospherics/pipes/pipes_bitmask.dmi differ diff --git a/icons/obj/atmospherics/pipes/simple.dmi b/icons/obj/atmospherics/pipes/simple.dmi index 19e6bb2586f2a..5f951c44ad310 100644 Binary files a/icons/obj/atmospherics/pipes/simple.dmi and b/icons/obj/atmospherics/pipes/simple.dmi differ diff --git a/icons/obj/atmospherics/pipes/transit_tube.dmi b/icons/obj/atmospherics/pipes/transit_tube.dmi index 92eb54276a4ac..e2c8b2cd48cb2 100644 Binary files a/icons/obj/atmospherics/pipes/transit_tube.dmi and b/icons/obj/atmospherics/pipes/transit_tube.dmi differ diff --git a/icons/obj/atmospherics/prototype_canister.dmi b/icons/obj/atmospherics/prototype_canister.dmi deleted file mode 100644 index fb73aa2ed6d25..0000000000000 Binary files a/icons/obj/atmospherics/prototype_canister.dmi and /dev/null differ diff --git a/icons/obj/doors/firelocks/doorfire.dmi b/icons/obj/doors/firelocks/doorfire.dmi index df36cc1b96c8a..4f1c5dd0a7533 100644 Binary files a/icons/obj/doors/firelocks/doorfire.dmi and b/icons/obj/doors/firelocks/doorfire.dmi differ diff --git a/icons/obj/doors/firelocks/doorfireglass.dmi b/icons/obj/doors/firelocks/doorfireglass.dmi index 5727a6fdf3a4f..243bb091f46b7 100644 Binary files a/icons/obj/doors/firelocks/doorfireglass.dmi and b/icons/obj/doors/firelocks/doorfireglass.dmi differ diff --git a/icons/obj/doors/firelocks/edge_Doorfire.dmi b/icons/obj/doors/firelocks/edge_Doorfire.dmi index 7e587bd50d376..99986e629680a 100644 Binary files a/icons/obj/doors/firelocks/edge_Doorfire.dmi and b/icons/obj/doors/firelocks/edge_Doorfire.dmi differ diff --git a/sound/machines/FireAlarm1.ogg b/sound/machines/FireAlarm1.ogg new file mode 100644 index 0000000000000..da7632ce8b6d4 Binary files /dev/null and b/sound/machines/FireAlarm1.ogg differ diff --git a/sound/machines/FireAlarm2.ogg b/sound/machines/FireAlarm2.ogg new file mode 100644 index 0000000000000..e5b7f4b1e7385 Binary files /dev/null and b/sound/machines/FireAlarm2.ogg differ diff --git a/sound/machines/FireAlarm3.ogg b/sound/machines/FireAlarm3.ogg new file mode 100644 index 0000000000000..8f1fd525949ed Binary files /dev/null and b/sound/machines/FireAlarm3.ogg differ diff --git a/sound/machines/FireAlarm4.ogg b/sound/machines/FireAlarm4.ogg new file mode 100644 index 0000000000000..ee5a6e6a59b9a Binary files /dev/null and b/sound/machines/FireAlarm4.ogg differ diff --git a/tgui/packages/tgui/interfaces/AdvancedAirlockController.jsx b/tgui/packages/tgui/interfaces/AdvancedAirlockController.jsx deleted file mode 100644 index cd1381d729111..0000000000000 --- a/tgui/packages/tgui/interfaces/AdvancedAirlockController.jsx +++ /dev/null @@ -1,382 +0,0 @@ -import { toFixed } from 'common/math'; -import { decodeHtmlEntities } from 'common/string'; -import { Fragment } from 'inferno'; -import { useBackend } from '../backend'; -import { Box, Button, LabeledList, NumberInput, Section, ProgressBar } from '../components'; -import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox'; -import { classes } from 'common/react'; -import { Window } from '../layouts'; - -const STATE_INOPEN = 0; -const STATE_INOPENING = 1; -const STATE_INCLOSING = 2; -const STATE_CLOSED = 3; -const STATE_OUTCLOSING = 4; -const STATE_OUTOPENING = 5; -const STATE_OUTOPEN = 6; -const STATE_DOCKED = -1; -const STATE_ERROR = -2; - -const ROLE_INT_PRESSURIZE = 1; -const ROLE_INT_DEPRESSURIZE = 2; -const ROLE_EXT_PRESSURIZE = 4; -const ROLE_EXT_DEPRESSURIZE = 8; - -export const AdvancedAirlockController = (props) => { - const { state } = props; - const { act, data } = useBackend(); - const locked = data.locked && !data.siliconUser; - return ( - - - - act('lock')} /> - - {!locked && } - - - - ); -}; - -export const AACStatus = (props) => { - const { act, data } = useBackend(); - const { cyclestate, pressure, maxpressure, emagged } = data; - const stateMap = { - [STATE_INOPEN]: { - color: 'good', - localStatusText: 'Cycled to interior', - }, - [STATE_INOPENING]: { - color: 'average', - localStatusText: 'Pressurizing (interior)', - }, - [STATE_INCLOSING]: { - color: 'average', - localStatusText: 'Depressurizing (interior)', - }, - - [STATE_OUTOPEN]: { - color: 'good', - localStatusText: 'Cycled to exterior', - }, - [STATE_OUTOPENING]: { - color: 'average', - localStatusText: 'Pressurizing (exterior)', - }, - [STATE_OUTCLOSING]: { - color: 'average', - localStatusText: 'Depressurizing (exterior)', - }, - [STATE_CLOSED]: { - color: 'average', - localStatusText: 'Unknown', - }, - [STATE_DOCKED]: { - color: 'good', - localStatusText: 'Shuttle Docked', - }, - [STATE_ERROR]: { - color: 'bad', - localStatusText: 'Error. Contact an atmospheric\ - technician for assistance.', - }, - }; - const localStatus = stateMap[cyclestate] || stateMap[0]; - const { color, localStatusText } = localStatus; - return ( -
    - - - - - {toFixed(pressure, 2)} kPa - - - - {localStatusText} - - {!!emagged && ( - - Safety measures offline. Device may exhibit abnormal behaviour. - - )} - - - - {(cyclestate === STATE_INOPEN || - cyclestate === STATE_CLOSED || - cyclestate === STATE_INOPENING || - cyclestate === STATE_OUTCLOSING) && ( -
    - ); -}; - -export const AACControl = (props) => { - const { act, data } = useBackend(); - const { state } = props; - const { - cyclestate, - config_error_str, - interior_pressure, - exterior_pressure, - depressurization_margin, - skip_delay, - vents, - airlocks, - } = data; - return ( -
    - {cyclestate === STATE_ERROR && !!config_error_str && {config_error_str}} - - -
    - ); -}; - -export const Vent = (props) => { - const { act, data } = useBackend(); - const { vent_id, name, role } = props; - return ( -
    - act(data.vis_target === vent_id ? 'clear_vis' : 'set_vis_vent', { - vent_id, - }) - } - /> - }> - - -
    - ); -}; - -export const Airlock = (props) => { - const { act, data } = useBackend(); - const { airlock_id, name, role, access } = props; - return ( -
    - act(data.vis_target === airlock_id ? 'clear_vis' : 'set_vis_airlock', { - airlock_id, - }) - } - /> - }> - - -
    - ); -}; diff --git a/tgui/packages/tgui/interfaces/AirAlarm.jsx b/tgui/packages/tgui/interfaces/AirAlarm.jsx deleted file mode 100644 index 78d36efac2756..0000000000000 --- a/tgui/packages/tgui/interfaces/AirAlarm.jsx +++ /dev/null @@ -1,237 +0,0 @@ -import { toFixed } from 'common/math'; -import { Fragment } from 'inferno'; -import { decodeHtmlEntities } from 'common/string'; -import { useBackend, useLocalState } from '../backend'; -import { Box, Button, LabeledList, NumberInput, Section } from '../components'; -import { getGasLabel } from '../constants'; -import { Window } from '../layouts'; -import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox'; -import { Vent, Scrubber } from './common/AtmosControls'; - -export const AirAlarm = (props) => { - const { act, data } = useBackend(); - const locked = data.locked && !data.siliconUser; - return ( - - - - - {!locked && } - - - ); -}; - -const AirAlarmStatus = (props) => { - const { data } = useBackend(); - const entries = (data.environment_data || []).filter((entry) => entry.value >= 0.01); - const dangerMap = { - 0: { - color: 'good', - localStatusText: 'Optimal', - }, - 1: { - color: 'average', - localStatusText: 'Caution', - }, - 2: { - color: 'bad', - localStatusText: 'Danger (Internals Required)', - }, - }; - const localStatus = dangerMap[data.danger_level] || dangerMap[0]; - return ( -
    - - {(entries.length > 0 && ( - <> - {entries.map((entry) => { - const status = dangerMap[entry.danger_level] || dangerMap[0]; - return ( - - {toFixed(entry.value, 2)} - {entry.unit} - - ); - })} - - {localStatus.localStatusText} - - - {(data.atmos_alarm && 'Atmosphere Alarm') || (data.fire_alarm && 'Fire Alarm') || 'Nominal'} - - - )) || ( - - Cannot obtain air sample for analysis. - - )} - {!!data.emagged && ( - - Safety measures offline. Device may exhibit abnormal behavior. - - )} - -
    - ); -}; - -const AIR_ALARM_ROUTES = { - home: { - title: 'Air Controls', - component: () => AirAlarmControlHome, - }, - vents: { - title: 'Vent Controls', - component: () => AirAlarmControlVents, - }, - scrubbers: { - title: 'Scrubber Controls', - component: () => AirAlarmControlScrubbers, - }, - modes: { - title: 'Operating Mode', - component: () => AirAlarmControlModes, - }, - thresholds: { - title: 'Alarm Thresholds', - component: () => AirAlarmControlThresholds, - }, -}; - -const AirAlarmControl = (props) => { - const [screen, setScreen] = useLocalState('screen'); - const route = AIR_ALARM_ROUTES[screen] || AIR_ALARM_ROUTES.home; - const Component = route.component(); - return ( -
    setScreen()} />}> - -
    - ); -}; - -// Home screen -// -------------------------------------------------------- - -const AirAlarmControlHome = (props) => { - const { act, data } = useBackend(); - const [screen, setScreen] = useLocalState('screen'); - const { mode, atmos_alarm } = data; - return ( - <> - + ) : ( + <> + + act('set_threshold', { + threshold: id, + threshold_type: type, + value: value, + }) + } + unit={unit} + value={oldValue} + minValue={0} + maxValue={100000} + step={10} + /> + + + )} + + + ); +}; + +const AirAlarmControlThresholds = (props) => { + const { act, data } = useBackend(); + const [activeModal, setActiveModal] = useLocalState | null>('tlvModal', null); + const { tlvSettings, thresholdTypeMap } = data; + return ( + <> + + + Threshold + + Danger Below + + + Warning Below + + + Warning Above + + + Danger Above + + Actions + + {tlvSettings.map((tlv) => ( + + {tlv.name} + + + + + + + + + + + + + + <> +
    + {activeModal && ( + tlv.id === activeModal.id) || {})[activeModal.typeVar]} + {...activeModal} + /> + )} + + ); +}; + +// Air Conditioning +// -------------------------------------------------------- + +const AirAlarmAirConditioningControls = (_props) => { + const { + act, + data: { + ac: { enabled, target, min, max }, + }, + } = useBackend(); + return ( + <> + + ); + case 'closed': + return ( + <> + + + + ); + case 'inopen': + return ( + <> + + + + ); + case 'outopen': + return ( + <> + + + + ); + default: + return null; + } +}; + +/** Displays the numeric pressure alongside an icon for the user */ +const PressureIndicator = (props) => { + const { data } = useBackend(); + const { sensorPressure } = data; + const { + currentStatus: { icon, color }, + } = props; + let spin = icon === 'fan'; + + return ( + + {sensorPressure} kPa {icon && } + + ); +}; + +/** Displays the current status as two text strings, depending on door state. */ +const getAirlockStatus = (airlockState): AirlockStatus => { + switch (airlockState) { + case 'inopen': + return { + primary: 'Interior Airlock Open', + icon: '', + color: 'good', + }; + case 'pressurize': + return { + primary: 'Cycling to Interior Airlock', + icon: 'fan', + color: 'average', + }; + case 'closed': + return { + primary: 'Inactive', + icon: '', + color: 'white', + }; + case 'depressurize': + return { + primary: 'Cycling to Exterior Airlock', + icon: 'fan', + color: 'average', + }; + case 'outopen': + return { + primary: 'Exterior Airlock Open', + icon: 'exclamation-triangle', + color: 'bad', + }; + default: + return { + primary: 'Unknown', + icon: '', + color: 'average', + }; + } +}; diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.jsx b/tgui/packages/tgui/interfaces/AtmosControlConsole.jsx deleted file mode 100644 index 58864e17da64b..0000000000000 --- a/tgui/packages/tgui/interfaces/AtmosControlConsole.jsx +++ /dev/null @@ -1,91 +0,0 @@ -import { map } from 'common/collections'; -import { toFixed } from 'common/math'; -import { useBackend } from '../backend'; -import { Button, LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; - -export const AtmosControlConsole = (props) => { - const { act, data } = useBackend(); - const sensors = data.sensors || []; - return ( - - -
    - {sensors.map((sensor) => { - const gases = sensor.gases || {}; - return ( -
    - - {toFixed(sensor.pressure, 2) + ' kPa'} - {!!sensor.temperature && ( - {toFixed(sensor.temperature, 2) + ' K'} - )} - {map((gasPercent, gasId) => ( - {toFixed(gasPercent, 2) + '%'} - ))(gases)} - -
    - ); - })} -
    - {data.tank && ( -
    act('reconnect')} />}> - - -
    - )} -     -     - ); -}; diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx new file mode 100644 index 0000000000000..67669d6195aa4 --- /dev/null +++ b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx @@ -0,0 +1,129 @@ +import { Box, Button, Dropdown, LabeledList, NumberInput, Section, Stack } from '../components'; + +import { useBackend, useLocalState } from '../backend'; +import { Window } from '../layouts'; +import { Gasmix, GasmixParser } from './common/GasmixParser'; + +type Chamber = { + id: string; + name: string; + gasmix?: Gasmix; + input_info?: { active: boolean; amount: number }; + output_info?: { active: boolean; amount: number }; +}; + +export const AtmosControlConsole = (props) => { + const { act, data } = useBackend<{ + chambers: Chamber[]; + maxInput: number; + maxOutput: number; + reconnecting: boolean; + control: boolean; + }>(); + const chambers = data.chambers || []; + const [chamberId, setChamberId] = useLocalState('chamberID', chambers[0]?.id); + const selectedChamber = chambers.length === 1 ? chambers[0] : chambers.find((chamber) => chamber.id === chamberId); + return ( + + + {chambers.length > 1 && ( +
    + chamber.name)} + selected={selectedChamber?.name} + onSelected={(value) => setChamberId(chambers.find((chamber) => chamber.name === value)?.id || chambers[0].id)} + /> +
    + )} +
    act('reconnect')} />}> + {!!selectedChamber && !!selectedChamber.gasmix ? ( + + ) : ( + {'No Sensors Detected!'} + )} +
    + {!!selectedChamber && !!data.control && ( +
    + + + {selectedChamber.input_info ? ( + + +
    + )} +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx b/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx new file mode 100644 index 0000000000000..0fddb8267ec17 --- /dev/null +++ b/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx @@ -0,0 +1,89 @@ +import { map, sortBy } from 'common/collections'; +import { flow } from 'common/fp'; +import { useBackend } from '../backend'; +import { Box, Button, Flex, Section, Table } from '../components'; +import { Window } from '../layouts'; + +export const AtmosControlPanel = (props) => { + const { act, data } = useBackend(); + const groups = flow([ + map((group, i) => ({ + ...group, + // Generate a unique id + id: group.area + i, + })), + sortBy((group) => group.id), + ])(data.excited_groups); + return ( + +
    + + + + + Fire Cnt: {data.fire_count} + Active Turfs: {data.active_size} + Excited Groups: {data.excited_size} + Hotspots: {data.hotspots_size} + Superconductors: {data.conducting_size} + + act('toggle_user_display')}> + Personal View + + + + act('toggle_show_all')}> + Display all + + + +
    + + +
    + + + Area Name + Breakdown + Dismantle + Turfs + {data.display_max === 1 && 'Max Share'} + Display + + {groups.map((group) => ( + + + + + + + + + ))} +
    + {group.breakdown}{group.dismantle}{group.size}{data.display_max === 1 && group.max_share} + + act('toggle_show_group', { + group: group.group, + }) + } + /> +
    +
    +     +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/AtmosFilter.jsx b/tgui/packages/tgui/interfaces/AtmosFilter.jsx deleted file mode 100644 index b8ceeeeeef56c..0000000000000 --- a/tgui/packages/tgui/interfaces/AtmosFilter.jsx +++ /dev/null @@ -1,67 +0,0 @@ -import { useBackend } from '../backend'; -import { Button, LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; -import { getGasLabel } from '../constants'; - -export const AtmosFilter = (props) => { - const { act, data } = useBackend(); - const filterTypes = data.filter_types || []; - return ( - - -
    - - -
    -     -     - ); -}; diff --git a/tgui/packages/tgui/interfaces/AtmosFilter.tsx b/tgui/packages/tgui/interfaces/AtmosFilter.tsx new file mode 100644 index 0000000000000..a82b6b9a87b08 --- /dev/null +++ b/tgui/packages/tgui/interfaces/AtmosFilter.tsx @@ -0,0 +1,81 @@ +import { Button, LabeledList, NumberInput, Section } from '../components'; +import { BooleanLike } from 'common/react'; + +import { useBackend } from '../backend'; +import { getGasLabel } from '../constants'; +import { Window } from '../layouts'; + +type Data = { + filter_types: Filter[]; + on: BooleanLike; + rate: number; + max_rate: number; +}; + +type Filter = { + enabled: BooleanLike; + gas_id: string; +}; + +export const AtmosFilter = (props) => { + const { act, data } = useBackend(); + const { filter_types = [], on, rate, max_rate } = data; + + return ( + + +
    act('power')} /> + } + fill + title="Gas Filter"> + + + + act('rate', { + rate: value, + }) + } + /> + + ))} + + +
    +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/Canister.jsx b/tgui/packages/tgui/interfaces/Canister.jsx deleted file mode 100644 index cf228dec9c404..0000000000000 --- a/tgui/packages/tgui/interfaces/Canister.jsx +++ /dev/null @@ -1,140 +0,0 @@ -import { toFixed } from 'common/math'; -import { useBackend } from '../backend'; -import { AnimatedNumber, Box, Button, Icon, Knob, LabeledControls, LabeledList, Section, Tooltip } from '../components'; -import { formatSiUnit } from '../format'; -import { Window } from '../layouts'; - -export const Canister = (props) => { - const { act, data } = useBackend(); - const { - portConnected, - tankPressure, - releasePressure, - defaultReleasePressure, - minReleasePressure, - maxReleasePressure, - valveOpen, - isPrototype, - hasHoldingTank, - holdingTank, - restricted, - } = data; - return ( - - -
    - {!!isPrototype && ( -
    -
    act('eject')} /> - ) - }> - {!!hasHoldingTank && ( - - {holdingTank.name} - - kPa - - - )} - {!hasHoldingTank && No Holding Tank} -
    -     -     - ); -}; diff --git a/tgui/packages/tgui/interfaces/Canister.tsx b/tgui/packages/tgui/interfaces/Canister.tsx new file mode 100644 index 0000000000000..b2023b7cbf5d9 --- /dev/null +++ b/tgui/packages/tgui/interfaces/Canister.tsx @@ -0,0 +1,182 @@ +import { Box, Button, Flex, Icon, Knob, LabeledControls, LabeledList, AnimatedNumber, Section, Tooltip } from '../components'; +import { toFixed } from 'common/math'; +import { BooleanLike } from 'common/react'; + +import { useBackend } from '../backend'; +import { formatSiUnit } from '../format'; +import { Window } from '../layouts'; + +const formatPressure = (value: number) => { + if (value < 10000) { + return toFixed(value) + ' kPa'; + } + return formatSiUnit(value * 1000, 1, 'Pa'); +}; + +type HoldingTank = { + name: string; + tankPressure: number; +}; + +type Data = { + portConnected: BooleanLike; + tankPressure: number; + releasePressure: number; + defaultReleasePressure: number; + minReleasePressure: number; + maxReleasePressure: number; + hasHypernobCrystal: BooleanLike; + cellCharge: number; + pressureLimit: number; + valveOpen: BooleanLike; + holdingTank: HoldingTank; + holdingTankLeakPressure: number; + holdingTankFragPressure: number; + shielding: BooleanLike; + reactionSuppressionEnabled: BooleanLike; +}; + +export const Canister = (props) => { + const { act, data } = useBackend(); + const { + shielding, + holdingTank, + pressureLimit, + valveOpen, + tankPressure, + releasePressure, + defaultReleasePressure, + minReleasePressure, + maxReleasePressure, + portConnected, + cellCharge, + holdingTankFragPressure, + holdingTankLeakPressure, + } = data; + + return ( + + + + +
    +
    +
    + + {cellCharge > 0 ? cellCharge + '%' : 'Missing Cell'} + +
    +     + +
    act('eject')} /> + ) + }> + {!!holdingTank && ( + + {holdingTank.name} + + kPa + + + )} + {!holdingTank && No Holding Tank} +
    +     +     +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/PipeDispenser.tsx b/tgui/packages/tgui/interfaces/PipeDispenser.tsx new file mode 100644 index 0000000000000..2716cfc1e9fdd --- /dev/null +++ b/tgui/packages/tgui/interfaces/PipeDispenser.tsx @@ -0,0 +1,144 @@ +import { BooleanLike } from 'common/react'; + +import { useBackend, useLocalState } from '../backend'; +import { Button, LabeledList, Section, Stack, Tabs } from '../components'; +import { Window } from '../layouts'; +import { ColorItem, ICON_BY_CATEGORY_NAME, SmartPipeBlockSection } from './RapidPipeDispenser'; + +type Data = { + // Dynamic + category: number; + piping_layer: number; + categories: Category[]; + selected_color: string; + init_directions: Directions; + // Static + paint_colors: Colors; +}; + +type Directions = { + north: BooleanLike; + south: BooleanLike; + east: BooleanLike; + west: BooleanLike; +}; + +type Colors = { + green: string; + blue: string; + red: string; + orange: string; + cyan: string; + dark: string; + yellow: string; + brown: string; + pink: string; + purple: string; + violet: string; + omni: string; +}; + +type Category = { + cat_name: string; + recipes: Recipe[]; +}; + +type Recipe = { + pipe_name: string; + pipe_index: number; + all_layers: BooleanLike; + dir: number; +}; + +export const LayerSelect = (props) => { + const { act, data } = useBackend(); + const { piping_layer } = data; + return ( + + {[1, 2, 3, 4, 5].map((layer) => ( + + act('piping_layer', { + piping_layer: layer, + }) + } + /> + ))} + + ); +}; + +const PipeTypeSection = (props) => { + const { act, data } = useBackend(); + const { categories = [] } = data; + const [categoryName, setCategoryName] = useLocalState('category', categories[0].cat_name); + const shownCategory = categories.find((category) => category.cat_name === categoryName) || categories[0]; + + return ( +
    + + {categories.map((category, i) => ( + setCategoryName(category.cat_name)}> + {category.cat_name} + + ))} + + {shownCategory?.recipes.map((recipe) => ( + + ))} +
    + ); +}; + +export const PipeDispenser = (props) => { + const { act, data } = useBackend(); + const { category: rootCategoryIndex } = data; + return ( + + + + {rootCategoryIndex === 0 && ( + + + +
    + + + + +
    +     + + + +     +     + )} + + + +     +     +     + ); +}; diff --git a/tgui/packages/tgui/interfaces/PortablePump.jsx b/tgui/packages/tgui/interfaces/PortablePump.jsx index 252e25cc6b234..dc72a054c183a 100644 --- a/tgui/packages/tgui/interfaces/PortablePump.jsx +++ b/tgui/packages/tgui/interfaces/PortablePump.jsx @@ -6,19 +6,21 @@ import { PortableBasicInfo } from './common/PortableAtmos'; export const PortablePump = (props) => { const { act, data } = useBackend(); - const { direction, holding, target_pressure, default_pressure, min_pressure, max_pressure } = data; + const { direction, connected, holding, target_pressure, default_pressure, min_pressure, max_pressure } = data; + + const pump_or_port = connected ? 'Port' : 'Pump'; + const area_or_tank = holding ? 'Tank' : 'Area'; return (
    act('direction')} /> }> diff --git a/tgui/packages/tgui/interfaces/RapidPipeDispenser.jsx b/tgui/packages/tgui/interfaces/RapidPipeDispenser.jsx deleted file mode 100644 index cc778a7e76c2d..0000000000000 --- a/tgui/packages/tgui/interfaces/RapidPipeDispenser.jsx +++ /dev/null @@ -1,193 +0,0 @@ -import { classes } from 'common/react'; -import { useBackend, useLocalState } from '../backend'; -import { Box, Button, ColorBox, Flex, LabeledList, Section, Tabs } from '../components'; -import { Window } from '../layouts'; - -const ROOT_CATEGORIES = ['Atmospherics', 'Disposals', 'Transit Tubes']; - -const ICON_BY_CATEGORY_NAME = { - 'Atmospherics': 'wrench', - 'Disposals': 'trash-alt', - 'Transit Tubes': 'bus', - 'Pipes': 'grip-lines', - 'Disposal Pipes': 'grip-lines', - 'Devices': 'microchip', - 'Heat Exchange': 'thermometer-half', - 'Station Equipment': 'microchip', -}; - -const PAINT_COLORS = { - grey: '#bbbbbb', - amethyst: '#a365ff', - blue: '#4466ff', - brown: '#b26438', - cyan: '#48eae8', - dark: '#808080', - green: '#1edd00', - orange: '#ffa030', - purple: '#b535ea', - red: '#ff3333', - violet: '#6e00f6', - yellow: '#ffce26', -}; - -const TOOLS = [ - { - name: 'Dispense', - bitmask: 1, - }, - { - name: 'Connect', - bitmask: 2, - }, - { - name: 'Destroy', - bitmask: 4, - }, - { - name: 'Paint', - bitmask: 8, - }, -]; - -export const RapidPipeDispenser = (props) => { - const { act, data } = useBackend(); - const { category: rootCategoryIndex, categories = [], selected_color, piping_layer, mode } = data; - const previews = data.preview_rows.flatMap((row) => row.previews); - const [categoryName, setCategoryName] = useLocalState('categoryName'); - const shownCategory = categories.find((category) => category.cat_name === categoryName) || categories[0]; - return ( - - -
    - - - {ROOT_CATEGORIES.map((categoryName, i) => ( -
    - - -
    - {rootCategoryIndex === 0 && ( - - {[1, 2, 3, 4, 5].map((layer) => ( - - act('piping_layer', { - piping_layer: layer, - }) - } - /> - ))} - - )} - - {previews.map((preview) => ( - - ))} - -
    -     - -
    - - {categories.map((category, i) => ( - setCategoryName(category.cat_name)}> - {category.cat_name} - - ))} - - {shownCategory?.recipes.map((recipe) => ( - - act('pipe_type', { - pipe_type: recipe.pipe_index, - category: shownCategory.cat_name, - }) - } - /> - ))} -
    -     -     -     -     - ); -}; diff --git a/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx b/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx new file mode 100644 index 0000000000000..9572728ce3a05 --- /dev/null +++ b/tgui/packages/tgui/interfaces/RapidPipeDispenser.tsx @@ -0,0 +1,402 @@ +import { BooleanLike, classes } from 'common/react'; +import { toTitleCase } from 'common/string'; +import { useBackend, useLocalState } from '../backend'; +import { Box, Button, ColorBox, LabeledList, Section, Stack, Table, Tabs } from '../components'; +import { Window } from '../layouts'; + +const ROOT_CATEGORIES = ['Atmospherics', 'Disposals', 'Transit Tubes']; + +export const ICON_BY_CATEGORY_NAME = { + Atmospherics: 'wrench', + Disposals: 'trash-alt', + 'Transit Tubes': 'bus', + Pipes: 'grip-lines', + Binary: 'arrows-left-right', + 'Disposal Pipes': 'grip-lines', + Devices: 'microchip', + 'Heat Exchange': 'thermometer-half', + 'Station Equipment': 'microchip', +}; + +const TOOLS = [ + { + name: 'Dispense', + bitmask: 1, + }, + { + name: 'Connect', + bitmask: 2, + }, + { + name: 'Destroy', + bitmask: 4, + }, + { + name: 'Reprogram', + bitmask: 8, + }, +]; + +const LAYERS = [ + { + name: '1', + bitmask: 1, + }, + { + name: '2', + bitmask: 2, + }, + { + name: '3', + bitmask: 4, + }, + { + name: '4', + bitmask: 8, + }, + { + name: '5', + bitmask: 16, + }, +] as const; + +type DirectionsAllowed = { + north: BooleanLike; + south: BooleanLike; + east: BooleanLike; + west: BooleanLike; +}; + +type Colors = { + green: string; + blue: string; + red: string; + orange: string; + cyan: string; + dark: string; + yellow: string; + brown: string; + pink: string; + purple: string; + violet: string; + omni: string; +}; + +type Category = { + cat_name: string; + recipes: Recipe[]; +}; + +type Recipe = { + pipe_name: string; + pipe_index: number; + previews: Preview[]; +}; + +type Preview = { + selected: BooleanLike; + dir: string; + dir_name: string; + icon_state: string; + flipped: BooleanLike; +}; + +type Data = { + // Dynamic + category: number; + pipe_layers: number; + multi_layer: BooleanLike; + ducting_layer: number; + categories: Category[]; + selected_recipe: string; + selected_color: string; + selected_category: string; + mode: number; + init_directions: DirectionsAllowed; + // Static + paint_colors: Colors; +}; + +export const ColorItem = (props) => { + const { act, data } = useBackend(); + const { selected_color, paint_colors } = data; + const colorNames = Object.keys(paint_colors); + return ( + + {colorNames.map((colorName) => ( + + act('color', { + paint_color: colorName, + }) + } + /> + ))} + + {toTitleCase(selected_color)} + + + ); +}; + +const ModeItem = (props) => { + const { act, data } = useBackend(); + const { mode } = data; + return ( + + {TOOLS.map((tool) => ( + + act('mode', { + mode: tool.bitmask, + }) + } + /> + ))} + + ); +}; + +const CategoryItem = (props) => { + const { act, data } = useBackend(); + const { category: rootCategoryIndex } = data; + return ( + + {ROOT_CATEGORIES.map((categoryName, i) => ( + + ))} + + ); +}; + +const SelectionSection = (props) => { + const { act, data } = useBackend(); + const { category: rootCategoryIndex } = data; + return ( +
    + + + + {rootCategoryIndex === 0 && } + {rootCategoryIndex === 0 && } + +
    + ); +}; + +const LayerSelect = (props) => { + const { act, data } = useBackend(); + const { pipe_layers } = data; + const { multi_layer } = data; + return ( + + {LAYERS.map((layer) => ( + act('pipe_layers', { pipe_layers: layer.bitmask })} + /> + ))} + { + act('toggle_multi_layer'); + }} + /> + + ); +}; + +const PreviewSelect = (props) => { + const { act, data } = useBackend(); + return ( + + {props.previews.map((preview) => ( + + ))} + + ); +}; + +const PipeTypeSection = (props) => { + const { act, data } = useBackend(); + const { categories = [], selected_category, selected_recipe } = data; + const [categoryName, setCategoryName] = useLocalState('selected_category', selected_category); + const shownCategory = categories.find((category) => category.cat_name === categoryName) || categories[0]; + + return ( +
    + + {categories.map((category, i) => ( + setCategoryName(category.cat_name)}> + {category.cat_name} + + ))} + + + {shownCategory?.recipes.map((recipe) => ( + + + + + + {recipe.pipe_name} + + ))} +
    +
    + ); +}; + +export const SmartPipeBlockSection = (props) => { + const { act, data } = useBackend(); + const { init_directions = [] } = data; + return ( +
    + + + + +
    + ); +}; + +export const RapidPipeDispenser = (props) => { + const { act, data } = useBackend(); + const { category: rootCategoryIndex } = data; + return ( + + + + + + + + + {rootCategoryIndex === 0 && ( + + + + )} + + + + + + + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/SupermatterMonitor.jsx b/tgui/packages/tgui/interfaces/SupermatterMonitor.jsx index 3398de8510aff..b73caca7f4057 100644 --- a/tgui/packages/tgui/interfaces/SupermatterMonitor.jsx +++ b/tgui/packages/tgui/interfaces/SupermatterMonitor.jsx @@ -130,7 +130,7 @@ export const SupermatterMonitorContent = (props) => { buttons={!standalone_mode ? ))) || 'N/A'} diff --git a/tgui/packages/tgui/interfaces/common/GasmixParser.tsx b/tgui/packages/tgui/interfaces/common/GasmixParser.tsx new file mode 100644 index 0000000000000..194ee757a27d5 --- /dev/null +++ b/tgui/packages/tgui/interfaces/common/GasmixParser.tsx @@ -0,0 +1,90 @@ +import { Box, Button, LabeledList } from '../../components'; + +export type Gasmix = { + name?: string; + gases: [string, string, number][]; // ID, name, and amount. + temperature: number; + volume: number; + pressure: number; + total_moles: number; + reactions: [string, string, number][]; // ID, name, and amount. + reference: string; +}; + +type GasmixParserProps = { + gasmix: Gasmix; + gasesOnClick?: (gas_id: string) => void; + temperatureOnClick?: () => void; + volumeOnClick?: () => void; + pressureOnClick?: () => void; + reactionOnClick?: (reaction_id: string) => void; + // Whether we need to show the number of the reaction or not + detailedReactions?: boolean; +}; + +export const GasmixParser = (props: GasmixParserProps) => { + const { + gasmix, + gasesOnClick, + temperatureOnClick, + volumeOnClick, + pressureOnClick, + reactionOnClick, + detailedReactions, + ...rest + } = props; + + const { gases, temperature, volume, pressure, total_moles, reactions } = gasmix; + + return !total_moles ? ( + + {'No Gas Detected!'} + + ) : ( + + {gases.map((gas) => ( + gasesOnClick(gas[0])} /> : gas[1]} + key={gas[1]}> + {gas[2].toFixed(2) + ' mol (' + ((gas[2] / total_moles) * 100).toFixed(2) + ' %)'} + + ))} + temperatureOnClick()} /> : 'Temperature'}> + {(total_moles ? temperature.toFixed(2) : '-') + ' K'} + + volumeOnClick()} /> : 'Volume'}> + {(total_moles ? volume.toFixed(2) : '-') + ' L'} + + pressureOnClick()} /> : 'Pressure'}> + {(total_moles ? pressure.toFixed(2) : '-') + ' kPa'} + + {detailedReactions ? ( + reactions.map((reaction) => ( + reactionOnClick(reaction[0])} /> : reaction[1] + }> + {reaction[2]} + + )) + ) : ( + + {reactions.length + ? reactions.map((reaction, index) => + reactionOnClick ? ( + +